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

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxPreloadGoodsMapper.java

@@ -118,7 +118,8 @@ public interface BoxPreloadGoodsMapper extends AbstractMapper<BoxPreloadGoodsDO>
             "ewl.dest_warehouse_id, ",
             "IFNULL((select a.pkg_id from ecw_box_pkg_order a where a.deleted=0 and a.order_item_id=ebpg.order_item_id limit 1),0) as pkgId, ",
             "(select t1.pkg_num from ecw_box_pkg_order t INNER JOIN ecw_box_merge_pkg t1 on t.pkg_id=t1.id where t.deleted=0 and t1.deleted=0 and t.order_id=ebpg.order_id limit 1) as pkgNum, ",
-            "(select count(0) from ecw_order_guanlian t LEFT JOIN ecw_order t1 on t.order_id=t1.order_id LEFT JOIN ecw_order t2 on t.relate_order_id=t2.order_id  where (t.order_id=3398 or t.relate_order_id = 3398) and t1.deleted=0 and t2.deleted=0 and t.deleted=0 ) as guanLianOrderCount ",
+            "(select count(0) from ecw_order_guanlian t LEFT JOIN ecw_order t1 on t.order_id=t1.order_id LEFT JOIN ecw_order t2 on t.relate_order_id=t2.order_id  where (t.order_id = eo.order_id or t.relate_order_id = eo.order_id) and t1.deleted=0 and t2.deleted=0 and t.deleted=0 ) as guanLianOrderCount, ",
+            "(select count(0) from ecw_order_warehouse_in owi where owi.order_item_id = eoi.order_item_id and owi.deleted = 0 and JSON_LENGTH(owi.order_warehouse_in_details) > 0) as mixCount",
             "FROM ecw_box_preload_goods ebpg ",
             "INNER JOIN ecw_box_preload_section ebps ON ebpg.sec_id = ebps.id ",
             "INNER JOIN ecw_order eo ON eo.order_id = ebpg.order_id ",

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

@@ -463,16 +463,13 @@ public class BoxPreloadGoodsBackVO {
         }
     }
 
+    @ApiModelProperty(value = "混箱的入仓纪录数")
+    private Integer mixCount = 0;
     @ApiModelProperty(value = "混箱状态, 1-混箱")
     private Integer mixStatus = 0;
-
     public Integer getMixStatus() {
-        WarehouseInInfoVO warehouseInInfoVO = getWarehouseInInfoVO();
-        if(warehouseInInfoVO != null) {
-            //入仓纪录明细不为空则是混箱
-            mixStatus = warehouseInInfoVO.getMixStatus();
-        }
-        return mixStatus;
+        // 当混箱的入仓纪录数大于0时，就认为是混箱
+        return mixCount > 0 ? 1 : 0;
     }
 
     /**