diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 11826cf29..24bbb2f80 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1240,6 +1240,8 @@ public class IoCodeTempController extends BaseController { orderEntity.setBusType(bussinessTypeEntity.getBusType()); orderEntity.setSickerAdNum(addOrderRequest.getSickerAdNum()); orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode()); + orderEntity.setSplitBusType(addOrderRequest.getSplitBusType()); + orderEntity.setFifoSplit(addOrderRequest.getFifoSplit()); orderEntity.setProductType(2); orderService.insertOrder(orderEntity); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 9c262f820..ac56d1af7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -119,6 +119,8 @@ public class IoSplitController extends BaseController { @Resource IoCollectOrderService collectOrderService; + @Resource + SysWorkplaceDocumentService sysWorkplaceDocumentService; /** * 开始自动赋码 @@ -126,20 +128,24 @@ public class IoSplitController extends BaseController { * @return */ @PostMapping("/udiwms/ioSplit/material/order/split") - public BaseResponse startSplit(@RequestBody AddTagCodeReqeust addTagCodeReqeust, - BindingResult bindingResult) { + public BaseResponse startSplit(@RequestBody AddTagCodeReqeust addTagCodeReqeust) { IoCollectOrder collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo()); if (collectOrder == null) { return ResultVOUtils.error(500, "未找到单据"); } - - //未拆零 - if (IntUtil.value(collectOrder.getSplitStatus()) != 2) { - splitCodeService.orderAutoTagCode(collectOrder); + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); + if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { + //未拆零 + if (IntUtil.value(collectOrder.getSplitStatus()) != 2) { + splitCodeService.orderAutoTagCode(collectOrder); + } + return ResultVOUtils.success("后台已开始赋码,请稍后刷新查看"); + } else { + return ResultVOUtils.success("无需自动赋码"); } - return ResultVOUtils.success("后台已开始赋码,请稍后刷新查看"); + } /**