From 176933b606cd4ead343d1dd91c59521de07f6f8b Mon Sep 17 00:00:00 2001
From: liss <1780094091@qq.com>
Date: Tue, 25 Nov 2025 15:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=A2=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=AC=E5=8F=B8=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/erp/vo/ErpInternalOrderRespVO.java   | 4 ++++
 .../module/erp/dal/dataobject/erp/ErpInternalOrderDO.java | 6 ++++++
 .../erp/service/erp/ErpInternalOrderServiceImpl.java      | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpInternalOrderRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpInternalOrderRespVO.java
index ee05f8c6..692d7470 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpInternalOrderRespVO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpInternalOrderRespVO.java
@@ -34,4 +34,8 @@ public class ErpInternalOrderRespVO {
     @ExcelProperty("是否已完成")
     private String isFinish;
 
+    @Schema(description = "companyNumber")
+    @ExcelProperty("companyNumber")
+    private String companyNumber;
+
 }
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java
index 52927d09..a55ee759 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpInternalOrderDO.java
@@ -53,4 +53,10 @@ public class ErpInternalOrderDO {
     @TableField("IS_FIN")
     private String isFinish;
 
+    /**
+    * 公司编码
+    */
+    @TableField("CPN_NUM")
+    private String companyNumber;
+
 }
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java
index 2df07890..c01eb448 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInternalOrderServiceImpl.java
@@ -132,6 +132,13 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
             if (dataArray == null || dataArray.isEmpty()) {
                 continue;
             }
+            // 往每个子项中添加BUKRS字段
+            for (int j = 0; j < dataArray.size(); j++) {
+                JSONObject item = dataArray.getJSONObject(j);
+                if (item != null) {
+                    item.put("BUKRS", number);
+                }
+            }
             dataArrayALL.addAll(dataArray);
         }
         if (CollUtil.isEmpty(dataArrayALL)) {
@@ -165,6 +172,7 @@ public class ErpInternalOrderServiceImpl implements ErpInternalOrderService {
                 DO.setType(dataJson.getString("AUART"));
                 DO.setIsOff(dataJson.getString("PHAS3"));
                 DO.setIsFinish(dataJson.getString("PHAS2"));
+                DO.setCompanyNumber(dataJson.getString("BUKRS"));
                 if (numbers.get(number) != null) {
                     // 更新
                     DO.setId(numbers.get(number));