From 3eb3f79334ec84f1aac8970aaea5eb67a2864b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Wed, 29 Oct 2025 10:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BA=A7=E5=87=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E5=8A=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rollNoReview/data/SFDCRollsOutData.java | 17 +++++++++++++++++ .../controller/ProductionReportController.java | 14 ++++++++++++++ .../shopOrder/dao/ProductionReportMapper.java | 2 ++ .../Impl/ProductionReportServiceImpl.java | 10 ++++++++++ .../service/ProductionReportService.java | 2 ++ .../mapper/shopOrder/ProductionReportMapper.xml | 15 +++++++++++++++ 6 files changed, 60 insertions(+) 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 999f348..10c3807 100644 --- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java +++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java @@ -55,6 +55,23 @@ public class SFDCRollsOutData { private String parentRollNo; private String parentRollType; private String finalStatus; + private String batchNo; + public Date getCreatedDate3() { + return createdDate3; + } + + public void setCreatedDate3(Date createdDate3) { + this.createdDate3 = createdDate3; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + public Date getCreatedDate2() { return createdDate2; } diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java index 4cca832..5a6186f 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java @@ -183,6 +183,20 @@ public class ProductionReportController { return map; } + /** + * 订单产出标签报表--保存属性变更 + * @param + * @return + */ + @PostMapping(value="/updateSfdcRollsAttribute") + @ResponseBody + public Object updateSfdcRollsAttribute(@RequestBody List indata){ + Map map = new HashMap<>(); + productionReportService.updateSfdcRollsAttribute(indata); + map.put("code", 0); + return map; + } + //=============查询-CQC检验记录=================== /** * 查询-CQC检验记录 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 6c6e731..9151c24 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java +++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java @@ -143,4 +143,6 @@ public interface ProductionReportMapper { List searchReportInOrderNoData(SearchReportInOrderNoData indata); List searchSfdcRollsReport(SFDCRollsOutData indata); + + void updateSfdcRollsAttribute(SFDCRollsOutData data); } 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 594dfb6..5a6767d 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 @@ -177,4 +177,14 @@ public class ProductionReportServiceImpl implements ProductionReportService { List result = productionReportMapper.searchSfdcRollsReport(indata); return result; } + + @Override + public void updateSfdcRollsAttribute(List indata) { + for (SFDCRollsOutData data : indata) { + data.setParentRollNo(data.getParentRollNo().trim()); + data.setBatchNo(data.getBatchNo().trim()); + data.setRemark(data.getRemark().trim()); + productionReportMapper.updateSfdcRollsAttribute(data); + } + } } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java index 7590c61..53e91e4 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java @@ -113,4 +113,6 @@ public interface ProductionReportService { ResponseData cancelReport(SearchProductionLineOutputReportData inData); List searchSfdcRollsReport(SFDCRollsOutData indata); + + void updateSfdcRollsAttribute(List indata); } diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index e88f98b..9ea634b 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -31,6 +31,21 @@ UPDATE WorkCenterResource set CalendarID=#{calendarID}, Efficiency=#{efficiency} where ResourceID=#{operatorID} and Site=#{site} + + update SFDC_Rolls set + site = #{Site}, + + parent_roll_no = #{parentRollNo}, + + + batch_no = #{batchNo}, + + + Remark = #{Remark}, + + OrderNo = #{OrderNo} + where site = #{Site} and OrderNo = #{OrderNo} and RollNo = #{RollNo} + delete from Operator where OperatorID=#{operatorID} and Site=#{site}