diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 0dcb8feb9..b1bb8b254 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -407,6 +407,20 @@ public class IoCollectOrderController extends BaseController { collectOrderService.finishOrder(collectOrderRequest, getUser(), false); return ResultVOUtils.success(); } + @PostMapping("/udiwms/basic/collect/order/finishCheckOrder") + @Transactional(rollbackFor = Exception.class) + public BaseResponse finishCheckOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + if (!IntUtil.value(collectOrderRequest.getConfirmFinish())) { + //1.校验是否全部自动赋码 + CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); + collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); + List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); + boolean isAllTag = collectOrderBizResponses.stream() + .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2); + } + collectOrderService.finishOrder(collectOrderRequest, getUser(), false); + return ResultVOUtils.success(); + } @Resource IoSplitCodeService splitCodeService;