From fa608c4491ad259f8b420fb9807867f8aa431096 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 11 Jun 2024 17:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/Impl/IssureSoServiceImpl.java       | 2 +-
 .../material/service/Impl/PoReceiveServiceImpl.java      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java b/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
index daca0cb..88f5b42 100644
--- a/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
+++ b/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
@@ -206,7 +206,7 @@ public class IssureSoServiceImpl implements IssureSoService {
         saveData.setEnterBy(sysUserEntity.getUsername());
         issureSoMapper.saveIssureCach(saveData);
         String reStr="";
-        Date futureDate = new Date(currentDate.getTime() + (45 * 24 * 60 * 60 * 1000));
+        Date futureDate = new Date(currentDate.getTime() + (90 * 24 * 60 * 60 * 1000));
         if(futureDate.after(InventoryStockRollList.get(0).getExpiredDate())){
             reStr="有效期已不足90天,失效日期为"+DateUtil.getStringDate(InventoryStockRollList.get(0).getExpiredDate());
         }
diff --git a/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java b/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java
index 3715833..0d7ddd7 100644
--- a/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java
+++ b/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -149,6 +150,14 @@ public class PoReceiveServiceImpl implements PoReceiveService {
         if(checkPartNo.size()==0){
             throw new RuntimeException("物料不存在或者不在用");
         }
+        Date currentDate = new Date();
+        if(currentDate.after(inData.getExpiredDate())){
+            throw new RuntimeException("该物料已过期，失效日期为"+DateUtil.getStringDate(inData.getExpiredDate()));
+        }
+        Date futureDate = new Date(currentDate.getTime() - (45 * 24 * 60 * 60 * 1000));
+        if(futureDate.after(inData.getManufactureDate())){
+            throw new RuntimeException("该物料生产日期在45天以前，生产日期为"+DateUtil.getStringDate(inData.getExpiredDate()));
+        }
         for (int i = 0; i < inData.getRollNumber(); i++) {
             String rollNo= transNoControlService.transNo(inData.getSite(), "RollNo");
             inData.setRollNo(rollNo);