预警时间单位设置为“小时”，实际上单位还是“天”

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

@@ -448,7 +448,7 @@ public class IoCodeTempController extends BaseController {
         long recent = 0;
         if (udiRelevanceResponse.getRecentDateTime() != null)
             recent = udiRelevanceResponse.getRecentDateTime().longValue();
-        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
+        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()&& udiRelevanceResponse.getIsDateBy()==2) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = MsDateUtil.parseDateExpire(expireDate);
@@ -465,7 +465,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        if (bussinessTypeEntity.getCheckVailDate() == 2 && recent > 0) {
+        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy()==1) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = MsDateUtil.parseDateExpire(expireDate);
@@ -475,7 +475,8 @@ public class IoCodeTempController extends BaseController {
                 if (resultTime > 0) {
                     long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
-                        return ResultVOUtils.error(605, "当前产品临近过期，距过期还剩" + time + "天,无法添加！");
+//                        return ResultVOUtils.error(605, "当前产品临近过期，距过期还剩" + time + "天,无法添加！");
+                        return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,是否确定继续添加?");
                     }
                 }
             }