From 8a4e2de9d270d7dd069a2cf3682aedee88b4c964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 11 Oct 2025 11:20:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-813=20pda=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=B7=A5=E5=8E=82=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/InCostCenterBackController.java | 1 + .../nflg/wms/admin/controller/InProduceBackController.java | 1 + .../nflg/wms/admin/controller/OutAssistanceController.java | 1 + .../nflg/wms/admin/controller/OutCostCenterController.java | 1 + .../com/nflg/wms/admin/controller/OutProduceController.java | 1 + .../nflg/wms/admin/controller/TransferFactoryController.java | 2 ++ .../main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java | 5 +++++ .../com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java | 5 +++++ 8 files changed, 17 insertions(+) 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 556f6494..3ee095f2 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 @@ -167,6 +167,7 @@ public class InCostCenterBackController extends BaseController { .setId(order.getId()) .setAufnr(order.getAufnr()) .setRsnum(order.getRsnum()) + .setFactoryNo(order.getWerks()) .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> { 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 7d12630a..f3729302 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 @@ -213,6 +213,7 @@ public class InProduceBackController extends BaseController { .setId(order.getId()) .setAufnr(order.getAufnr()) .setRsnum(order.getRsnum()) + .setFactoryNo(order.getDwerk()) .setItems(datas.stream() .filter(item -> item.getSqsl().compareTo(item.getNum()) > 0) .map(item -> new OutProduceItemVO() 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 5dee93ef..e9151491 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 @@ -168,6 +168,7 @@ public class OutAssistanceController extends BaseController { .setAufnr(order.getEbeln()) .setRsnum("") .setLgort(order.getLgort1()) + .setFactoryNo(order.getWerks()) .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() 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 a37d9085..b9e63b05 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 @@ -163,6 +163,7 @@ public class OutCostCenterController extends BaseController { .setId(order.getId()) .setAufnr(order.getAufnr()) .setRsnum(order.getRsnum()) + .setFactoryNo(order.getWerks()) .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() 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 18ed3f27..3d7a0e99 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 @@ -350,6 +350,7 @@ public class OutProduceController extends BaseController { .setAufnr(order.getAufnr()) .setRsnum(order.getRsnum()) .setLgort(order.getLgort2()) + .setFactoryNo(order.getDwerk()) .setItems(datas.stream() .filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() 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 2968a46d..194e30e9 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 @@ -192,6 +192,7 @@ public class TransferFactoryController extends BaseController { .setMblnr(order.getMblnr()) .setBwart(order.getBwart()) .setLgort(order.getLgort()) + .setFactoryNo(order.getWerks()) .setItems(datas.stream() .map(item -> new TransferFactoryPdaItemVO() .setMatnr(item.getMatnr()) @@ -305,6 +306,7 @@ public class TransferFactoryController extends BaseController { .setMblnr(ticket.getMblnr()) .setLgort(ticket.getLgort()) .setLgort1(ticket.getUmlgo()) + .setFactoryNo(ticket.getWerks()) .setItems(itemVOS.stream().map(it -> new TransferFactoryPdaItemVO() .setId(it.getId()) .setMatnr(it.getMatnr()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java index 768a826e..a36067f8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java @@ -36,5 +36,10 @@ public class OutProduce1VO { */ private String supplierName; + /** + * 工厂 + */ + private String factoryNo; + private List items; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java index 27b98be1..029c65f4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java @@ -34,5 +34,10 @@ public class TransferFactoryPdaVO { */ private String lgort1; + /** + * 工厂 + */ + private String factoryNo; + private List items; }