From 24c927baa2426698474bd7bebb44edc5615faefa Mon Sep 17 00:00:00 2001 From: "1539530615@qq.com" <1539530615@qq.com> Date: Wed, 24 Jan 2024 18:23:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/impl/RepairServiceImpl.java | 1 - .../resources/mapper/base/RepairMapper.xml | 3 +- .../material/domain/RepairTaskDetails.java | 6 ++-- .../mapper/RepairAuditDetailsMapper.java | 2 ++ .../impl/RepairAuditDetailsServiceImpl.java | 29 +++++++++++++++---- .../material/RepairAuditDetailsMapper.xml | 23 +++++++-------- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 9ebc86a6..1fe4c727 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -175,7 +175,6 @@ public class RepairServiceImpl implements RepairService { for (RepairTaskDetails details : detailsList){ details.setCreateBy(loginUser.getUserid()); details.setTaskId(task.getTaskId()); - details.setCompanyId(task.getCompanyId()); mapper.addAuditDetails(details); } task.setAgreementId(agreementId); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 8d20b447..b4f7bf68 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -254,7 +254,8 @@ type_id as typeId, repair_num as repairNum, repaired_num as repairedNum, - scrap_num as scrapNum + scrap_num as scrapNum, + company_id as companyId from repair_apply_details where task_id = #{taskId} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java index 77eb3475..ea7fe481 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java @@ -25,7 +25,7 @@ public class RepairTaskDetails { * 机具ID */ @ApiModelProperty(value = "机具ID") - private String maId; + private Long maId; /** * 类型名称 */ @@ -77,12 +77,14 @@ public class RepairTaskDetails { @ApiModelProperty(value = "维修人") private String repairer; private String keyword; - private String typeId; + private Long typeId; private Long companyId; + private String remark; /** * 任务创建人 */ @ApiModelProperty(value = "任务创建人") private Long createBy; + private Long backId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java index 001b659a..cdd49f63 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java @@ -80,4 +80,6 @@ public interface RepairAuditDetailsMapper int updateStatus(RepairAuditDetails bean); int insertRepairDetails(RepairTaskDetails repairTaskDetails); + + Long getBackId(Long repairId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 88374300..6ca80ddd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -197,7 +197,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } if(repairInputList != null && repairInputList.size() > 0){ - companyId = repairInputList.get(0).getCompanyId(); + if(repairInputList.get(0).getCompanyId() != null){ + companyId = repairInputList.get(0).getCompanyId(); + } + taskCode = purchaseCodeRule("R",50); taskStatus = 53; taskType = 50; @@ -225,7 +228,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } } if(scrapNumList != null && scrapNumList.size() > 0){ - companyId = scrapNumList.get(0).getCompanyId(); + if(scrapNumList.get(0).getCompanyId() != null){ + companyId = scrapNumList.get(0).getCompanyId(); + } taskCode = purchaseCodeRule("BF",57); taskStatus = 58; taskType = 57; @@ -276,23 +281,27 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairDetailList.addAll(auditAllList); } if(repairDetailList != null && repairDetailList.size() > 0){ - companyId = repairDetailList.get(0).getCompanyId(); + if (repairDetailList.get(0).getCompanyId() != null){ + companyId = repairDetailList.get(0).getCompanyId(); + } taskCode = purchaseCodeRule("WX",41); taskStatus = 42; taskType = 41; long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId); for (RepairAuditDetails inputDetails : repairDetailList) { + Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId()); // 添加驳回后维修详细表数据 RepairTaskDetails repairTaskDetails = new RepairTaskDetails(); repairTaskDetails.setTaskId(String.valueOf(inputTaskId)); - repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId())); - repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId())); + repairTaskDetails.setMaId(inputDetails.getMaId()); + repairTaskDetails.setTypeId(inputDetails.getTypeId()); BigDecimal repairNum = inputDetails.getRepairNum(); int i = repairNum.intValue(); // 直接转换 repairTaskDetails.setRepairNum(i); repairTaskDetails.setStatus("0"); repairTaskDetails.setCreateBy(SecurityUtils.getUserId()); repairTaskDetails.setCompanyId((long) companyId); + repairTaskDetails.setBackId(backId); repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails); } } @@ -309,7 +318,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService taskMapper.updateTmTask(tmTask); } if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){ - for (RepairAuditDetails bean : auditDetailList){ + if (auditDetailList != null) { + for (RepairAuditDetails bean : auditDetailList){ + bean.setAuditBy(SecurityUtils.getUserId()); + bean.setStatus(status); + repairAuditDetailsMapper.updateStatus(bean); + } + } + }else { + for (RepairAuditDetails bean : auditAllList){ bean.setAuditBy(SecurityUtils.getUserId()); bean.setStatus(status); repairAuditDetailsMapper.updateStatus(bean); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 58e9f2f7..3f94bc10 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_id, - + repair_num, @@ -144,13 +144,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, - - remark, - company_id, - + back_id, create_time @@ -165,8 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{typeId}, - - #{backNum}, + + #{repairNum}, #{status}, @@ -178,14 +175,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createBy}, NOW(), - - #{remark}, - #{companyId}, - - #{id}, + + #{backId}, NOW() ) @@ -383,5 +377,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} and scrap_num > 0 + \ No newline at end of file From 96020c45108a1baaf88aef69818ec9c204e5d83b Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Wed, 24 Jan 2024 18:33:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackReceiveController.java | 11 +++++++++++ .../bonus/sgzb/app/domain/BackApplyInfo.java | 7 +++++++ .../sgzb/app/mapper/BackReceiveMapper.java | 7 +++++++ .../sgzb/app/service/BackReceiveService.java | 7 +++++++ .../service/impl/BackReceiveServiceImpl.java | 5 +++++ .../resources/mapper/app/BackReceiveMapper.xml | 17 +++++++++++++++++ .../material/domain/PurchasePartDetails.java | 13 +++++++++++++ 7 files changed, 67 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 5e3fd293..7748f3b5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -139,6 +139,17 @@ public class BackReceiveController extends BaseController { } } + @Log(title = "退料接收-rfid编码查询", businessType = BusinessType.INSERT) + @PostMapping("rfidCodeQuery") + public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) { + try { + List list =backReceiveService.rfidCodeQuery(record); + return AjaxResult.success(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Log(title = "退料接收记录", businessType = BusinessType.INSERT) @PostMapping("backReceiveRecord") public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index f9c82662..7c907c63 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -143,7 +143,14 @@ public class BackApplyInfo { private List backApplyDetails; private Integer parentId; private String sdStatus; + /** + * 二维码编码 + */ private String qrCode; + /** + * rfid编码 + */ + private String rfidCode; private String repairedNum; private String backId; private String repairer; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 9c0d3836..e4c7a93a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -57,4 +57,11 @@ public interface BackReceiveMapper { List backReceiveRecord(BackApplyInfo record); int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId); + + /** + * 退料接收-rfid编码查询 + * @param record + * @return List + */ + List rfidCodeQuery(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index de28ab3d..ed6157af 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -21,4 +21,11 @@ public interface BackReceiveService { List qrcodeQuery(BackApplyInfo record); List backReceiveRecord(BackApplyInfo record); + + /** + * 退料接收-rfid编码查询 + * @param record + * @return List + */ + List rfidCodeQuery(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index e504c337..025839c8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -169,6 +169,11 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backReceiveMapper.backReceiveRecord(record); } + @Override + public List rfidCodeQuery(BackApplyInfo record) { + return backReceiveMapper.rfidCodeQuery(record); + } + private int insertRad(int taskId, List wxList) { int result = 0; if(wxList !=null){ diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index d8857261..0f58cbba 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -749,5 +749,22 @@ AND bai.task_id = #{taskId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index 80ea285a..8bf9cad6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -163,6 +163,11 @@ public class PurchasePartDetails extends BaseEntity @ApiModelProperty(value = "关键字筛选") private String keyWord; + /** + * 提交入库时间 + */ + private String submitStorageTime; + public void setTaskId(Long taskId) { this.taskId = taskId; @@ -447,6 +452,14 @@ public class PurchasePartDetails extends BaseEntity this.createTime = createTime; } + public String getSubmitStorageTime() { + return submitStorageTime; + } + + public void setSubmitStorageTime(String submitStorageTime) { + this.submitStorageTime = submitStorageTime; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)