Merge remote-tracking branch 'origin/master'

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

@@ -431,6 +431,15 @@ public class IoCodeTempController extends BaseController {
                 }
             }
         }
+        if (bussinessTypeEntity.getCheckExpire() == 2) {
+            if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
+                String expireDate = "20" + udiEntity.getExpireDate();
+                long expireTime = DateUtil.parseDateExpire(expireDate);
+                if (expireTime - System.currentTimeMillis() < 0) {
+                    return ResultVOUtils.error(604, "当前产品已过期,无法添加?");
+                }
+            }
+        }
 
 
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
@@ -465,7 +474,7 @@ public class IoCodeTempController extends BaseController {
                 if (resultTime > 0) {
                     long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
-                        return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,无法添加?");
+                        return ResultVOUtils.error(605, "当前产品临近过期，距过期还剩" + time + "天,无法添加！");
                     }
                 }
             }