工位上货与医保校验相关调整

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -989,9 +989,12 @@ public class IoCodeTempController extends BaseController {
         if (codeEnttitys.size() > 0) {
             exitLocalEntity = isExitLocal(code, codeEnttitys);
             if (exitLocalEntity != null) {
-                if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) {
-                    return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！");
+                if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT))) {
+                    if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) {
+                        return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！");
+                    }
                 }
+
                 udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null);
 
                 BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity);

src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java

@@ -121,9 +121,11 @@ public class ThrOrderDownload implements IDownload {
                                 prefixMatchWrapper.apply("LEFT(ybbm, 20) = LEFT({0}, 20)", entity.getCheckCode());
                                 exactMatches = basicProductsDao.selectList(prefixMatchWrapper);
                             }
+                            collectOrderBiz.setRelId(entity.getRelId());
                             if (exactMatches.isEmpty()) {
                                 errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
                             }
+
                         } else {
                             BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1"));
                             if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) {