fix: 1、理货页面-NG2424591L订单箱数未显示混箱 2、关联单统计数不正确的bug

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -1843,6 +1843,24 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                 orderVO.setTidanNum(boxPreloadGoodsDO.getTidanNum());
                 orderVO.setPreloadId(boxPreloadGoodsDO.getId());
 
+                // 设置混箱状态
+                Integer mixStatus = goodsList.stream().anyMatch(t -> t.getMixStatus() == 1) ? 1 : 0;
+                orderVO.setMixStatus(mixStatus);
+
+                // 设置包装类型
+                String units = goodsList.stream()
+                        .map(boxPreloadGoodsBackVO -> boxPreloadGoodsBackVO.getUnits())
+                        .filter(StringUtils::isNotEmpty)
+                        .flatMap(t -> Arrays.stream(t.split(",")))
+                        .distinct()
+                        .collect(Collectors.joining(","));
+                orderVO.setUnits(units);
+                orderVO.setUnits(boxPreloadGoodsDO.getUnits());
+
+                // 是否有关联单
+                boolean hasRelationOrder = goodsList.stream().anyMatch(t -> t.getGuanLianOrderCount() > 0);
+                orderVO.setHasRelationOrder(hasRelationOrder);
+
                 List<OrderItemDO> orderStaticsList = new ArrayList<>();
                 for (BoxPreloadGoodsBackVO item : goodsList) {
                     OrderItemDO orderItemDO = new OrderItemDO();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxLoadOrderVO.java

@@ -210,6 +210,16 @@ public class BoxLoadOrderVO {
 
     private Long shipmentId ;
 
+
+    @ApiModelProperty(value = "混箱状态, 1-混箱")
+    private Integer mixStatus = 0;
+
+    @ApiModelProperty(value = "包装类型（入仓汇总的，逗号分隔）")
+    private String units;
+
+    @ApiModelProperty(value = "是否有关联单")
+    private Boolean hasRelationOrder = false;
+
     public void setGuanLianOrderStatus(String guanLianOrderStatus) {
         this.guanLianOrderStatus = guanLianOrderStatus;
         if (StringUtils.isNotBlank(guanLianOrderStatus)) {