From b4b73a50ee4983c404824a2c7b477d85c3b33647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 18:28:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=88=B0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=93=8D=E4=BD=9C=E7=9B=B8=E5=85=B3=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 NoScanItemVO 中新增 factoryNo 字段用于存储工厂编号 - 在 ComponentOutboundController 中为出库项目设置工厂编号 - 在 InCostCenterBackController 中为成本中心回退设置工厂编号 - 在 InProduceBackController 中为生产回退设置工厂编号 - 在 InProduceOrderController 中为生产订单设置工厂编号 - 在 InProduceOrderSurplusController 中为生产订单盈余设置工厂编号 - 在 OutAssistanceController 中为辅助出库设置工厂编号 - 在 OutCostCenterController 中为成本中心出库设置工厂编号 - 在 OutProduceController 中为生产出库设置工厂编号 - 在 OutPurchaseController 中为采购出库设置工厂编号 - 在 TransferCompanyController 中为公司间调拨设置工厂编号 - 在 TransferFactoryController 中为工厂间调拨设置工厂编号 --- .../wms/admin/controller/ComponentOutboundController.java | 1 + .../wms/admin/controller/InCostCenterBackController.java | 1 + .../nflg/wms/admin/controller/InProduceBackController.java | 1 + .../nflg/wms/admin/controller/InProduceOrderController.java | 1 + .../admin/controller/InProduceOrderSurplusController.java | 1 + .../nflg/wms/admin/controller/OutAssistanceController.java | 1 + .../nflg/wms/admin/controller/OutCostCenterController.java | 1 + .../com/nflg/wms/admin/controller/OutProduceController.java | 1 + .../com/nflg/wms/admin/controller/OutPurchaseController.java | 1 + .../nflg/wms/admin/controller/TransferCompanyController.java | 2 ++ .../nflg/wms/admin/controller/TransferFactoryController.java | 2 ++ .../main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java | 5 +++++ 12 files changed, 18 insertions(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index e6a7a458..a7cf28b1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -424,6 +424,7 @@ public class ComponentOutboundController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getIdnrk()) .setMaterialDesc(item.getOjtxb()) + .setFactoryNo(order.getFactoryNo()) .setWarehouseNo(item.getLgort()) .setNum(item.getOutQty()) ) 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 7da67a50..98e434f1 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 @@ -223,6 +223,7 @@ public class InCostCenterBackController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getLgort()) .setNum(item.getLeft())) .toList() 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 be4dc1ac..fb116ba8 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 @@ -232,6 +232,7 @@ public class InProduceBackController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx2()) + .setFactoryNo(order.getDwerk()) .setWarehouseNo(order.getLgort2()) .setNum(item.getSqsl().subtract(item.getNum()))) .toList() 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 f2175031..390d8598 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 @@ -438,6 +438,7 @@ public class InProduceOrderController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMaterialNo()) .setMaterialDesc(item.getMaterialDesc()) + .setFactoryNo(item.getFactoryNo()) .setWarehouseNo(item.getWarehouseNo()) .setNum(item.getNum()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index a10591af..bdb14140 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -497,6 +497,7 @@ public class InProduceOrderSurplusController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMaterialNo()) .setMaterialDesc(item.getMaterialDesc()) + .setFactoryNo(item.getFactoryNo()) .setWarehouseNo(item.getWarehouseNo()) .setNum(item.getNum()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 98d01540..81fcc4a6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -300,6 +300,7 @@ public class OutAssistanceController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr1()) .setMaterialDesc(item.getMaktx1()) + .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getLgort1()) .setNum(item.getLeft()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 84428187..cc647795 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -302,6 +302,7 @@ public class OutCostCenterController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(order.getWerks()) .setWarehouseNo(item.getLgort()) .setNum(item.getLeft()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 744e10bf..70455970 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -429,6 +429,7 @@ public class OutProduceController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx2()) + .setFactoryNo(order.getDwerk()) .setWarehouseNo(order.getLgort2()) .setNum(item.getSqsl().subtract(item.getNum())) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 7847bd4d..8861d481 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -160,6 +160,7 @@ public class OutPurchaseController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMaterialCode()) .setMaterialDesc(item.getMaterialDescription()) + .setFactoryNo(item.getFactoryCode()) .setWarehouseNo(item.getStorageLocation()) .setNum(item.getLeft()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index e495902a..4017f177 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -510,6 +510,7 @@ public class TransferCompanyController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(order.getReswk()) .setWarehouseNo(item.getLgpro()) .setNum(item.getLeft()) ) @@ -964,6 +965,7 @@ public class TransferCompanyController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(item.getWerks()) .setWarehouseNo(item.getLgpbe1()) .setNum(item.getLeft()) ) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 4a8fde16..d418b32c 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -536,6 +536,7 @@ public class TransferFactoryController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getLgort()) .setNum(item.getLeft()) ) @@ -937,6 +938,7 @@ public class TransferFactoryController extends BaseController { .setOrderItemId(item.getId()) .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) + .setFactoryNo(order.getWerks()) .setWarehouseNo(item.getUmlgo()) .setNum(item.getLeft()) ) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java index 4371394b..c635acb5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/NoScanItemVO.java @@ -29,6 +29,11 @@ public class NoScanItemVO { */ private String materialDesc; + /** + * 工厂编号 + */ + private String factoryNo; + /** * 库存地点编号 */