From 4c554b0c4b4a5bfcc04fea45b9919a3039fd1dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 3 Jun 2026 16:52:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=97=A0?= =?UTF-8?q?=E7=A0=81=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个出库单据实体中新增type字段用于区分扫码和无码操作 - 为组件出库、成本中心回退、生产回退等业务实体添加类型标识 - 修改控制器逻辑在创建订单时设置type值为1表示无码操作 - 临时禁用二维码存在性检查功能以支持无码场景 --- .../wms/admin/controller/ComponentOutboundController.java | 2 +- .../wms/admin/controller/InCostCenterBackController.java | 1 + .../nflg/wms/admin/controller/InProduceBackController.java | 1 + .../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 + .../nflg/wms/admin/controller/OutProduceController.java | 1 + .../wms/admin/controller/TransferCompanyController.java | 1 + .../wms/admin/controller/TransferFactoryController.java | 1 + .../wms/admin/service/NoScanningBaseControllerService.java | 7 ++++--- .../nflg/wms/repository/entity/WmsComponentOutbound.java | 5 +++++ .../wms/repository/entity/WmsInCostcenterBackTicket.java | 5 +++++ .../nflg/wms/repository/entity/WmsInProduceBackTicket.java | 5 +++++ .../com/nflg/wms/repository/entity/WmsInProduceOrder.java | 5 +++++ .../repository/entity/WmsInProduceOrderSurplusTicket.java | 5 +++++ .../nflg/wms/repository/entity/WmsOutAssistanceTicket.java | 5 +++++ .../nflg/wms/repository/entity/WmsOutCostcenterTicket.java | 5 +++++ .../nflg/wms/repository/entity/WmsOutProduceTicket.java | 5 +++++ .../wms/repository/entity/WmsTransferCompanyTicket.java | 5 +++++ .../wms/repository/entity/WmsTransferFactoryTicket.java | 5 +++++ 21 files changed, 64 insertions(+), 4 deletions(-) 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 2ca8e39b..4c55757e 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 @@ -458,7 +458,7 @@ public class ComponentOutboundController extends BaseController { Map packingItemMap = packingItems.stream() .collect(Collectors.toMap(WmsComponentPackingItem::getId, item -> item)); - WmsComponentOutbound outbound = setWmsComponentOutbound(packing).setFinish(true); + WmsComponentOutbound outbound = setWmsComponentOutbound(packing).setFinish(true).setType(1); List outboundItems = new ArrayList<>(); List inventories = new ArrayList<>(); List records = new ArrayList<>(); 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 8704ebb7..7c98a0f1 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 @@ -257,6 +257,7 @@ public class InCostCenterBackController extends BaseController { .setNo(serialNumberControllerService.generateSerialNumber(11)) .setOrderId(order.getId()) .setLgort(request.getItems().get(0).getWarehouseNo()) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); List datas = inCostcenterBackItemService.getList(order.getId()); 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 e9302ab4..d2db9b62 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 @@ -263,6 +263,7 @@ public class InProduceBackController extends BaseController { WmsInProduceBackTicket ticket = new WmsInProduceBackTicket() .setNo(serialNumberControllerService.generateSerialNumber(13)) .setProduceBackId(order.getId()) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); inProduceBackTicketService.save(ticket); 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 87981e74..772cf444 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 @@ -540,6 +540,7 @@ public class InProduceOrderController extends BaseController { order.setMblnr(dto.getE_MBLNR()); order.setMjahr(dto.getE_MJAHR()); order.setState((short) 1); + order.setType(1); order.setUpdateBy(UserUtil.getUserName()); order.setUpdateTime(LocalDateTime.now()); produceOrderService.updateById(order); 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 7ca24c73..a145ceef 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 @@ -470,6 +470,7 @@ public class InProduceOrderSurplusController extends BaseController { .setNo(serialNumberControllerService.generateSerialNumber(25)) .setOrderId(currentOrder.getId()) .setLgort(warehouseNos.iterator().next()) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); } 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 53ac268d..e9d8c4cf 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 @@ -336,6 +336,7 @@ public class OutAssistanceController extends BaseController { .setOrderId(order.getId()) .setLgort(request.getItems().get(0).getWarehouseNo()) .setFinish(true) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); List datas = outAssistanceItemService.getList(order.getId()); 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 109ef558..99de0808 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 @@ -337,6 +337,7 @@ public class OutCostCenterController extends BaseController { .setOrderId(order.getId()) .setLgort(request.getItems().get(0).getWarehouseNo()) .setFinish(true) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); List datas = outCostcenterItemService.getList(order.getId()); 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 161fdbe7..c3c72a4f 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 @@ -464,6 +464,7 @@ public class OutProduceController extends BaseController { .setProduceId(order.getId()) .setLgort(request.getItems().get(0).getWarehouseNo()) .setFinish(true) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); List datas = outProduceItemService.getList(order.getId()); 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 6d4e2ce6..a31e0851 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 @@ -547,6 +547,7 @@ public class TransferCompanyController extends BaseController { .setOrderId(order.getId()) .setLgort(order.getLgort()) .setFinish(true) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); 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 e2ef0525..1a6b37df 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 @@ -573,6 +573,7 @@ public class TransferFactoryController extends BaseController { .setLgort(request.getItems().get(0).getWarehouseNo()) .setOrderId(order.getId()) .setFinish(true) + .setType(1) .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java index a478b4e4..d3cb16c7 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java @@ -25,9 +25,10 @@ public class NoScanningBaseControllerService { * @return 是否生成过二维码 */ public boolean existsQrCode(String materialNo) { - return qrCodeMasterService.lambdaQuery() - .eq(WmsQrCodeMaster::getMaterialCode, materialNo) - .exists(); +// return qrCodeMasterService.lambdaQuery() +// .eq(WmsQrCodeMaster::getMaterialCode, materialNo) +// .exists(); + return false; } /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java index a6f12eee..d0fa440e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java @@ -212,4 +212,9 @@ public class WmsComponentOutbound implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java index ed4df5c0..59ef6761 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java @@ -64,4 +64,9 @@ public class WmsInCostcenterBackTicket implements Serializable { * 实际入库库存地点编号 */ private String lgort; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackTicket.java index d9f07073..c1345e26 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackTicket.java @@ -40,6 +40,11 @@ public class WmsInProduceBackTicket implements Serializable { */ private String no; + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; + /** * 创建人 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrder.java index 2157ca50..2eedf928 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrder.java @@ -68,6 +68,11 @@ public class WmsInProduceOrder implements Serializable { */ private String mjahr; + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; + /** * 创建人 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java index b8872bcd..f8bd2723 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java @@ -55,6 +55,11 @@ public class WmsInProduceOrderSurplusTicket implements Serializable { */ private String docYear; + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; + /** * 创建人 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java index b5b7ac3c..4a7f455d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java @@ -94,4 +94,9 @@ public class WmsOutAssistanceTicket implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java index a701f08f..af119ac5 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java @@ -94,4 +94,9 @@ public class WmsOutCostcenterTicket implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java index ffe02a4d..01168a9f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java @@ -94,4 +94,9 @@ public class WmsOutProduceTicket implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java index 36f8a872..d4d0f415 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java @@ -114,4 +114,9 @@ public class WmsTransferCompanyTicket implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java index c931722e..f537586a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java @@ -114,4 +114,9 @@ public class WmsTransferFactoryTicket implements Serializable { */ @TableField("audit_time") public LocalDateTime auditTime; + + /** + * 来源类型，0：扫码；1：无码 + */ + private Integer type; }