chore: 理货列表和关联单添加返回整个订单入仓的包装类型

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -2198,6 +2198,15 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             // 设置报关方式
             boxTallyBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType());
 
+            // 设置包装类型
+            String units = orderGoodsItemList.stream()
+                    .map(boxPreloadGoodsBackVO -> boxPreloadGoodsBackVO.getUnits())
+                    .filter(StringUtils::isNotEmpty)
+                    .flatMap(t -> Arrays.stream(t.split(",")))
+                    .distinct()
+                    .collect(Collectors.joining(","));
+            boxTallyBackVO.setUnits(units);
+
             // 是否有关联单
             boolean hasRelationOrder = orderGoodsItemList.stream().anyMatch(t -> t.getGuanLianOrderCount() > 0);
             boxTallyBackVO.setHasRelationOrder(hasRelationOrder);
@@ -2298,6 +2307,15 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             // 设置报关方式
             boxGuanlianOrderBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType());
 
+            // 设置包装类型
+            String units = orderGoodsItemList.stream()
+                    .map(boxPreloadGoodsBackVO -> boxPreloadGoodsBackVO.getUnits())
+                    .filter(StringUtils::isNotEmpty)
+                    .flatMap(t -> Arrays.stream(t.split(",")))
+                    .distinct()
+                    .collect(Collectors.joining(","));
+            boxGuanlianOrderBackVO.setUnits(units);
+
             // 是否有关联单
             boolean hasRelationOrder = orderGoodsItemList.stream().anyMatch(t -> t.getGuanLianOrderCount() > 0);
             boxGuanlianOrderBackVO.setHasRelationOrder(hasRelationOrder);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxTally/BoxGuanlianOrderBackVO.java

@@ -61,6 +61,8 @@ public class BoxGuanlianOrderBackVO {
      */
     private Integer customsType;
 
+    @ApiModelProperty(value = "包装类型（入仓汇总的，逗号分隔）")
+    private String units;
 
     @ApiModelProperty(value = "混箱状态, 1-混箱")
     private Integer mixStatus = 0;

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxTally/BoxTallyBackVO.java

@@ -78,6 +78,9 @@ public class BoxTallyBackVO {
     @ApiModelProperty(value = "混箱状态, 1-混箱")
     private Integer mixStatus = 0;
 
+    @ApiModelProperty(value = "包装类型（入仓汇总的，逗号分隔）")
+    private String units;
+
     @ApiModelProperty(value = "是否有关联单")
     private Boolean hasRelationOrder = false;