12/16 器械选入规格型号字段1.0

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -496,9 +496,12 @@ public class UdiContrastService {
                 udiProductEntity.setNameCode(thrProductsEntity.getCode());
                 udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
                 udiProductEntity.setPackUnit(thrProductsEntity.getMeasname());
-                udiProductEntity.setGgxh(basicInsMaterialEntity != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec());
-                udiProductEntity.setManufactory(basicInsMaterialEntity != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory());
-                udiProductEntity.setBzgg(thrProductsEntity.getSpec());
+                if (basicInsMaterialEntity != null){
+                    udiProductEntity.setGgxh(basicInsMaterialEntity.getSpecification() != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec());
+                    udiProductEntity.setManufactory(basicInsMaterialEntity.getManufacturerName() != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory());
+                }
+
+//                udiProductEntity.setBzgg(thrProductsEntity.getSpec());
                 udiProductEntity.setCpmctymc(thrProductsEntity.getName());
                 udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                 //包装单位

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

@@ -105,11 +105,21 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
                 if (checkCount == collectOrderBizResponse.getScanActCount()) {
                     BaseResponse response = new BaseResponse();
                     response.setData(filterCodeRequest.getCode());
-                    response.setCode(504);
+                    response.setCode(500);
                     response.setMessage("追溯码校验校验超出");
                     return response;
                 }
             }
+            //校验是否本单产品
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
+            IoCollectOrderBizBackup collectOrderBizBackup = checkProduct(filterCodeRequest.getBillNo(), udiEntity);
+            if (collectOrderBizBackup == null) {
+                BaseResponse response = new BaseResponse();
+                response.setData(filterCodeRequest.getCode());
+                response.setCode(500);
+                response.setMessage("非此单产品");
+                return response;
+            }
             IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
                     .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo())
                     .eq(IoCollectCodeBackup::getCode, filterCodeRequest.getCode()));
@@ -121,21 +131,11 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
                 return response;
             }
 
-            //校验是否本单产品
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
-            IoCollectOrderBizBackup collectOrderBizBackup = checkProduct(filterCodeRequest.getBillNo(), udiEntity);
-            if (collectOrderBizBackup == null) {
-                BaseResponse response = new BaseResponse();
-                response.setData(filterCodeRequest.getCode());
-                response.setCode(500);
-                response.setMessage("非此单产品");
-                return response;
-            }
+
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
             udiEntity.setCode(filterCodeRequest.getCode());
             AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
             setOrderCheckStatus(ioCollectCodeBackup);
-
             return ResultVOUtils.success(addEnterCodeResponse);
         } else {
             List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
@@ -295,7 +295,7 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
         for (CollectOrderBizResponse collectOrderBizResponse : list) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
             Integer checkCount = ioCollectOrderCheckCodeService.getCountByRelIdAndBillNo(udiRelevanceResponse.getId(), filterCodeRequest.getBillNo());
-            if (checkCount < collectOrderBizResponse.getScanActCount()) {
+            if (checkCount < collectOrderBizResponse.getScanCount()) {
                 return ResultVOUtils.error(500, udiRelevanceResponse.getCpmctymc() + "追溯码未校验完成");
             }
         }