From 1e64f1d8c3778d7d4faba6b8271965a3d70eed3e Mon Sep 17 00:00:00 2001 From: zangzhipeng Date: Thu, 4 Jun 2026 14:41:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E2=80=9C=E6=9B=B4=E6=8D=A2=E5=8E=82=E5=AE=B6=E2=80=9D=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/produce/service/impl/WorkOrderRunServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java index 65442237b..eabc15116 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java @@ -768,7 +768,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl { workPlan.setOcId(ocId); }); - List batchResults = workPlanMapper.insertOrUpdate(workPlans); + List batchResults = workPlanMapper.updateById(workPlans); // todo:qyl 2.在MES更改后同步给ERP return null; From 528dec82e6433387b5280a781adf75024f0308ee Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Thu, 4 Jun 2026 15:08:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/StGlassCakeOutServiceImpl.java | 10 +++++++++- .../service/impl/StGraphiteMoldOutServiceImpl.java | 12 ++++++++---- .../service/impl/StOtherOutRecordServiceImpl.java | 10 +++++++++- .../impl/StOtherReceiptRecordServiceImpl.java | 10 +++++++++- .../service/impl/StStockInoutRecordServiceImpl.java | 10 +++++++++- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java index a6a4d1b00..ea71a512c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java @@ -166,7 +166,15 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl= 1){ + String realNum = arr[0]; + // 只有全数字才转整型 + if(StrUtil.isNumeric(realNum)){ + lastNum = Integer.parseInt(realNum); + } + } } // 4. 遍历每个玻璃饼，单独匹配库存+判断是否生成预出库 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java index 9f1d67c1a..d24d7e95d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java @@ -142,12 +142,17 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl= 1){ + String realNum = arr[0]; + // 只有全数字才转整型 + if(StrUtil.isNumeric(realNum)){ + lastNum = Integer.parseInt(realNum); + } } } int childNum = 1; + lastNum++; // 遍历每个子件 for (DsPartEntity subItem : allChildPartList) { @@ -178,7 +183,6 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl= 1){ + String realNum = arr[0]; + // 只有全数字才转整型 + if(StrUtil.isNumeric(realNum)){ + lastNum = Integer.parseInt(realNum); + } + } } // ========== 1.3 组装所有商品明细 ========== diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java index 9d10afe7e..306b3aa0d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java @@ -116,7 +116,15 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl= 1){ + String realNum = arr[0]; + // 只有全数字才转整型 + if(StrUtil.isNumeric(realNum)){ + lastNum = Integer.parseInt(realNum); + } + } } // 主账单字段 = 明细合计 for (StStockInoutRecord detail : inoutList) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java index 88ef9b64c..fab804d9f 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java @@ -86,7 +86,15 @@ public class StStockInoutRecordServiceImpl extends BaseServiceImpl= 1){ + String realNum = arr[0]; + // 只有全数字才转整型 + if(StrUtil.isNumeric(realNum)){ + lastNum = Integer.parseInt(realNum); + } + } } // 3. 补零拼接 return datePrefix + StrUtil.padPre(String.valueOf(++lastNum), 4, '0');