放货时有控货相关审批任务限制

Signed-off-by: zhengyi <landuo321@aliyun.com>

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

@@ -402,4 +402,6 @@ public interface ErrorCodeConstants {
     ErrorCode CLEARANCE_UNIT_NOT_NULL = new ErrorCode(1004001160, "order.item.clearance.unit.not.null");
     ErrorCode ORDER_CARGO_CONTROL_LIMIT_UPDATE_CONSIGNEE_ERROR = new ErrorCode(1004001155, "order.cargo.control.limit.update.consignee.error");
     ErrorCode ORDER_CARGO_CONTROL_LIMIT_UPDATE_CONSIGNEE_INFO = new ErrorCode(1004001156, "order.cargo.control.limit.update.consignee.info");
+    ErrorCode ORDER_CARGO_CONTROL_CONSIGNEE_LIMIT_UPDATE_APPLYING = new ErrorCode(1004001157, "order.cargo.control.consignee.limit.update.applying");
+    ErrorCode ORDER_CARGO_CONTROL_OVERSEAS_WAREHOUSE_UPDATE_APPLYING = new ErrorCode(1004001158, "order.cargo.control.overseas.warehouse.update.applying");
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickServiceImpl.java

@@ -142,6 +142,23 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
         if (orderDO.getCargoControlStatus() == 1) {
             throw exception(ORDER_CARGO_CONTROL_PICK_FINISH);
         }
+        // 检查订单是否在收货人限制修改申请中
+        long limitUpdateCount = orderApprovalMapper.selectCount(new LambdaQueryWrapper<OrderApprovalDO>()
+                .eq(OrderApprovalDO::getOrderId, orderDO.getOrderId())
+                .eq(OrderApprovalDO::getType, 61)
+                .eq(OrderApprovalDO::getStatus, 1)
+        );
+        if (limitUpdateCount > 0){
+            throw exception(ORDER_CARGO_CONTROL_CONSIGNEE_LIMIT_UPDATE_APPLYING);
+        }
+        long overseasWarehouseUpdateCount = orderApprovalMapper.selectCount(new LambdaQueryWrapper<OrderApprovalDO>()
+                .eq(OrderApprovalDO::getOrderId, orderDO.getOrderId())
+                .eq(OrderApprovalDO::getType, 62)
+                .eq(OrderApprovalDO::getStatus, 1)
+        );
+        if (overseasWarehouseUpdateCount > 0){
+            throw exception(ORDER_CARGO_CONTROL_OVERSEAS_WAREHOUSE_UPDATE_APPLYING);
+        }
         //不能大于总箱数
         if (createReqVO.getPickNum() > orderDO.getSumNum()) {
             throw exception(ORDER_CARGO_CONTROL_NUM_GO_BEYOND);

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

@@ -272,3 +272,5 @@ member.id.is.null=
 score.count.error=
 order.cargo.control.limit.update.consignee.error=
 order.cargo.control.limit.update.consignee.info=
+order.cargo.control.consignee.limit.update.applying=
+order.cargo.control.overseas.warehouse.update.applying=

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

@@ -1008,6 +1008,8 @@ order.item.clearance.currency.not.null=Customs clearance fee for order goods, cu
 order.item.clearance.unit.not.null=The unit of measurement for customs clearance fees for order goods cannot be empty
 order.cargo.control.limit.update.consignee.error=The current control order restricts the modification of the consignee, and no restriction time was found
 order.cargo.control.limit.update.consignee.info=The recipient restriction modification time for the controlled goods order has not expired, and the recipient information for the order cannot be modified
+order.cargo.control.consignee.limit.update.applying=The consignee's restriction modification application is in progress, and the goods cannot be released!
+order.cargo.control.overseas.warehouse.update.applying=The overseas warehouse modification application cannot proceed with the release of goods!
 
 member.id.is.null=no member ids
 score.count.error= score count must > 0

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

@@ -1033,7 +1033,8 @@ reward.redeem.recipient.error = \u793C\u54C1\u6536\u8D27\u4EBA\u4FE1\u606F\u4E0D
 redeem.import.no.record = \u8868\u683C\u4E2D\u65E0\u8BB0\u5F55
 order.cargo.control.limit.update.consignee.error=\u5f53\u524d\u63a7\u8d27\u8ba2\u5355\u9650\u5236\u4fee\u6539\u6536\u8d27\u4eba\uff0c\u672a\u67e5\u8be2\u5230\u9650\u5236\u65f6\u95f4
 order.cargo.control.limit.update.consignee.info=\u63a7\u8d27\u8ba2\u5355\u6536\u8d27\u4eba\u9650\u5236\u4fee\u6539\u65f6\u95f4\u672a\u5230\u671f\uff0c\u4e0d\u80fd\u4fee\u6539\u8ba2\u5355\u6536\u8d27\u4eba\u4fe1\u606f
-
+order.cargo.control.consignee.limit.update.applying=\u6536\u8d27\u4eba\u9650\u5236\u4fee\u6539\u7533\u8bf7\u4e2d\uff0c\u4e0d\u80fd\u8fdb\u884c\u653e\u8d27\uff01
+order.cargo.control.overseas.warehouse.update.applying=\u6d77\u5916\u4ed3\u4fee\u6539\u7533\u8bf7\u4e2d\uff0c\u4e0d\u80fd\u8fdb\u884c\u653e\u8d27\uff01
 
 get.lock.failed = \u670D\u52A1\u7E41\u5FD9\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5
 reward.redeem.not.exist = \u793C\u54C1\u5151\u6362\u8BB0\u5F55\u4E0D\u5B58\u5728