Merge branch 'master-air-preload' into release

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

@@ -2417,6 +2417,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             //修改为分拣中
             boxDO.setPrStatus(StStatusEnum.SORTING.getStStatus());
             boxService.updateById(boxDO);
+            for (Long oId : orderIdList) {
+                boxService.updateOrderStatus(oId, null, null,
+                        BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
+            }
             boxService.addOrderLog(orderIdList, OrderShipmentLog.SORTING_ADD, "");
         } else if (boxDO.getPrStatus() == StStatusEnum.SORTING_APPROVAL_SUCCESS.getStStatus()) {
             //补单。修改订单状态
@@ -2436,6 +2440,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
 
             boxService.addOrderLog(orderIdList, OrderShipmentLog.MERGE_PATCH, "");
         } else {
+            for (Long oId : orderIdList) {
+                boxService.updateOrderStatus(oId, null, null,
+                        BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
+            }
             boxService.addOrderLog(orderIdList, OrderShipmentLog.SORTING_ADD, "");
         }