上架的批次属性显示修改

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

@@ -28,6 +28,8 @@ import com.mhd.wms.domain.materialGoodsRule.repository.po.MaterialGoodsRulePO;
 import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
 import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
+import com.mhd.system.api.domain.BatchDetailFeignPO;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO;
 import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
 import com.mhd.wms.domain.shelfMaterialDetail.service.ShelfMaterialDetailDomainService;
@@ -39,10 +41,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -134,7 +142,47 @@ public class StockShelfOrderApplicationService {
      */
     public StockShelfOrderPO getInfo(Long shelfOrderId)
     {
-        return stockShelfOrderDomainService.getInfo(shelfOrderId);
+        StockShelfOrderPO stockShelfOrderPO = stockShelfOrderDomainService.getInfo(shelfOrderId);
+        ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
+        shelfMaterialDetailDO.setShelfOrderNumber(stockShelfOrderPO.getShelfOrderNumber());
+        List<ShelfMaterialDetailPO> shelfMaterialDetailPOList = shelfMaterialDetailDomainService.queryListChildren(shelfMaterialDetailDO);
+        
+        // 性能优化：批量获取批次属性，避免N+1查询问题
+        // 1. 收集所有唯一的materialBaseInfoId
+        Set<Long> materialBaseInfoIdSet = shelfMaterialDetailPOList.stream()
+                .map(ShelfMaterialDetailPO::getMaterialBaseInfoId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        
+        // 2. 批量查询批次属性（使用Map缓存，避免重复查询相同的materialBaseInfoId）
+        Map<Long, List<BatchDetailFeignPO>> batchDetailMap = new HashMap<>();
+        for (Long materialBaseInfoId : materialBaseInfoIdSet) {
+            try {
+                AjaxResult ajaxResult = systemServiceFeign.getBatchDetailListByMaterialBaseInfoId(materialBaseInfoId);
+                if (ajaxResult != null && "200".equals(String.valueOf(ajaxResult.get("code")))) {
+                    List<BatchDetailFeignPO> batchDetailFeignPOList = JSON.parseArray(
+                            JSONObject.toJSONString(ajaxResult.get("data")), BatchDetailFeignPO.class);
+                    if (!CollectionUtils.isEmpty(batchDetailFeignPOList)) {
+                        // 过滤isDisplay=1的属性
+                        List<BatchDetailFeignPO> filteredList = batchDetailFeignPOList.stream()
+                                .filter(batchDetail -> batchDetail.getIsDisplay() != null && batchDetail.getIsDisplay() == 1)
+                                .collect(Collectors.toList());
+                        batchDetailMap.put(materialBaseInfoId, filteredList);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("获取物料批次属性失败，物料基础信息ID：{}，错误：{}", materialBaseInfoId, e.getMessage());
+            }
+        }
+        
+        // 3. 为每个物料明细设置更多属性（从缓存中获取），递归处理所有层级
+        setMaterialMoreDetailListRecursively(shelfMaterialDetailPOList, batchDetailMap);
+        
+        stockShelfOrderPO.setMaterialDetailList(shelfMaterialDetailPOList);
+        log.info("返回上架单信息，shelfOrderId={}, materialDetailList大小={}", 
+                stockShelfOrderPO.getShelfOrderId(), 
+                shelfMaterialDetailPOList != null ? shelfMaterialDetailPOList.size() : 0);
+        return stockShelfOrderPO;
     }
 
     /**
@@ -556,4 +604,299 @@ public class StockShelfOrderApplicationService {
             return 2;
         }
     }
+    
+    /**
+     * 递归为物料明细设置更多属性
+     * @param shelfMaterialDetailPOList 物料明细列表
+     * @param batchDetailMap 批次属性Map
+     */
+    private void setMaterialMoreDetailListRecursively(List<ShelfMaterialDetailPO> shelfMaterialDetailPOList, 
+                                                      Map<Long, List<BatchDetailFeignPO>> batchDetailMap) {
+        if (CollectionUtils.isEmpty(shelfMaterialDetailPOList)) {
+            return;
+        }
+        
+        shelfMaterialDetailPOList.forEach(shelfMaterialDetailPO -> {
+            Long materialBaseInfoId = shelfMaterialDetailPO.getMaterialBaseInfoId();
+            
+            // 只保留isDisplay=1的批次属性（从batchDetailMap中获取，已经过滤过了）
+            // 创建新的materialMoreDetailList，只包含isDisplay=1的属性
+            List<MaterialMoreDetailPO> materialMoreDetailList = new ArrayList<>();
+            
+            // 创建batchDetailId到MaterialMoreDetailPO的映射，用于快速查找已有的属性值
+            Map<Long, MaterialMoreDetailPO> batchDetailIdToMaterialMoreDetailMap = new HashMap<>();
+            List<MaterialMoreDetailPO> existingList = shelfMaterialDetailPO.getMaterialMoreDetailList();
+            if (!CollectionUtils.isEmpty(existingList)) {
+                for (MaterialMoreDetailPO existing : existingList) {
+                    if (existing.getBatchDetailId() != null) {
+                        batchDetailIdToMaterialMoreDetailMap.put(existing.getBatchDetailId(), existing);
+                    }
+                }
+            }
+            
+            if (materialBaseInfoId != null && batchDetailMap.containsKey(materialBaseInfoId)) {
+                List<BatchDetailFeignPO> batchDetailFeignPOList = batchDetailMap.get(materialBaseInfoId);
+                // 用于跟踪已添加到列表中的batchDetailId
+                Set<Long> addedBatchDetailIds = new HashSet<>();
+                
+                for (BatchDetailFeignPO batchDetailFeignPO : batchDetailFeignPOList) {
+                    MaterialMoreDetailPO materialMoreDetailPO = batchDetailIdToMaterialMoreDetailMap.get(batchDetailFeignPO.getBatchDetailId());
+                    
+                    // 如果不存在，创建新的
+                    if (materialMoreDetailPO == null) {
+                        materialMoreDetailPO = new MaterialMoreDetailPO();
+                        materialMoreDetailPO.setBatchId(batchDetailFeignPO.getBatchId());
+                        materialMoreDetailPO.setBatchDetailId(batchDetailFeignPO.getBatchDetailId());
+                        materialMoreDetailPO.setBatchLabels(batchDetailFeignPO.getBatchLabels());
+                        materialMoreDetailPO.setInputControl(batchDetailFeignPO.getInputControl());
+                        materialMoreDetailPO.setAttributeFormat(batchDetailFeignPO.getAttributeFormat());
+                        materialMoreDetailPO.setAttributeOption(batchDetailFeignPO.getAttributeOption());
+                        materialMoreDetailPO.setRemark(batchDetailFeignPO.getRemark());
+                    } else {
+                        // 如果已存在，更新属性（保留已有的attributeValue）
+                        materialMoreDetailPO.setBatchId(batchDetailFeignPO.getBatchId());
+                        materialMoreDetailPO.setBatchLabels(batchDetailFeignPO.getBatchLabels());
+                        materialMoreDetailPO.setInputControl(batchDetailFeignPO.getInputControl());
+                        materialMoreDetailPO.setAttributeFormat(batchDetailFeignPO.getAttributeFormat());
+                        materialMoreDetailPO.setAttributeOption(batchDetailFeignPO.getAttributeOption());
+                        materialMoreDetailPO.setRemark(batchDetailFeignPO.getRemark());
+                    }
+                    
+                    // 确保添加到列表中（使用batchDetailId来避免重复）
+                    Long batchDetailId = batchDetailFeignPO.getBatchDetailId();
+                    if (batchDetailId != null && !addedBatchDetailIds.contains(batchDetailId)) {
+                        materialMoreDetailList.add(materialMoreDetailPO);
+                        addedBatchDetailIds.add(batchDetailId);
+                    }
+                    
+                    // 根据fieldName或batchLabels从物料明细中获取对应的字段值
+                    if (shelfMaterialDetailPO != null) {
+                        String fieldValue = null;
+                        String usedFieldName = null;
+                        // 优先使用fieldName（如果存在）
+                        if (StringUtils.isNotBlank(batchDetailFeignPO.getFieldName())) {
+                            usedFieldName = batchDetailFeignPO.getFieldName();
+                            fieldValue = getFieldValueByFieldName(shelfMaterialDetailPO, usedFieldName);
+                            log.info("批次属性 batchDetailId={}, fieldName={}, 获取到的值={}", 
+                                    batchDetailFeignPO.getBatchDetailId(), usedFieldName, fieldValue);
+                        } 
+                        // 如果fieldName为空，尝试根据batchLabels映射到字段名
+                        else if (StringUtils.isNotBlank(batchDetailFeignPO.getBatchLabels())) {
+                            String fieldNameByLabel = getFieldNameByBatchLabel(batchDetailFeignPO.getBatchLabels());
+                            if (StringUtils.isNotBlank(fieldNameByLabel)) {
+                                usedFieldName = fieldNameByLabel;
+                                fieldValue = getFieldValueByFieldName(shelfMaterialDetailPO, usedFieldName);
+                                log.info("批次属性 batchDetailId={}, batchLabels={}, 映射字段名={}, 获取到的值={}", 
+                                        batchDetailFeignPO.getBatchDetailId(), batchDetailFeignPO.getBatchLabels(), 
+                                        usedFieldName, fieldValue);
+                            }
+                        }
+                        // 只有当获取到值时才更新attributeValue（避免覆盖已有的值）
+                        if (fieldValue != null) {
+                            materialMoreDetailPO.setAttributeValue(fieldValue);
+                            log.info("设置更多属性：batchDetailId={}, batchLabels={}, attributeValue={}", 
+                                    materialMoreDetailPO.getBatchDetailId(), materialMoreDetailPO.getBatchLabels(), 
+                                    materialMoreDetailPO.getAttributeValue());
+                        }
+                    }
+                }
+            }
+            shelfMaterialDetailPO.setMaterialMoreDetailList(materialMoreDetailList);
+            log.info("物料明细 uniqueId={}, materialBaseInfoId={}, materialMoreDetailList大小={}", 
+                    shelfMaterialDetailPO.getUniqueId(), shelfMaterialDetailPO.getMaterialBaseInfoId(), 
+                    materialMoreDetailList != null ? materialMoreDetailList.size() : 0);
+            
+            // 递归处理子集
+            if (!CollectionUtils.isEmpty(shelfMaterialDetailPO.getChildren())) {
+                setMaterialMoreDetailListRecursively(shelfMaterialDetailPO.getChildren(), batchDetailMap);
+            }
+        });
+    }
+    
+    /**
+     * 根据批次标签（batchLabels）映射到字段名
+     * @param batchLabel 批次标签
+     * @return 字段名，如果找不到映射则返回null
+     */
+    private String getFieldNameByBatchLabel(String batchLabel) {
+        if (StringUtils.isBlank(batchLabel)) {
+            return null;
+        }
+        
+        // 批次标签到字段名的映射关系
+        // 可以根据实际业务需求扩展这个映射表
+        Map<String, String> labelToFieldNameMap = new HashMap<>();
+        labelToFieldNameMap.put("Invoice No.", "invoiceNo");
+        labelToFieldNameMap.put("Invoice No", "invoiceNo");
+        labelToFieldNameMap.put("发票号", "invoiceNo");
+        labelToFieldNameMap.put("Batch Ref NO's", "batchRefNo");
+        labelToFieldNameMap.put("Batch Ref NO", "batchRefNo");
+        labelToFieldNameMap.put("批次参考号", "batchRefNo");
+        labelToFieldNameMap.put("Sheet Ref NO's", "sheetRefNo");
+        labelToFieldNameMap.put("Sheet Ref NO", "sheetRefNo");
+        labelToFieldNameMap.put("单据参考号", "sheetRefNo");
+        labelToFieldNameMap.put("箱号/卡板号", "boxPalletNo");
+        labelToFieldNameMap.put("箱号", "boxPalletNo");
+        labelToFieldNameMap.put("卡板号", "boxPalletNo");
+        labelToFieldNameMap.put("申报数量", "declaredQuantity");
+        labelToFieldNameMap.put("申报单位", "declarationUnit");
+        labelToFieldNameMap.put("原产国", "originCountry");
+        labelToFieldNameMap.put("币制", "currency");
+        labelToFieldNameMap.put("单位", "unit");
+        labelToFieldNameMap.put("升", "liter");
+        labelToFieldNameMap.put("尺寸", "dimensions");
+        labelToFieldNameMap.put("箱数", "boxCount");
+        labelToFieldNameMap.put("件数", "pieceCount");
+        labelToFieldNameMap.put("入库数量", "inboundQuantity");
+        labelToFieldNameMap.put("总净重", "totalNetWeight");
+        labelToFieldNameMap.put("总毛重", "totalGrossWeight");
+        labelToFieldNameMap.put("总体积", "totalVolume");
+        labelToFieldNameMap.put("总面积", "totalArea");
+        labelToFieldNameMap.put("总价", "totalPrice");
+        
+        // 精确匹配
+        String fieldName = labelToFieldNameMap.get(batchLabel.trim());
+        if (StringUtils.isNotBlank(fieldName)) {
+            return fieldName;
+        }
+        
+        // 模糊匹配（包含关系）
+        for (Map.Entry<String, String> entry : labelToFieldNameMap.entrySet()) {
+            if (batchLabel.contains(entry.getKey()) || entry.getKey().contains(batchLabel)) {
+                return entry.getValue();
+            }
+        }
+        
+        // 如果找不到映射，尝试将批次标签转换为驼峰命名（简单处理）
+        // 例如："Invoice No." -> "invoiceNo"
+        return convertLabelToFieldName(batchLabel);
+    }
+    
+    /**
+     * 将批次标签转换为字段名（驼峰命名）
+     * @param label 批次标签
+     * @return 字段名
+     */
+    private String convertLabelToFieldName(String label) {
+        if (StringUtils.isBlank(label)) {
+            return null;
+        }
+        
+        // 移除特殊字符，转换为小写，用空格或特殊字符分割
+        String cleaned = label.replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5\\s]", " ")
+                .trim()
+                .toLowerCase();
+        
+        // 如果是中文，无法自动转换，返回null
+        if (cleaned.matches(".*[\\u4e00-\\u9fa5].*")) {
+            return null;
+        }
+        
+        // 将空格分割的单词转换为驼峰命名
+        String[] words = cleaned.split("\\s+");
+        if (words.length == 0) {
+            return null;
+        }
+        
+        StringBuilder fieldName = new StringBuilder(words[0]);
+        for (int i = 1; i < words.length; i++) {
+            if (words[i].length() > 0) {
+                fieldName.append(words[i].substring(0, 1).toUpperCase())
+                        .append(words[i].substring(1));
+            }
+        }
+        
+        return fieldName.toString();
+    }
+    
+    /**
+     * 根据字段名从对象中获取字段值（使用反射）
+     * @param obj 对象
+     * @param fieldName 字段名
+     * @return 字段值（转换为字符串）
+     */
+    private String getFieldValueByFieldName(Object obj, String fieldName) {
+        if (obj == null || StringUtils.isBlank(fieldName)) {
+            return null;
+        }
+        
+        try {
+            // 兼容：如果传的是下划线命名（数据库列名风格），先转成驼峰字段名再取
+            // 例如：box_pallet_no -> boxPalletNo
+            String normalizedFieldName = fieldName;
+            if (normalizedFieldName.contains("_")) {
+                normalizedFieldName = snakeToCamel(normalizedFieldName);
+            }
+
+            // 获取对象的Class
+            Class<?> clazz = obj.getClass();
+            
+            // 尝试获取字段（包括父类字段）
+            Field field = null;
+            Class<?> currentClass = clazz;
+            while (currentClass != null && field == null) {
+                try {
+                    field = currentClass.getDeclaredField(normalizedFieldName);
+                } catch (NoSuchFieldException e) {
+                    currentClass = currentClass.getSuperclass();
+                }
+            }
+            
+            if (field == null) {
+                log.warn("字段不存在：{}（normalized：{}），对象类型：{}", fieldName, normalizedFieldName, clazz.getName());
+                return null;
+            }
+            
+            // 设置可访问
+            field.setAccessible(true);
+            
+            // 获取字段值
+            Object value = field.get(obj);
+            
+            // 转换为字符串
+            if (value == null) {
+                log.info("字段 {} 的值为 null，对象类型：{}", normalizedFieldName, clazz.getName());
+                return null;
+            }
+            
+            String result;
+            // 处理日期类型字段
+            if (value instanceof Date) {
+                java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
+                result = sdf.format((Date) value);
+            } else {
+                result = value.toString();
+            }
+            
+            log.info("通过反射获取字段值成功，字段名：{}（原始：{}），值：{}，对象类型：{}", 
+                    normalizedFieldName, fieldName, result, clazz.getName());
+            return result;
+        } catch (Exception e) {
+            log.warn("通过反射获取字段值失败，字段名：{}，对象类型：{}，错误：{}", fieldName, obj.getClass().getName(), e.getMessage());
+            return null;
+        }
+    }
+
+    private String snakeToCamel(String snake) {
+        if (StringUtils.isBlank(snake)) {
+            return null;
+        }
+        String s = snake.trim().toLowerCase();
+        StringBuilder sb = new StringBuilder();
+        boolean upperNext = false;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            if (c == '_') {
+                upperNext = true;
+                continue;
+            }
+            if (upperNext) {
+                sb.append(Character.toUpperCase(c));
+                upperNext = false;
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java

@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.materialInventory.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mhd.common.core.annotation.Excel;
@@ -167,51 +168,61 @@ public class MaterialInventory extends BaseVOEntity {
 
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
+    @TableField(exist = false)
     private String batchRefNo;
 
     @ApiModelProperty("Sheet Ref NO's")
     @Excel(name = "Sheet Ref NO's")
+    @TableField(exist = false)
     private String sheetRefNo;
 
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")
+    @TableField(exist = false)
     private String boxPalletNo;
 
     @ApiModelProperty("扩展字段1")
     @Excel(name = "扩展字段1")
+    @TableField(exist = false)
     private String extAttr1;
 
     @ApiModelProperty("扩展字段2")
     @Excel(name = "扩展字段2")
+    @TableField(exist = false)
     private String extAttr2;
 
     @ApiModelProperty("生产日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date productionDate;
 
     @ApiModelProperty("过期日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date expiryDate;
 
     @ApiModelProperty("存货日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date inventoryDate;
 
     @ApiModelProperty("ExtAttr3")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date extAttr3;
 
     @ApiModelProperty("ExtAttr4")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
     private Date extAttr4;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java

@@ -1,12 +1,19 @@
 package com.mhd.wms.domain.shelfMaterialDetail.repository.persistence;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.inMaterialDetailSerialNumber.entity.InMaterialDetailSerialNumber;
 import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.facade.IInMaterialDetailSerialNumberService;
 import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.todo.InMaterialDetailSerialNumberDO;
+import com.mhd.wms.domain.materialMoreDetail.repository.facade.IMaterialMoreDetailService;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
+import com.mhd.wms.domain.materialMoreDetail.repository.todo.MaterialMoreDetailDO;
 import com.mhd.wms.domain.shelfMaterialDetail.entity.ShelfMaterialDetail;
 import com.mhd.wms.domain.shelfMaterialDetail.repository.facade.IShelfMaterialDetailService;
 import com.mhd.wms.domain.shelfMaterialDetail.repository.mapper.ShelfMaterialDetailMapper;
@@ -19,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,6 +45,10 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
     private ShelfMaterialDetailMapper shelfMaterialDetailMapper;
     @Autowired
     private IInMaterialDetailSerialNumberService inMaterialDetailSerialNumberService;
+    @Resource
+    private SystemServiceFeign systemServiceFeign;
+    @Autowired
+    private IMaterialMoreDetailService IMaterialMoreDetailService;
 
     /**
      * 查询物料明细列表
@@ -54,11 +66,44 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
     public List<ShelfMaterialDetailPO> queryListChildren(ShelfMaterialDetailDO shelfMaterialDetailDO) {
         List<ShelfMaterialDetailPO> shelfMaterialDetailPOList = shelfMaterialDetailMapper.queryList(shelfMaterialDetailDO);
 
+        //回显带上更多属性值（批次标签）
+        shelfMaterialDetailPOList.forEach(shelfMaterialDetailPO -> {
+            MaterialMoreDetailDO materialMoreDetailDO = new MaterialMoreDetailDO();
+            materialMoreDetailDO.setMaterialDetailUniqueId(shelfMaterialDetailPO.getUniqueId());
+            List<MaterialMoreDetailPO> materialMoreDetailList = IMaterialMoreDetailService.queryList(materialMoreDetailDO);
+            //如果上架单的物料批属性还没存入值，那么需要从批属性表获取
+            AjaxResult ajaxResult = null;
+            if (CollectionUtils.isEmpty(materialMoreDetailList)) {
+                ajaxResult = systemServiceFeign.getBatchDetailListByMaterialBaseInfoId(shelfMaterialDetailPO.getMaterialBaseInfoId());
+                if (ajaxResult != null && "200".equals(String.valueOf(ajaxResult.get("code")))) {
+                    materialMoreDetailList = JSON.parseArray(JSONObject.toJSONString(ajaxResult.get("data")), MaterialMoreDetailPO.class);
+                }
+            }
+            shelfMaterialDetailPO.setMaterialMoreDetailList(materialMoreDetailList);
+        });
+        
         // 获取查询的层级
         List<ShelfMaterialDetailPO> receiptMaterialDetailPOParentList = shelfMaterialDetailPOList
                 .stream().filter(e -> 1 == e.getLevel()).collect(Collectors.toList());
         // 递归查询子集
-        receiptMaterialDetailPOParentList.forEach(materialDetailPO -> materialDetailPO.setChildren(getChildren(materialDetailPO.getUniqueId(), shelfMaterialDetailPOList, 2)));
+        for(ShelfMaterialDetailPO materialDetailPO : receiptMaterialDetailPOParentList){
+            List<ShelfMaterialDetailPO> children = getChildren(materialDetailPO.getUniqueId(), shelfMaterialDetailPOList, 2);
+            children.forEach(childrenDetailPO -> {
+                MaterialMoreDetailDO materialMoreDetailDO = new MaterialMoreDetailDO();
+                materialMoreDetailDO.setMaterialDetailUniqueId(childrenDetailPO.getUniqueId());
+                List<MaterialMoreDetailPO> materialMoreDetailList = IMaterialMoreDetailService.queryList(materialMoreDetailDO);
+                //如果上架单的物料批属性还没存入值，那么需要从批属性表获取
+                AjaxResult ajaxResult = null;
+                if (CollectionUtils.isEmpty(materialMoreDetailList)) {
+                    ajaxResult = systemServiceFeign.getBatchDetailListByMaterialBaseInfoId(childrenDetailPO.getMaterialBaseInfoId());
+                    if (ajaxResult != null && "200".equals(String.valueOf(ajaxResult.get("code")))) {
+                        materialMoreDetailList = JSON.parseArray(JSONObject.toJSONString(ajaxResult.get("data")), MaterialMoreDetailPO.class);
+                    }
+                }
+                childrenDetailPO.setMaterialMoreDetailList(materialMoreDetailList);
+            });
+            materialDetailPO.setChildren(children);
+        }
         return receiptMaterialDetailPOParentList;
     }
 

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.mhd.common.core.annotation.Excel;
 import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.po.InMaterialDetailSerialNumberPO;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -259,6 +260,9 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
     @ApiModelProperty("序列号")
     private List<InMaterialDetailSerialNumberPO> materialDetailSerialNumberList;
 
+    @ApiModelProperty("更多属性")
+    private List<MaterialMoreDetailPO> materialMoreDetailList;
+
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
     private String batchRefNo;

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -673,12 +673,64 @@ public class StockReceiptOrderDomainService {
             shelfMaterialDetailDO.setQuantity(receiptMaterialDetailDO.getReceiptQuantity());
             shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailDO.getInUniqueId());
             shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailDO.getUniqueId());
+            // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+            shelfMaterialDetailDO.setProductionDate(receiptMaterialDetailDO.getProductionDate());
+            shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailDO.getExpiryDate());
+            shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailDO.getInventoryDate());
+            shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailDO.getBatchRefNo());
+            shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailDO.getSheetRefNo());
+            shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailDO.getBoxPalletNo());
+            shelfMaterialDetailDO.setExtAttr1(receiptMaterialDetailDO.getExtAttr1());
+            shelfMaterialDetailDO.setExtAttr2(receiptMaterialDetailDO.getExtAttr2());
+            // extAttr3和extAttr4在ReceiptMaterialDetailDO中是String类型，在ShelfMaterialDetailDO中是Date类型，需要转换
+            if (receiptMaterialDetailDO.getExtAttr3() != null && !receiptMaterialDetailDO.getExtAttr3().isEmpty()) {
+                try {
+                    java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    shelfMaterialDetailDO.setExtAttr3(sdf.parse(receiptMaterialDetailDO.getExtAttr3()));
+                } catch (Exception e) {
+                    // 如果转换失败，不设置该字段
+                }
+            }
+            if (receiptMaterialDetailDO.getExtAttr4() != null && !receiptMaterialDetailDO.getExtAttr4().isEmpty()) {
+                try {
+                    java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    shelfMaterialDetailDO.setExtAttr4(sdf.parse(receiptMaterialDetailDO.getExtAttr4()));
+                } catch (Exception e) {
+                    // 如果转换失败，不设置该字段
+                }
+            }
             receiptMaterialDetailDO.getChildren().forEach(receiptMaterialDetailDOChildren -> {
                 ShelfMaterialDetailDO shelfMaterialDetailDOChildren = new ShelfMaterialDetailDO();
                 BeanUtils.copyProperties(receiptMaterialDetailDOChildren, shelfMaterialDetailDOChildren);
                 shelfMaterialDetailDOChildren.setQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
                 shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailDO.getInUniqueId());
                 shelfMaterialDetailDOChildren.setReceiptUniqueId(receiptMaterialDetailDO.getUniqueId());
+                // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                shelfMaterialDetailDOChildren.setProductionDate(receiptMaterialDetailDOChildren.getProductionDate());
+                shelfMaterialDetailDOChildren.setExpiryDate(receiptMaterialDetailDOChildren.getExpiryDate());
+                shelfMaterialDetailDOChildren.setInventoryDate(receiptMaterialDetailDOChildren.getInventoryDate());
+                shelfMaterialDetailDOChildren.setBatchRefNo(receiptMaterialDetailDOChildren.getBatchRefNo());
+                shelfMaterialDetailDOChildren.setSheetRefNo(receiptMaterialDetailDOChildren.getSheetRefNo());
+                shelfMaterialDetailDOChildren.setBoxPalletNo(receiptMaterialDetailDOChildren.getBoxPalletNo());
+                shelfMaterialDetailDOChildren.setExtAttr1(receiptMaterialDetailDOChildren.getExtAttr1());
+                shelfMaterialDetailDOChildren.setExtAttr2(receiptMaterialDetailDOChildren.getExtAttr2());
+                // extAttr3和extAttr4在ReceiptMaterialDetailDO中是String类型，在ShelfMaterialDetailDO中是Date类型，需要转换
+                if (receiptMaterialDetailDOChildren.getExtAttr3() != null && !receiptMaterialDetailDOChildren.getExtAttr3().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDOChildren.setExtAttr3(sdf.parse(receiptMaterialDetailDOChildren.getExtAttr3()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
+                if (receiptMaterialDetailDOChildren.getExtAttr4() != null && !receiptMaterialDetailDOChildren.getExtAttr4().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDOChildren.setExtAttr4(sdf.parse(receiptMaterialDetailDOChildren.getExtAttr4()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
                 shelfMaterialDetailDOList.add(shelfMaterialDetailDOChildren);
             });
             shelfMaterialDetailDOList.add(shelfMaterialDetailDO);
@@ -739,9 +791,32 @@ public class StockReceiptOrderDomainService {
                 shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity());
                 shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
                 shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId());
-                // 从入库单明细中获取净重、毛重、体积、面积等字段
-                // 注意：由于 ShelfMaterialDetailDO 中没有这些字段，这些字段需要在查询时通过关联查询获取
-                // 或者需要先在上架单明细实体类中添加这些字段
+                // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                shelfMaterialDetailDO.setProductionDate(receiptMaterialDetailPO.getProductionDate());
+                shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailPO.getExpiryDate());
+                shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailPO.getInventoryDate());
+                shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailPO.getBatchRefNo());
+                shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailPO.getSheetRefNo());
+                shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailPO.getBoxPalletNo());
+                shelfMaterialDetailDO.setExtAttr1(receiptMaterialDetailPO.getExtAttr1());
+                shelfMaterialDetailDO.setExtAttr2(receiptMaterialDetailPO.getExtAttr2());
+                // extAttr3和extAttr4在ReceiptMaterialDetailPO中是String类型，在ShelfMaterialDetailDO中是Date类型，需要转换
+                if (receiptMaterialDetailPO.getExtAttr3() != null && !receiptMaterialDetailPO.getExtAttr3().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDO.setExtAttr3(sdf.parse(receiptMaterialDetailPO.getExtAttr3()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
+                if (receiptMaterialDetailPO.getExtAttr4() != null && !receiptMaterialDetailPO.getExtAttr4().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDO.setExtAttr4(sdf.parse(receiptMaterialDetailPO.getExtAttr4()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
                 shelfMaterialDetailDOList.add(shelfMaterialDetailDO);
                 receiptQuantity = receiptQuantity.add(receiptMaterialDetailPO.getReceiptQuantity());
             }
@@ -799,12 +874,64 @@ public class StockReceiptOrderDomainService {
                 shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity());
                 shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
                 shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId());
+                // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                shelfMaterialDetailDO.setProductionDate(receiptMaterialDetailPO.getProductionDate());
+                shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailPO.getExpiryDate());
+                shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailPO.getInventoryDate());
+                shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailPO.getBatchRefNo());
+                shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailPO.getSheetRefNo());
+                shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailPO.getBoxPalletNo());
+                shelfMaterialDetailDO.setExtAttr1(receiptMaterialDetailPO.getExtAttr1());
+                shelfMaterialDetailDO.setExtAttr2(receiptMaterialDetailPO.getExtAttr2());
+                // extAttr3和extAttr4在ReceiptMaterialDetailPO中是String类型，在ShelfMaterialDetailDO中是Date类型，需要转换
+                if (receiptMaterialDetailPO.getExtAttr3() != null && !receiptMaterialDetailPO.getExtAttr3().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDO.setExtAttr3(sdf.parse(receiptMaterialDetailPO.getExtAttr3()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
+                if (receiptMaterialDetailPO.getExtAttr4() != null && !receiptMaterialDetailPO.getExtAttr4().isEmpty()) {
+                    try {
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        shelfMaterialDetailDO.setExtAttr4(sdf.parse(receiptMaterialDetailPO.getExtAttr4()));
+                    } catch (Exception e) {
+                        // 如果转换失败，不设置该字段
+                    }
+                }
                 receiptMaterialDetailPO.getChildren().forEach(receiptMaterialDetailDOChildren -> {
                     ShelfMaterialDetailDO shelfMaterialDetailDOChildren = new ShelfMaterialDetailDO();
                     BeanUtils.copyProperties(receiptMaterialDetailDOChildren, shelfMaterialDetailDOChildren);
                     shelfMaterialDetailDOChildren.setQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
                     shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
                     shelfMaterialDetailDOChildren.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId());
+                    // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                    shelfMaterialDetailDOChildren.setProductionDate(receiptMaterialDetailDOChildren.getProductionDate());
+                    shelfMaterialDetailDOChildren.setExpiryDate(receiptMaterialDetailDOChildren.getExpiryDate());
+                    shelfMaterialDetailDOChildren.setInventoryDate(receiptMaterialDetailDOChildren.getInventoryDate());
+                    shelfMaterialDetailDOChildren.setBatchRefNo(receiptMaterialDetailDOChildren.getBatchRefNo());
+                    shelfMaterialDetailDOChildren.setSheetRefNo(receiptMaterialDetailDOChildren.getSheetRefNo());
+                    shelfMaterialDetailDOChildren.setBoxPalletNo(receiptMaterialDetailDOChildren.getBoxPalletNo());
+                    shelfMaterialDetailDOChildren.setExtAttr1(receiptMaterialDetailDOChildren.getExtAttr1());
+                    shelfMaterialDetailDOChildren.setExtAttr2(receiptMaterialDetailDOChildren.getExtAttr2());
+                    // extAttr3和extAttr4在ReceiptMaterialDetailPO中是String类型，在ShelfMaterialDetailDO中是Date类型，需要转换
+                    if (receiptMaterialDetailDOChildren.getExtAttr3() != null && !receiptMaterialDetailDOChildren.getExtAttr3().isEmpty()) {
+                        try {
+                            java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            shelfMaterialDetailDOChildren.setExtAttr3(sdf.parse(receiptMaterialDetailDOChildren.getExtAttr3()));
+                        } catch (Exception e) {
+                            // 如果转换失败，不设置该字段
+                        }
+                    }
+                    if (receiptMaterialDetailDOChildren.getExtAttr4() != null && !receiptMaterialDetailDOChildren.getExtAttr4().isEmpty()) {
+                        try {
+                            java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            shelfMaterialDetailDOChildren.setExtAttr4(sdf.parse(receiptMaterialDetailDOChildren.getExtAttr4()));
+                        } catch (Exception e) {
+                            // 如果转换失败，不设置该字段
+                        }
+                    }
                     shelfMaterialDetailDOList.add(shelfMaterialDetailDOChildren);
                 });
                 shelfMaterialDetailDOList.add(shelfMaterialDetailDO);

mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml

@@ -49,11 +49,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="batchRefNo"    column="batch_ref_no"    />
+        <result property="sheetRefNo"    column="sheet_ref_no"    />
+        <result property="boxPalletNo"    column="box_pallet_no"    />
+        <result property="extAttr1"    column="ext_attr_1"    />
+        <result property="extAttr2"    column="ext_attr_2"    />
+        <result property="productionDate"    column="production_date"    />
+        <result property="expiryDate"    column="expiry_date"    />
+        <result property="inventoryDate"    column="inventory_date"    />
+        <result property="extAttr3"    column="ext_attr_3"    />
+        <result property="extAttr4"    column="ext_attr_4"    />
     </resultMap>
 
 
     <sql id="selectShelfMaterialDetailPo">
-        select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from shelf_material_detail
+        select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from shelf_material_detail
     </sql>
 
     <sql id="selectShelfMaterialDetailPo1">