新增拆零回退

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("后台已开始赋码，请稍后刷新查看");
+    }
+
+
     /**
      * 器械拆零处方赋码（手动赋码)
      *

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -254,6 +254,24 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     }
 
 
+    /**
+     * 拆零单据撤回，则将拆零表剩余数量加回预出库队列
+     *
+     * @param collectOrder
+     */
+    public void backSplit(IoCollectOrder collectOrder) {
+        List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
+        for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
+            List<IoSplitCodeEntity> 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);
+            }
+        }
+    }
+
+
     /**
      * 从预出库队列里面取出数据，添加至拆零表
      */