From f5a0983aa565704285fb930b35465e5c86ca3b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Oct 2025 17:59:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82=E3=80=81=E4=BB=93=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E5=82=A8=E4=BD=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/InCostCenterBackController.java | 3 +++ .../nflg/wms/admin/controller/InProduceBackController.java | 3 +++ .../nflg/wms/admin/controller/InProduceOrderController.java | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index 8ef3629f..e09dba8a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -238,6 +238,9 @@ public class InCostCenterBackController extends BaseController { .setContent(qrCode) .setBatchNo(qrCodeContent.getBatchNo()) .setSerialNo(qrCodeContent.getSerialNo()) + .setFactoryNo(order.getWerks()) + .setWarehouseNo(request.getLgort()) + .setBinNos(StrUtil.split(it.getBinNos(), "/")) .setUniqNo(qrCodeContent.getUniqNo()) .setNum(qrCodeContent.getNum()) .setCreateBy(UserUtil.getUserName()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index 53a06eb0..6b18b094 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -285,6 +285,9 @@ public class InProduceBackController extends BaseController { .setBatchNo(qrCodeContent.getBatchNo()) .setSerialNo(qrCodeContent.getSerialNo()) .setUniqNo(qrCodeContent.getUniqNo()) + .setFactoryNo(order.getDwerk()) + .setWarehouseNo(request.getLgort()) +// .setBinNos(StrUtil.split(it.getBinNos(), "/")) .setNum(qrCodeContent.getNum()) .setCreateBy(UserUtil.getUserName()) .setCreateTime(Instant.now()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 70f44a20..38143f84 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -383,6 +383,9 @@ public class InProduceOrderController extends BaseController { .setBatchNo(content.getBatchNo()) .setSerialNo(content.getSerialNo()) .setUniqNo(content.getUniqNo()) + .setFactoryNo(it.getFactoryNo()) + .setWarehouseNo(it.getWarehouseNo()) + .setBinNos(StrUtil.split(materialQO.getBinNos(), "/")) .setNum(content.getNum()) .setCreateBy(UserUtil.getUserName()) .setCreateTime(Instant.now()) @@ -404,7 +407,7 @@ public class InProduceOrderController extends BaseController { materialNos.add(it.getMaterialNo()); } //是否更改了储位 - if (Objects.isNull(materialQO.getBinNos())) { + if (StrUtil.isNotBlank(materialQO.getBinNos())) { syncStorage(it, StrUtil.split(materialQO.getBinNos(), "/")); } }