已预装未提交预装审核的订单补充出货状态更新冗余

sql/update_2024-09.sql

+-- 更新订单添加预装但未提交审核的出货状态值
+update ecw_order o set o.shipment_state = 304 WHERE o.`status` = 5 AND o.shipment_state = 0 AND (select COUNT(1) from ecw_box_preload_goods pg WHERE pg.order_id = o.order_id AND pg.deleted = 0) > 0;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderStatusMsgEnum.java

@@ -29,7 +29,9 @@ public enum OrderStatusMsgEnum {
 
     ADJUST_WAREHOUSE(5, 10113, 215, 0, "调仓已到仓", "order.status.adjust.arrived.warehouse", "order.status.adjust.arrived.warehouse"),
     EXIT_WAREHOUSE(5, 10114, 216, 0, "报关退场已入仓", "order.status.adjust.demobilized.warehoused", "order.status.warehousing"),
-    PREINSTALL_EXAMINE(5, 10115, 0, 305, "预装审核中", "order.status.pre.install.review", "order.status.pre.install.review"),
+    PRE_INSTALLED_PROGRESS(5, 10115, 0, 304, "已入仓", "order.status.warehousing", "order.status.warehousing"),
+//    PRE_INSTALLED_PROGRESS(5, 10115, 0, 304, "预装中", "order.status.pre.install", "order.status.pre.install"),
+    PREINSTALL_EXAMINE(5, 10116, 0, 305, "预装审核中", "order.status.pre.install.review", "order.status.pre.install.review"),
 
 
     WITHDRAWN(7, 0, 0, 0, "已退仓", "Withdrawn", "order.status.draft"),

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

@@ -449,6 +449,8 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             //修改为预装中
             boxDO.setPrStatus(PrStatusEnum.PRELOAD_ING.getPrStatus());
             boxService.updateById(boxDO);
+            boxService.updateOrderStatus(orderId, null, null,
+                    BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
             boxService.addOrderLog(Collections.singletonList(orderId), OrderShipmentLog.PRELOAD_ADD, "");
         } else if (boxDO.getPrStatus() == PrStatusEnum.PRELOAD_APPROVAL_SUCCESS.getPrStatus()) {
             //补单。修改订单状态

yudao-server/src/main/resources/i18n/messages_en.properties

@@ -353,6 +353,7 @@ order.status.adjust.wait.out.warehouse=Transfer warehouse to be out of warehouse
 order.status.adjust.wait.in.warehouse=Transferred warehouse to be warehoused
 order.status.adjust.arrived.warehouse=Warehouse transfer has arrived
 order.status.adjust.demobilized.warehoused=Demobilized and warehoused
+order.status.pre.install=Pre installed
 order.status.pre.install.review=Pre installation under review
 order.status.preinstalled=Preinstalled
 order.status.dispatched.car.wait.pick.counter=The car has been dispatched, waiting to pick up the counter

yudao-server/src/main/resources/i18n/messages_zh.properties

@@ -354,6 +354,7 @@ order.status.adjust.wait.out.warehouse=\u8C03\u4ED3\u5F85\u51FA\u4ED3
 order.status.adjust.wait.in.warehouse=\u8C03\u4ED3\u5F85\u5165\u4ED3
 order.status.adjust.arrived.warehouse=\u8C03\u4ED3\u5DF2\u5230\u4ED3
 order.status.adjust.demobilized.warehoused=\u9000\u573A\u5DF2\u5165\u4ED3
+order.status.pre.install=\u9884\u88C5\u4E2D
 order.status.pre.install.review=\u9884\u88C5\u5BA1\u6838\u4E2D
 order.status.preinstalled=\u5DF2\u9884\u88C5
 order.status.dispatched.car.wait.pick.counter=\u5DF2\u6D3E\u8F66\uFF0C\u5F85\u63D0\u67DC