缺陷描述：

 if 用户未添加“自定义装箱明细”，

         直接根据关联合同产品生成“货物描述”等

else

       不关联合同产品，只关联装箱明细。

复现步骤：

尔泓，标准版都需要修改

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackShipmentServiceImpl.java

@@ -2,12 +2,14 @@ package com.fjhx.sale.service.pack.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.fjhx.sale.mapper.pack.PackShipmentMapper;
@@ -20,9 +22,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -104,6 +104,21 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
         String packDetailIds = dto.getPackDetailIds();
         //获取到包装明细单ID列表
         List<String> ids = Arrays.asList(packDetailIds.split(","));
+        //查询自定义货物
+        List<PackDetailGoods> goodsList = packDetailGoodsService.list(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,ids));
+        if(CollectionUtils.isNotEmpty(goodsList)){
+            List<Map<String,Object>> list = new ArrayList<>();
+            for(PackDetailGoods p : goodsList){
+                Map<String,Object> map = new HashMap<>();
+                map.put("businessId",p.getId());
+                map.put("price",0);
+                map.put("quantity",p.getQuantity());
+                map.put("subDescription",p.getRemark());
+                map.put("type","20");
+                list.add(map);
+            }
+            return list;
+        }
         return baseMapper.productDetailList(ids);
     }