From cddef69ce7529ab5c84eae6821d992121794fa02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 18 Jul 2023 18:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=B6=E9=97=B4=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=AE=BE=E7=BD=AE=E4=B8=BA=E2=80=9C=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E5=AE=9E=E9=99=85=E4=B8=8A=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E2=80=9C=E5=A4=A9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/inout/IoCodeTempController.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index b3d011972..e201cdb28 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/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 + "天,是否确定继续添加?");
                     }
                 }
             }