需求38 预装-未装柜完成或出仓完成的订单修改货值

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -1828,7 +1828,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         if (approvalTypeCheckEvent.getResult()) {
             throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
         }
-        if (vo.getShipmentState() > 0) {
+        // 2025年1月15日 增加订单修改货值功能，预装后可单独修改货值
+        if (vo.getShipmentState() > 0 && vo.getShipmentState() != 304 ) {
             throw exception(ORDER_SHIPMENT_NOT_UPDATE);
         }
         // 获取功能开关
@@ -1914,15 +1915,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
          * 海运订单、拆单子单已装柜/空运已出货，订单信息修改，不需要更新价格
          */
         // 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409])
+        // 2025年1月15日 增加货值修改功能，开放预装时修改订单货值307（已预装）、407（空运分拣）、409（空运理货）
         if ((vo.getStatus() != 16 && vo.getShipmentState() == 0)
                 || vo.getShipmentState() == 305
-                || vo.getShipmentState() == 307
+                //|| vo.getShipmentState() == 307
                 || vo.getShipmentState() == 309
                 || vo.getShipmentState() == 310
                 || vo.getShipmentState() == 311
                 || vo.getShipmentState() == 313
-                || vo.getShipmentState() == 407
-                || vo.getShipmentState() == 409
+                //|| vo.getShipmentState() == 407
+                //|| vo.getShipmentState() == 409
                 || vo.getShipmentState() == 411) {
             if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
                 throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);