扫码空单问题

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -647,6 +647,7 @@ public class IoCodeTempController extends BaseController {
 
                 boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo());
                 if (!isBillExit) {
+                    orderService.deleteByBillNo(orderEntity.getBillNo());
                     return ResultVOUtils.error(500, "请先录入业务详情");
                 }
             }
@@ -960,6 +961,13 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+
+        boolean r1 = orderDetailBizService.isExit(orderDetailCodeEntity.getOrderIdFk());
+        boolean r2 = ioOrderDetailCodeService.isExit(orderDetailCodeEntity.getOrderIdFk());
+        if (!r1 && !r2) {
+            orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk());
+        }
+
         orderEntity.setUpdateUser(getUserId() + "");
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -121,7 +121,8 @@ public class IoOrderDetailBizController extends BaseController {
         if (addBizProductReqeust.getOrderEntity() == null)
             return ResultVOUtils.error(500, "未指定订单");
         IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity();
-        if (StrUtil.isEmpty(orderEntity.getBillNo())) {
+        IoOrderEntity isExit = orderService.findByBillNo(orderEntity.getBillNo());
+        if (StrUtil.isEmpty(orderEntity.getBillNo()) || isExit == null) {
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
             InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
             String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
@@ -472,7 +473,19 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/order/delBizProduct")
     @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {
-        return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败");
+        IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Integer.parseInt(deleteRequest.getId()));
+        int result = orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId()));
+        if (result > 0) {
+            boolean r1 = orderDetailBizService.isExit(orderDetailBizEntity.getOrderIdFk());
+            boolean r2 = orderDetailCodeService.isExit(orderDetailBizEntity.getOrderIdFk());
+            if (!r1 && !r2) {
+                orderService.deleteByBillNo(orderDetailBizEntity.getOrderIdFk());
+            }
+            return ResultVOUtils.success("删除成功！");
+        }
+        return ResultVOUtils.error(500, "删除失败");
+
+
     }