From f34e2e1904d13f4768131dbb7946168537e2f6d0 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 12 Dec 2025 09:15:56 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-12=20=E8=BF=87=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86-=E3=80=8B=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0->=E6=9D=90=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=90=E6=9D=90=E6=96=99=E6=8B=BC=E5=8D=B7?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/YieldReportCommonsServiceImpl.java | 32 +++++++++---------- .../schedule/data/SearchScheduleData.java | 9 ++++++ .../mapper/orderIssure/IssureNotifyMapper.xml | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java index 169bfc0..899c4c1 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java @@ -75,7 +75,7 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService } /** - * @Description 材料接卷 + * @Description 材料拼卷 * @DateTime 2025/12/11 * @Param [inData] * @return java.util.Map @@ -87,14 +87,14 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService String orderNo = inData.getOrderNo(); Integer itemNo = inData.getItemNo(); String seqNo = inData.getSeqNo(); - String rollNo = inData.getRollNo(); - Float returnQty = inData.getReturnQty(); - int histSeqNo = inData.getHistSeqNo(); - String operatorId = inData.getOperatorId(); - String remark = inData.getRemark(); + String rollNo = inData.getRollNo(); // 选中行标签 + int histSeqNo = inData.getHistSeqNo(); // 选中行序号 + String newRollNo = inData.getNewRollNo(); // 扫描标签 + String operatorId = inData.getOperatorId(); // 操作员 + String scanType = inData.getScanType(); // 扫描类型：I=添加、D=删除 - // 存储过程 执行材料接卷 - Map resultMap = this.callMaterialProcessRollUp(site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark); + // 存储过程 执行材料拼卷 + Map resultMap = this.callMaterialProcessRollUp(site, orderNo, itemNo, seqNo, rollNo, histSeqNo, newRollNo, operatorId, scanType); // 判断结果是否成功 String resultCode = String.valueOf(resultMap.get("Code")); if ("400".equalsIgnoreCase(resultCode)) { @@ -106,22 +106,22 @@ public class YieldReportCommonsServiceImpl implements YieldReportCommonsService } /** - * @Description 调用材料接卷存储过程 + * @Description 调用材料拼卷存储过程 * @DateTime 2025/12/11 - * @Param [site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark] + * @Param [site, orderNo, itemNo, seqNo, rollNo, histSeqNo, newRollNo, operatorId, scanType] * @return java.util.Map **/ - private Map callMaterialProcessRollUp(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float returnQty, int histSeqNo, String operatorId, String remark) { + private Map callMaterialProcessRollUp(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, int histSeqNo, String newRollNo, String operatorId, String scanType) { List params = new ArrayList<>(); params.add(site); params.add(orderNo); params.add(itemNo); params.add(seqNo); - params.add(rollNo); - params.add(returnQty); - params.add(histSeqNo); - params.add(operatorId); - params.add(remark); + params.add(rollNo); // 选中行标签 + params.add(histSeqNo); // 选中行序号 + params.add(newRollNo); // 扫描标签 + params.add(operatorId); // 操作员 + params.add(scanType); // 扫描类型：I=添加、D=删除 // 调用存储过程 List> resultList = procedureMapper.getProcedureData("MaterialProcessRollUp", params); // 处理返回的结果 diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java index 1810553..157847d 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -108,6 +108,7 @@ public class SearchScheduleData extends BaseData { private Float returnQty;//退料数量（异常下机） private String oriRollNo;//原始卷号 private String newRollNo;//新切换的卷号 + private String scanType;//扫描类型：I=添加、D=删除 private Float newRollQty;//新卷的数量 private Float rollQty;//当前卷的良品数量 private Integer rollNums;//当前卷的数量 @@ -904,6 +905,14 @@ public class SearchScheduleData extends BaseData { this.newRollNo = newRollNo; } + public String getScanType() { + return scanType; + } + + public void setScanType(String scanType) { + this.scanType = scanType; + } + public Float getRollQty() { return rollQty; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index cb72ebb..6932366 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -156,7 +156,7 @@ a.issue_method as issueMethod, a.outbound_warehouse_id as outboundWarehouseId from SOBOM a - where a.Site = #{site} and a.OrderNo = #{orderno} + where a.Site = #{site} and a.OrderNo = #{orderno} and a.issue_method ]]> '入库倒冲' and a.ComponentPartNo is not null