Commit 472bec4f authored by knight's avatar knight Committed by wux

bug210 【订单列表-修改货值】预装反审中的订单,应该能进行<修改货值>操作

parent e02117d8
...@@ -1919,15 +1919,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1919,15 +1919,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409]) // 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409])
// 2025年1月15日 增加货值修改功能,开放预装时修改订单货值307(已预装)、407(空运分拣)、409(空运理货) // 2025年1月15日 增加货值修改功能,开放预装时修改订单货值307(已预装)、407(空运分拣)、409(空运理货)
if ((vo.getStatus() != 16 && vo.getShipmentState() == 0) if ((vo.getStatus() != 16 && vo.getShipmentState() == 0)
|| vo.getShipmentState() == 305 // || vo.getShipmentState() == 305
//|| vo.getShipmentState() == 307 // || vo.getShipmentState() == 307
|| vo.getShipmentState() == 309 // || vo.getShipmentState() == 309
|| vo.getShipmentState() == 310 // || vo.getShipmentState() == 310
|| vo.getShipmentState() == 311 // || vo.getShipmentState() == 311
|| vo.getShipmentState() == 313 // || vo.getShipmentState() == 313
//|| vo.getShipmentState() == 407 // || vo.getShipmentState() == 407
//|| vo.getShipmentState() == 409 // || vo.getShipmentState() == 409
|| vo.getShipmentState() == 411) { // || vo.getShipmentState() == 411
) {
if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) { if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE); throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment