上架详情收货详情增加是否抄码标识

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -261,6 +261,14 @@ public class StockShelfOrderApplicationService {
                 log.warn("获取物料基础信息失败，物料基础信息ID：{}，错误：{}", materialBaseInfoId, e.getMessage());
             }
         }
+        for (ShelfMaterialDetailPO shelfMaterialDetailPO : shelfMaterialDetailPOList) {
+            MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoMap.get(shelfMaterialDetailPO.getMaterialBaseInfoId());
+            shelfMaterialDetailPO.setCopyCode(materialBaseInfoPO != null ? materialBaseInfoPO.getCopyCode() : null);
+            for (ShelfMaterialDetailPO child : shelfMaterialDetailPO.getChildren()) {
+                MaterialBaseInfoPO materialBaseInfoPOChild = materialBaseInfoMap.get(child.getMaterialBaseInfoId());
+                child.setCopyCode(materialBaseInfoPOChild != null ? materialBaseInfoPOChild.getCopyCode() : null);
+            }
+        }
         
         // 4.2 批量查询物料条码信息（单位代码为EA的条码）
         Map<Long, MaterialBarCodePO> materialBarCodeMap = new HashMap<>();

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java

@@ -356,5 +356,7 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "抄码数量克重详情")
     private String copyDetails;
 
-
+    @ApiModelProperty("是否抄码: 1-是 2-否")
+    @Excel(name = "是否抄码: 1-是 2-否")
+    private Integer copyCode;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java

@@ -356,4 +356,8 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
     @ApiModelProperty("LOT编号")
     @Excel(name = "LOT编号")
     private String lotNumber;
+
+    @ApiModelProperty("是否抄码: 1-是 2-否")
+    @Excel(name = "是否抄码: 1-是 2-否")
+    private Integer copyCode;
 }

mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml

@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="copyBatch"    column="copy_batch"    />
         <result property="copyQuantity"    column="copy_quantity"    />
         <result property="copyDetails"    column="copy_details"    />
+        <result property="copyCode"    column="COPY_CODE"    />
     </resultMap>
 
 
@@ -107,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.TOTAL_GROSS_WEIGHT AS PLAN_GROSS_WEIGHT,
         b.TOTAL_VOLUME AS PLAN_VOLUME,
         b.TOTAL_AREA AS PLAN_AREA,
+        c.COPY_CODE,
         ifnull(a.INVOICE_NO, b.INVOICE_NO) INVOICE_NO, 
         ifnull(a.BATCH_REF_NO, b.BATCH_REF_NO) BATCH_REF_NO, 
         ifnull(a.SHEET_REF_NO, b.SHEET_REF_NO) SHEET_REF_NO,