备份

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

@@ -307,7 +307,7 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("保存成功！");
     }
 
-    //等待校验-立即提交
+    //待配货/待校验-立即提交
     @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/submitOrderWeb")
@@ -358,6 +358,107 @@ public class IoOrderController extends BaseController {
     }
 
 
+    //    待校验提交,以扫码结果提交
+    @RepeatSubmit()
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/codeResult/submitOrderWeb")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    public BaseResponse submitByCodeResult(@RequestBody AddOrderRequest addOrderRequest) {
+
+        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
+
+        //校验单据是否已完成
+        List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
+
+        if (CollUtil.isEmpty(orderDetailCodeEntities)) {
+            return ResultVOUtils.error(500, "单据还未扫码或和扫码校验存在异常无法提交！");
+        }
+
+        if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
+            if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
+                String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
+
+
+                if (StrUtil.isNotEmpty(errMsg)) {
+                    return ResultVOUtils.error(500, errMsg);
+                }
+                errMsg = checkInoutService.codeOrderCheck(orderDetailCodeEntities, orderDetailBizEntities);
+                if (StrUtil.isNotEmpty(errMsg)) {
+                    return ResultVOUtils.error(500, errMsg);
+                }
+                saveOrderWeb(addOrderRequest);
+                orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
+                orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+                orderService.update(orderEntity);
+                checkInoutService.check(addOrderRequest.getBillNo());
+            } else {
+                return ResultVOUtils.error(500, "单据校验提交失败,请先录入业务单据！");
+            }
+        } else {
+            orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
+            ioAddInoutService.dealProcess(orderEntity);
+            checkInoutService.check(addOrderRequest.getBillNo());
+            return ResultVOUtils.success("提交成功！");
+        }
+
+        return ResultVOUtils.success("提交成功！");
+    }
+
+
+    //待校验提交,以比对结果提交
+    @RepeatSubmit()
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/codeResult/submitOrderWeb")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    public BaseResponse submitByCheckResult(@RequestBody AddOrderRequest addOrderRequest) {
+
+        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
+
+        //校验单据是否已完成
+        List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
+
+        if (CollUtil.isEmpty(orderDetailCodeEntities)) {
+            return ResultVOUtils.error(500, "单据还未扫码或和扫码校验存在异常无法提交！");
+        }
+
+        if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
+            if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
+                String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
+
+
+                if (StrUtil.isNotEmpty(errMsg)) {
+                    return ResultVOUtils.error(500, errMsg);
+                }
+                errMsg = checkInoutService.codeOrderCheck(orderDetailCodeEntities, orderDetailBizEntities);
+                if (StrUtil.isNotEmpty(errMsg)) {
+                    return ResultVOUtils.error(500, errMsg);
+                }
+                saveOrderWeb(addOrderRequest);
+                orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
+                orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+                orderService.update(orderEntity);
+                checkInoutService.check(addOrderRequest.getBillNo());
+            } else {
+                return ResultVOUtils.error(500, "单据校验提交失败,请先录入业务单据！");
+            }
+        } else {
+            orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
+            ioAddInoutService.dealProcess(orderEntity);
+            checkInoutService.check(addOrderRequest.getBillNo());
+            return ResultVOUtils.success("提交成功！");
+        }
+
+        return ResultVOUtils.success("提交成功！");
+    }
+
     public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
         if (orderEntity == null) {
             return ResultVOUtils.error(500, "提交失败，请先添加物资！");
@@ -849,8 +950,6 @@ public class IoOrderController extends BaseController {
     @GetMapping("/udiwms/inout/order/getUserBean")
     public BaseResponse getUserBean() {
         AuthAdmin userBean = customerService.getUserBean();
-
-
         return ResultVOUtils.success(userBean);
     }