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 bffe3486f..9c262f820 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -133,6 +133,7 @@ public class IoSplitController extends BaseController { return ResultVOUtils.error(500, "未找到单据"); } + //未拆零 if (IntUtil.value(collectOrder.getSplitStatus()) != 2) { splitCodeService.orderAutoTagCode(collectOrder); @@ -141,6 +142,24 @@ public class IoSplitController extends BaseController { return ResultVOUtils.success("后台已开始赋码,请稍后刷新查看"); } + /** + * 开始自动赋码 + * + * @return + */ + @PostMapping("/udiwms/ioSplit/material/order/backSplit") + public BaseResponse backSplit(@RequestBody AddTagCodeReqeust addTagCodeReqeust, + BindingResult bindingResult) { + IoCollectOrder collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + splitCodeService.backSplit(collectOrder); + + return ResultVOUtils.success("后台已开始赋码,请稍后刷新查看"); + } + + /** * 器械拆零处方赋码(手动赋码) * diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index c9785e3a8..80c5c2ae4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -254,6 +254,24 @@ public class IoSplitCodeService extends ServiceImpl collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo()); + for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { + List ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), collectOrder.getWorkPlaceCode()); + if (CollUtil.isNotEmpty(ioSplitCodeEntities)) { + IoSplitCodeEntity splitCodeEntity = ioSplitCodeEntities.get(0); + splitCodeEntity.setRemainCount(IntUtil.value(splitCodeEntity.getRemainCount()) + (IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getUnTagCount()))); + splitCodeMapper.updateById(splitCodeEntity); + } + } + } + + /** * 从预出库队列里面取出数据,添加至拆零表 */