需求126 PDA-集运海运订单入仓

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderWarehouseIn/OrderWarehouseInController.java

@@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.order.controller.admin.orderWarehouseIn;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.redis.helper.RedisHelper;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.depository.service.warehouse.WarehouseService;
 import cn.iocoder.yudao.module.order.convert.orderWarehouseApproval.OrderWarehouseApprovalConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderWarehouseApproval.OrderWarehouseApprovalDO;
+import cn.iocoder.yudao.module.order.dal.dataobject.orderWarehouseIn.OrderWarehouseInDO;
 import cn.iocoder.yudao.module.order.enums.OrderWarehouseApprovalTypeEnum;
 import cn.iocoder.yudao.module.order.service.order.OrderService;
 import cn.iocoder.yudao.module.order.service.orderLabel.OrderLabelService;
@@ -92,6 +94,30 @@ public class OrderWarehouseInController {
         return success(orderWarehouseInService.deleteOrderWarehouseIn(orderWarehouseInId, false));
     }
 
+    @PostMapping("/deleteBox")
+    @ApiOperation("并箱")
+    public CommonResult<Boolean> deleteBox(@RequestParam("orderItemId") Long orderItemId) {
+        List<OrderWarehouseInDO> deleteList = orderWarehouseInService.selectList(new LambdaQueryWrapperX<OrderWarehouseInDO>()
+                .eq(OrderWarehouseInDO::getOrderItemId, orderItemId));
+        for (OrderWarehouseInDO orderWarehouseInDO : deleteList) {
+            orderWarehouseInService.deleteOrderWarehouseIn(orderWarehouseInDO.getId(), false);
+        }
+        return success(true);
+    }
+
+    @PostMapping("/deleteBoxList")
+    @ApiOperation("批量并箱")
+    public CommonResult<Boolean> deleteBoxList(@RequestBody List<Long> orderItemIds) {
+        for (Long orderItemId : orderItemIds) {
+            List<OrderWarehouseInDO> deleteList = orderWarehouseInService.selectList(new LambdaQueryWrapperX<OrderWarehouseInDO>()
+                    .eq(OrderWarehouseInDO::getOrderItemId, orderItemId));
+            for (OrderWarehouseInDO orderWarehouseInDO : deleteList) {
+                orderWarehouseInService.deleteOrderWarehouseIn(orderWarehouseInDO.getId(), false);
+            }
+        }
+        return success(true);
+    }
+
     @PostMapping("/delete-when-packaging")
     @ApiOperation("删除单次入仓纪录-备货时")
     public CommonResult<Boolean> deleteWhenPacked(@RequestParam("orderWarehouseInId") Long orderWarehouseInId) {