From f2ee8ab406a7626e594bdb1702c67462dfa97034 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 2 Dec 2024 10:25:51 +0800
Subject: [PATCH] 2024/12/02

---
 .../service/impl/ShipmentRollServiceImpl.java        | 12 +-----------
 .../mapper/material/ProductionStockMapper.xml        |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
index b291226..58218c3 100644
--- a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
+++ b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
@@ -51,16 +51,6 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
         return baseMapper.selectShipmentRollVoList(shipmentRollVo);
     }
 
-    public static void main(String[] args) throws ParseException {
-        LocalDate now = LocalDate.now();
-        Date date1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2024-10-27 00:00:00");
-        LocalDate date = LocalDate.parse(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date1), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        long days = date.toEpochDay() - now.toEpochDay();
-        // 判断当前日期 是否在失效日期之前
-        if (new Date().after(date1) || days <= 20) {
-            throw new RuntimeException(date1 + "超出出货有效期天数");
-        }
-    }
     @Override
     @Transactional
     public void insertShipmentRoll(ShipmentRollVo shipmentRollVo) {
@@ -89,7 +79,7 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
         LocalDate now = LocalDate.now();
         LocalDate date = LocalDate.parse(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(rollData.getExpiredDate()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         long days = date.toEpochDay() - now.toEpochDay();
-        // 判断当前日期 是否在失效日期之前
+        // 判断当前日期 是否在失效日期之后
         if (new Date().after(rollData.getExpiredDate()) || days <= value) {
             throw new RuntimeException(rollData.getPartNo() + "超出出货有效期天数");
         }
diff --git a/src/main/resources/mapper/material/ProductionStockMapper.xml b/src/main/resources/mapper/material/ProductionStockMapper.xml
index 203c666..cab14b9 100644
--- a/src/main/resources/mapper/material/ProductionStockMapper.xml
+++ b/src/main/resources/mapper/material/ProductionStockMapper.xml
@@ -353,7 +353,8 @@
                created_date,
                final_roll_no,
                manufacture_date,
-               status
+               status,
+               expired_date
         from so_final_roll
         where site = #{site}
           and system_batch_no = #{systemBatchNo}