From ab9a8ced816398be0e23492ea01cc371bc1ed46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 13 Mar 2026 10:19:20 +0800
Subject: [PATCH] =?UTF-8?q?PC=E5=87=BA=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockShelfOrderApplicationService.java           |  8 ++++++++
 .../persistence/ShelfMaterialDetailImpl.java         | 12 ++++++++++++
 .../stockOutOrder/repository/po/StockOutOrderPO.java |  2 +-
 .../dto/stockOutOrder/StockOutOrderDTO.java          |  3 +++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
index 83d424a8b..f00256c9d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
@@ -1001,6 +1001,14 @@ public class StockShelfOrderApplicationService {
         labelToFieldNameMap.put("总体积", "totalVolume");
         labelToFieldNameMap.put("总面积", "totalArea");
         labelToFieldNameMap.put("总价", "totalPrice");
+        labelToFieldNameMap.put("扩展属性1", "extAttr1");
+        labelToFieldNameMap.put("扩展字段1", "extAttr1");
+        labelToFieldNameMap.put("扩展属性2", "extAttr2");
+        labelToFieldNameMap.put("扩展字段2", "extAttr2");
+        labelToFieldNameMap.put("扩展属性3", "extAttr3");
+        labelToFieldNameMap.put("扩展字段3", "extAttr3");
+        labelToFieldNameMap.put("扩展属性4", "extAttr4");
+        labelToFieldNameMap.put("扩展字段4", "extAttr4");
         
         // 精确匹配
         String fieldName = labelToFieldNameMap.get(batchLabel.trim());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
index 95b0c3310..9a68fb0ad 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
@@ -154,6 +154,18 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
             String refVal = null;
             if ("InvoiceNo".equalsIgnoreCase(attributeOption) || "Invoice No".equalsIgnoreCase(batchLabels) || "发票号".equals(batchLabels)) {
                 refVal = shelfMaterialDetailPO.getExtAttr1();
+            } else if ("扩展字段1".equals(batchLabels) || "扩展属性1".equals(batchLabels)) {
+                refVal = shelfMaterialDetailPO.getExtAttr1();
+            } else if ("扩展字段2".equals(batchLabels) || "扩展属性2".equals(batchLabels)) {
+                refVal = shelfMaterialDetailPO.getExtAttr2();
+            } else if ("扩展字段3".equals(batchLabels) || "扩展属性3".equals(batchLabels)) {
+                refVal = shelfMaterialDetailPO.getExtAttr3() != null
+                        ? new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(shelfMaterialDetailPO.getExtAttr3())
+                        : null;
+            } else if ("扩展字段4".equals(batchLabels) || "扩展属性4".equals(batchLabels)) {
+                refVal = shelfMaterialDetailPO.getExtAttr4() != null
+                        ? new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(shelfMaterialDetailPO.getExtAttr4())
+                        : null;
             } else if ("BatchRefNo".equalsIgnoreCase(attributeOption) || "Batch Ref NO's".equalsIgnoreCase(batchLabels) || "批次参考号".equals(batchLabels)) {
                 refVal = shelfMaterialDetailPO.getBatchRefNo();
             } else if ("SheetRefNo".equalsIgnoreCase(attributeOption) || "Sheet Ref NO's".equalsIgnoreCase(batchLabels) || "单据参考号".equals(batchLabels)) {
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
index 9b2491ab7..ab73715ac 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
@@ -374,7 +374,7 @@ public class StockOutOrderPO extends BaseVOEntity {
     @Excel(name = "是否需要运输")
     private String needTransportFlag;
 
-    @ApiModelProperty("app上传的图片")
+    @ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
     private String pictureApp;
 
     @ApiModelProperty("出库总数量")
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
index ef5b8ddd7..f41734755 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
@@ -394,4 +394,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
 
     @ApiModelProperty(name = "审核时间查询条件结束日期")
     private String auditTimeEnd;
+
+    @ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
+    private String pictureApp;
 }
\ No newline at end of file