diff --git a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java index 4785a2c..91098cb 100644 --- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java +++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java @@ -57,6 +57,7 @@ public class SFDCRollsOutData { private String parentRollType; private String finalStatus; private String batchNo; + private String packingList; // 置空标志:true 表示将该字段更新为 NULL private Boolean parentRollNoClear; private Boolean batchNoClear; @@ -214,6 +215,14 @@ public class SFDCRollsOutData { this.batchNo = batchNo; } + public String getPackingList() { + return packingList; + } + + public void setPackingList(String packingList) { + this.packingList = packingList; + } + public Date getCreatedDate2() { return createdDate2; } diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java index 7d1047c..22aebd2 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java +++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java @@ -151,4 +151,6 @@ public interface ProductionReportMapper { SFDCRollsOutData searchSfdcRollsReportSummary(SFDCRollsOutData indata); void updateSfdcRollsAttribute(SFDCRollsOutData data); + + void updateSfdcRollPackingList(SfdcRollsReportExecuteData data); } diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SfdcRollsReportExecuteData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SfdcRollsReportExecuteData.java index 0ab4ba1..3d8cd39 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/SfdcRollsReportExecuteData.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SfdcRollsReportExecuteData.java @@ -5,6 +5,7 @@ package com.gaotao.modules.shopOrder.entity; */ public class SfdcRollsReportExecuteData { private String site; + private String orderNo; private String partNo; private String rollNo; private Double rollQtyOld; @@ -13,6 +14,7 @@ public class SfdcRollsReportExecuteData { private Double surfaceLossQtyNew; private Double poorPerformanceQtyOld; private Double poorPerformanceQtyNew; + private String packingList; private String type; // update / restore public String getSite() { @@ -23,6 +25,14 @@ public class SfdcRollsReportExecuteData { this.site = site; } + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + public String getPartNo() { return partNo; } @@ -87,6 +97,14 @@ public class SfdcRollsReportExecuteData { this.poorPerformanceQtyNew = poorPerformanceQtyNew; } + public String getPackingList() { + return packingList; + } + + public void setPackingList(String packingList) { + this.packingList = packingList; + } + public String getType() { return type; } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java index e6cba23..68f2224 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java @@ -228,6 +228,11 @@ public class ProductionReportServiceImpl implements ProductionReportService { String resultCode = String.valueOf(resultMap.get("code")); String resultMessage = String.valueOf(resultMap.get("message")); + // 编辑成功后同步更新 PackingList 字段(来源 SFDC_Rolls.PackingList) + if ("200".equals(resultCode) && "update".equalsIgnoreCase(indata.getType())) { + productionReportMapper.updateSfdcRollPackingList(indata); + } + responseData.setCode(resultCode); responseData.setMsg(resultMessage); responseData.setSuccess("200".equals(resultCode)); diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index ac031ff..5b2f0ea 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -417,6 +417,7 @@ ISNULL(R.Defect_Qty, 0) as defectQty, ISNULL(R.Total_Qty, 0) as totalQty, ROUND(ISNULL(100.0 * R.Good_Qty / NULLIF(R.Total_Qty, 0), 100), 2) as yieldRate , + A.PackingList as packingList, a.remark FROM SFDC_Rolls A WITH(NOLOCK) INNER JOIN part P WITH(NOLOCK) ON A.Site = P.Site AND A.PartNo = P.PartNo @@ -662,4 +663,17 @@ - \ No newline at end of file + + + UPDATE SFDC_Rolls + SET PackingList = #{packingList} + WHERE Site = #{site} + AND RollNo = #{rollNo} + + AND PartNo = #{partNo} + + + AND OrderNo = #{orderNo} + + +