From 67b80c13f35178d029af9a1cb40aee27af4bcce5 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 15 Aug 2024 14:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/MaInputRecord.java | 8 ++++- .../app/service/impl/TmTaskServiceImpl.java | 13 +++---- .../PurchaseMacodeInfoController.java | 1 + .../mapper/PurchaseCheckDetailsMapper.java | 2 +- .../service/IPurchaseCheckDetailsService.java | 2 +- .../impl/PurchaseCheckDetailsServiceImpl.java | 2 +- .../impl/PurchaseMacodeInfoServiceImpl.java | 34 ++++++++++++++----- .../mapper/app/LeaseApplyInfoMapper.xml | 20 +++++------ .../material/PurchaseCheckDetailsMapper.xml | 4 +-- 9 files changed, 55 insertions(+), 31 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java index f613c02..79046c6 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java @@ -6,6 +6,7 @@ import java.util.List; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -15,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author bonus * @date 2023-12-15 */ +@Data public class MaInputRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -63,7 +65,11 @@ public class MaInputRecord extends BaseEntity @ApiModelProperty(value = "机具编号") private String maCode; - + /** + * 机具类型，1：数量；0：编码 + */ + @ApiModelProperty(value = "管理类型") + private String manageType; public void setId(Long id) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index fd9d2da..a37eae3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1090,15 +1090,15 @@ public class TmTaskServiceImpl implements TmTaskService { remark = leaseApplyInfo1.getRemark(); phone = leaseApplyInfo1.getPhone(); } - List leaseApplyDetails = task.getLeaseApplyDetails(); + List LeaseApplyInfoList = task.getLeaseApplyInfoList(); Long taskId = task.getTaskId(); - if (CollUtil.isNotEmpty(leaseApplyDetails)) { - for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (CollUtil.isNotEmpty(LeaseApplyInfoList)) { + for (LeaseApplyInfo leaseApply : LeaseApplyInfoList) { LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); - if (leaseApplyDetail.getCompanyId() == null) { + if (leaseApply.getCompanyId() == null) { leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); } else { - leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId()); + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApply.getCompanyId()); } if (leaseApplyInfos == null) { LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo(); @@ -1115,9 +1115,10 @@ public class TmTaskServiceImpl implements TmTaskService { } leaseApplyInfo.setRemark(remark); leaseApplyInfo.setType(task.getLeaseApplyInfoList().get(0).getType()); - leaseApplyInfo.setCompanyId(leaseApplyDetail.getCompanyId()); + leaseApplyInfo.setCompanyId(leaseApply.getCompanyId()); leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); leaseApplyInfo.setLeaseType(task.getLeaseType()); + leaseApplyInfo.setCostBearingParty(leaseApply.getCostBearingParty()); res = leaseApplyInfoMapper.insert(leaseApplyInfo); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 07ec0ed..921bff0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -83,6 +83,7 @@ public class PurchaseMacodeInfoController extends BaseController { @GetMapping(value = "/putinDetails") public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) { startPage(); + return getDataTable(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo)); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index d545a92..e5a8e3e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -21,7 +21,7 @@ public interface PurchaseCheckDetailsMapper { * @param taskId 新购验收任务详细purchase_check_details主键 * @return 新购验收任务详细purchase_check_details */ - public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId); + public List selectPurchaseCheckDetailsByTaskId(Long taskId); /** * 查询新购验收任务详细purchase_check_details列表 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java index 94f87b2..7f80fd4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java @@ -18,7 +18,7 @@ public interface IPurchaseCheckDetailsService * @param taskId 新购验收任务详细purchase_check_details主键 * @return 新购验收任务详细purchase_check_details */ - public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId); + public List selectPurchaseCheckDetailsByTaskId(Long taskId); /** * 查询新购验收任务详细purchase_check_details列表 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 5b04b89..386a2c5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -38,7 +38,7 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer * @return 新购验收任务详细purchase_check_details */ @Override - public PurchaseCheckDetails selectPurchaseCheckDetailsByTaskId(Long taskId) { + public List selectPurchaseCheckDetailsByTaskId(Long taskId) { return purchaseCheckDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index d7b3855..dc271ec 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -302,6 +302,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService * 通过/不通过 */ @Override + @Transactional(rollbackFor = Exception.class) public int modifyManageStatus(MaInputVO maInputVO) { Long taskId = maInputVO.getTaskId(); String checkResult = maInputVO.getCheckResult(); @@ -378,20 +379,35 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId()); //修改purchase_macode_info表 purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId, typeId, maInputRecord.getMaCode()); - //修改purchase_check_details表 - checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId); + if ("1".equals(maInputRecord.getManageType())){ + //修改purchase_check_details表 + checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId); + } } } //判断是否全部已操作（通过或不通过） int count=purchaseMacodeInfoMapper.isOperateAll(taskId); if (count<=0){ - //全部审核任务状态改为已审核 - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + //获取该订单下所有的装备信息 + List purchaseCheckDetailsList=checkDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId); + //判断每种设备的验收数量和绑定数量一致 + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + if (StringUtils.isNotNull(purchaseCheckDetails.getBindNum())){ + if (purchaseCheckDetails.getCheckNum().compareTo(BigDecimal.valueOf(purchaseCheckDetails.getBindNum()))!=0){ + //全部操作以后如果还有未绑定的，则不改变状态 + count=1; + } + } + } + if (count==0){ + //全部审核任务状态改为已审核 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(28); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + } } return 1; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 40624e9..f8f8c91 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -63,17 +63,17 @@ insert into lease_apply_info (code, task_id, lease_person, phone, - `type`, company_audit_by, company_audit_time, - company_audit_remark, dept_audit_by, dept_audit_time, - dept_audit_remark, create_by, create_time, - update_by, update_time, remark, - company_id,estimate_lease_time,lease_type) + `type`, company_audit_by, company_audit_time, + company_audit_remark, dept_audit_by, dept_audit_time, + dept_audit_remark, create_by, create_time, + update_by, update_time, remark, + company_id,estimate_lease_time,lease_type,cost_bearing_party) values (#{code,jdbcType=VARCHAR}, #{taskId,jdbcType=INTEGER}, #{leasePerson,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR}, - #{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR}, - #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, - #{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR}) + #{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR}, + #{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR}, + #{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, + #{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR},#{costBearingParty,jdbcType=VARCHAR}) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 82af489..058e2b1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, task_id, type_id, purchase_price, purchase_num, check_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, file_name, file_url, company_id from purchase_check_details + select id, task_id, type_id, purchase_price, purchase_num, check_num,bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, file_name, file_url, company_id from purchase_check_details