扫码校验

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -953,28 +953,25 @@ public class WareHouseController {
         //校验条码的完整性
         String errMsg = "";
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
-
+        if (udiRelevanceResponse == null) {
-        if (StrUtil.isEmpty(udiEntity.getBatchNo()) &&
+            return ResultVOUtils.error(501, "耗材字典不存在此产品！");
-                "是".equals(udiRelevanceResponse.getScbssfbhph()) && !udiRelevanceResponse.isAllowNoBatch()) {
+        }
+        if (StrUtil.isEmpty(udiEntity.getBatchNo()) && !udiRelevanceResponse.isAllowNoBatch()) {
             errMsg = errMsg + ",批次号";
         }
-        if (StrUtil.isEmpty(udiEntity.getProduceDate()) &&
+        if (StrUtil.isEmpty(udiEntity.getProduceDate()) && !udiRelevanceResponse.isAllowNoProduct()) {
-                "是".equals(udiRelevanceResponse.getScbssfbhscrq()) && !udiRelevanceResponse.isAllowNoProduct()) {
             errMsg = errMsg + ",生产日期";
         }
-        if (StrUtil.isEmpty(udiEntity.getExpireDate()) &&
+        if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.isAllowNoExpire()) {
-                "是".equals(udiRelevanceResponse.getScbssfbhsxrq()) && !udiRelevanceResponse.isAllowNoExpire()) {
             errMsg = errMsg + ",失效日期";
         }
-
+//        if (StrUtil.isEmpty(udiEntity.getSerialNo()) &&
-
+//                "是".equals(udiRelevanceResponse.getScbssfbhxlh())) {
-        if (StrUtil.isEmpty(udiEntity.getSerialNo()) &&
+//            errMsg = errMsg + ",序列号";
-                "是".equals(udiRelevanceResponse.getScbssfbhxlh())) {
+//        }
-            errMsg = errMsg + ",序列号";
-        }
 
         if (StrUtil.isNotEmpty(errMsg)) {
-            BaseResponse baseResponse = ResultVOUtils.error(507, "请补齐" + errMsg.substring(1) + "");
+            BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + "");
             baseResponse.setData(udiEntity);
             return baseResponse;
         }