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(), "/")); } }