关联关系临时解决

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -206,7 +206,18 @@ public class IoCollectOrderCodeManController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<IoCollectOrderCodeMan> collectOrderCodeMEN = addTagCodeReqeust.getCollectOrderCodeManList();
+        List<IoCollectOrderCodeMan> collectOrderCodeMEN = new ArrayList<>();
+        if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) {
+            for (String code : addTagCodeReqeust.getCodeList()) {
+                IoCollectOrderCodeMan collectOrderCodeMan = collectOrderCodeManService.findByCode(addTagCodeReqeust.getBillNo(), code);
+                if (collectOrderCodeMan == null) {
+                    return ResultVOUtils.error("非此单追溯码！");
+                } else {
+                    collectOrderCodeMEN.add(collectOrderCodeMan);
+                }
+            }
+
+        } else collectOrderCodeMEN = addTagCodeReqeust.getCollectOrderCodeManList();
         if (CollUtil.isNotEmpty(collectOrderCodeMEN)) {
             for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeMEN) {
                 collectOrderCodeManService.updateById(collectOrderCodeMan);
@@ -218,33 +229,36 @@ public class IoCollectOrderCodeManController extends BaseController {
             return ResultVOUtils.success("更新成功！");
         }
 
-        if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) {
+
-            List<String> codeList = addTagCodeReqeust.getCodeList();
+        return ResultVOUtils.error("扫码不能为空！");
-            String billNo = addTagCodeReqeust.getBillNo();
+
-            List<IoCollectOrderCodeMan> ioCollectOrderCodeMEN = collectOrderCodeManService.listByBillNo(billNo);
+//        if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) {
-            Map<String, IoCollectOrderCodeMan> codeManMap = ioCollectOrderCodeMEN.stream().collect(Collectors.toMap(IoCollectOrderCodeMan::getUdiCode, x -> x));
+//            List<String> codeList = addTagCodeReqeust.getCodeList();
-            List<Long> bizIdFks = new ArrayList<>();
+//            String billNo = addTagCodeReqeust.getBillNo();
-            //codeList 拆零确认码 对 单据的biz进行匹配 匹配上标记是拆零码
+//            List<IoCollectOrderCodeMan> ioCollectOrderCodeMEN = collectOrderCodeManService.listByBillNo(billNo);
-            for (int i = 0; i < codeList.size(); i++) {
+//            Map<String, IoCollectOrderCodeMan> codeManMap = ioCollectOrderCodeMEN.stream().collect(Collectors.toMap(IoCollectOrderCodeMan::getUdiCode, x -> x));
-                String code = codeList.get(i);
+//            List<Long> bizIdFks = new ArrayList<>();
-                IoCollectOrderCodeMan ioCollectOrderCodeMan = codeManMap.get(code);
+//            //codeList 拆零确认码 对 单据的biz进行匹配 匹配上标记是拆零码
-                if (ioCollectOrderCodeMan != null) {
+//            for (int i = 0; i < codeList.size(); i++) {
-                    //更新业务表为无需确认拆零码、码明细确认拆零字段为true
+//                String code = codeList.get(i);
-                    ioCollectOrderCodeMan.setIsSplitCode(true);
+//                IoCollectOrderCodeMan ioCollectOrderCodeMan = codeManMap.get(code);
-                    collectOrderCodeManService.updateById(ioCollectOrderCodeMan);
+//                if (ioCollectOrderCodeMan != null) {
-                    bizIdFks.add(ioCollectOrderCodeMan.getBizIdFk());
+//                    //更新业务表为无需确认拆零码、码明细确认拆零字段为true
-                }
+//                    ioCollectOrderCodeMan.setIsSplitCode(true);
-            }
+//                    collectOrderCodeManService.updateById(ioCollectOrderCodeMan);
-            if (bizIdFks.size() > 0) {
+//                    bizIdFks.add(ioCollectOrderCodeMan.getBizIdFk());
-                UpdateWrapper<IoCollectOrderBiz> updateWrapper = new UpdateWrapper<>();
+//                }
-                updateWrapper.set("splitUnCheck", false);
+//            }
-                updateWrapper.in("id", bizIdFks);
+//            if (bizIdFks.size() > 0) {
-                collectOrderBizService.update(updateWrapper);
+//                UpdateWrapper<IoCollectOrderBiz> updateWrapper = new UpdateWrapper<>();
-            }
+//                updateWrapper.set("splitUnCheck", false);
-            return ResultVOUtils.success("更新成功");
+//                updateWrapper.in("id", bizIdFks);
-        } else {
+//                collectOrderBizService.update(updateWrapper);
-            return ResultVOUtils.error("数据不能为空");
+//            }
-        }
+//            return ResultVOUtils.success("更新成功");
+//        } else {
+//            return ResultVOUtils.error("数据不能为空");
+//        }
     }
 
     public String countSameErrMsg(List<VailCodeResultResponse> vailCodeResultResponses) {

src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java

@@ -38,6 +38,7 @@ import com.glxp.api.util.StringUtils;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.collect.RelCodeBatchMapper;
@@ -101,7 +102,6 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
     }
 
 
-
     /**
      * 手动添加
      *
@@ -280,6 +280,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
     SpsDirectClient spsDirectClient;
     @Resource
     private SpGetHttpClient spGetHttpClient;
+
     /**
      * 层级编码查询spms同步库
      */
@@ -299,11 +300,14 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
     UdiProductService udiProductService;
 
     public void threadUpdateIoCodeTempEntity(String parentCode) {
+
+        ThreadUtil.execAsync(() -> {
             List<IoCodeTempEntity> ioCodeTempEntities = ioCodeTempDao.selectList(new LambdaQueryWrapper<IoCodeTempEntity>().eq(IoCodeTempEntity::getCode, parentCode));
             if (CollUtil.isNotEmpty(ioCodeTempEntities)) {
                 IoCodeTempEntity codeTempEntity = ioCodeTempEntities.get(0);
                 //1、排除掉层级是1的
                 UdiEntity udi = FilterUdiUtils.getUdi(parentCode);
+
                 if (udi == null)
                     return;
                 String udi1 = udi.getUdi();
@@ -381,11 +385,11 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                         ioCodeTempDao.updateById(ioCodeTempEntity);
                     }
                 } else {
-                ThreadUtil.execAsync(() -> {
                     asynThreadUpdateIoCodeTempEntity(parentCode, ioCodeTempEntities);
-                });
                 }
             }
+        });
+
 
     }
 
@@ -561,6 +565,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
     /**
      * 通过curCode 获取明细的数量 如果是 三级 需要先去计算二级单下的一级数量 在算出二级数量
      * 如果是 二级 直接计算出 一级
+     *
      * @param item
      */
     private void updateDrugLevelCount(RelCodeBatch item) {