From a58d30220c340d14bd20099b7d889e4fc3577660 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 5 Dec 2025 16:43:19 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=A8=A1=E6=9D=BF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E9=97=B4=E5=92=8C=E7=9B=91=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/ios_manage/service/impl/PdaIosInServiceImpl.java | 1 +
 .../org/nl/wms/warehouse_management/enums/IOSEnum.java   | 6 ++++++
 .../warehouse_management/service/dao/IOStorInvDis.java   | 5 +++++
 .../service/impl/RawAssistIStorServiceImpl.java          | 9 +++++++++
 4 files changed, 21 insertions(+)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
index b833ffa..8ac4bd7 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -433,6 +433,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
         dtl.put("pcsn", plateDao.getPcsn());
         dtl.put("contract_code", plateDao.getContract_code());
         dtl.put("cust_code", plateDao.getCust_code());
+        dtl.put("prison_area", plateDao.getPrison_area());
         dtl.put("qty_unit_id", plateDao.getQty_unit_id());
         dtl.put("qty_unit_name", plateDao.getQty_unit_name());
         dtl.put("qty", String.valueOf(total_qty));
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
index 554aba5..a88c3ae 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
@@ -83,6 +83,12 @@ public enum IOSEnum {
     // 销售单状态
     SALE_STATUS(MapOf.of("生成", "1", "审核", "2", "下发", "3", "完成", "9")),
 
+    // 监区
+    PRISON_AREA(MapOf.of("A1", "一监区", "A2", "二监区", "A3", "三监区", "A4", "四监区"
+            , "A5", "五监区",  "A6", "六监区", "A7", "七监区",  "A9", "九监区"
+            , "A10", "十监区",  "A11", "十一监区", "A12", "十二监区",  "A14", "十四监区"
+            )),
+
     ;
 
     private Map<String, String> code;
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
index fc3cd2a..cd205bd 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
@@ -132,4 +132,9 @@ public class IOStorInvDis implements Serializable {
      */
     private String contract_code;
 
+    /**
+     * 监区
+     */
+    private String prison_area;
+
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
index ad01bd1..f033b6c 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
@@ -228,6 +228,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
             dis.put("plan_qty", row.get("plan_qty"));
             dis.put("cust_code", row.get("cust_code"));
             dis.put("contract_code", row.get("contract_code"));
+            dis.put("prison_area", row.get("prison_area"));
 
             ioStorInvDisMapper.insert(dis.toJavaObject(IOStorInvDis.class));
         }
@@ -881,7 +882,15 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         WriteSheet sheet = EasyExcel.writerSheet(sheetInt).build();
         // 单组填充
         HashMap<String, Object> oneMap = new HashMap<>();
+        // 总数量
         oneMap.put("sum_qty", sum_qty);
+        // 时间
+        oneMap.put("time", DateUtil.today());
+        // 监区（只有入库有）
+        if (mstDao.getIo_type().equals(IOSEnum.IO_TYPE.code("入库"))) {
+            IOStorInvDis ioStorInvDis = disDaoList.get(0);
+            oneMap.put("prison_area", IOSEnum.PRISON_AREA.code(ioStorInvDis.getPrison_area()));
+        }
         workBook.fill(oneMap, sheet);
 
         // 多组填充