From 99176cdca28f7487f88b09e18857a50688f133a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sat, 11 Oct 2025 11:45:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-813=20=E9=9B=B6=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=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/ComponentPackingController.java     | 3 ---
 .../nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java   | 5 -----
 .../com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java   | 5 +++++
 .../src/main/resources/mapper/WmsComponentPackingMapper.xml  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
index 55377e41..72858f83 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
@@ -190,9 +190,6 @@ public class ComponentPackingController {
         List<ComponentPackingItemPdaVO> daVos = tasks.stream()
                 .map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item))
                 .collect(Collectors.toList());
-        daVos.forEach(vo -> {
-            vo.setFactoryNo(packing.getFactoryNo());
-        });
         return ApiResult.success(daVos);
     }
 
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java
index 0fa94d69..a6b38457 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java
@@ -53,9 +53,4 @@ public class ComponentPackingItemPdaVO {
     public BigDecimal getRemainQty() {
         return menge.subtract(outQty);
     }
-
-    /**
-     * 工厂
-     */
-    private String factoryNo;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java
index ee0a3973..1c5454d7 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java
@@ -42,4 +42,9 @@ public class ComponentPackingPdaVO {
      * 设备名称
      */
    private String maktx;
+
+    /**
+     * 工厂
+     */
+    private String factoryNo;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
index 5c412a41..99255edb 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
@@ -37,7 +37,7 @@
 
     <select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">
         select
-        id,no,vbeln,create_time,datum,vbelv,matnr,maktx
+        id,no,vbeln,create_time,datum,vbelv,matnr,maktx,factory_no
         from wms_component_packing
         where is_completed=0
         <if test="no !=null and no !=''">