From 90d5cc3233fa77a210c30e811e563380fac51287 Mon Sep 17 00:00:00 2001
From: gongbx <DIMO1992>
Date: Thu, 9 May 2024 20:07:18 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eas/dao/xml/EasOutInBillDetailMapper.xml         |  4 ++--
 .../eas/service/impl/EasOutInBillServiceImpl.java    | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
index 5ca2c00..ac821dd 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
@@ -7,7 +7,7 @@
         FROM
                 EAS_NOBLE.V_UC_OUTINBILL
         WHERE  DJZT = '提交'
-          AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '15' DAY(3)
+          AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '91' DAY(3)
     </select>
     <select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT
@@ -19,7 +19,7 @@
             DJZT = '未入库'
           AND CJSJ >= DATE_SUB(
                 CURDATE(),
-                INTERVAL 15 DAY)
+                INTERVAL 91 DAY)
     </select>
     <select id="selectEasIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
index 9e518f3..e8ad2c5 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
@@ -33,6 +33,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -185,10 +187,10 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
                 log.error("异常信息：" + e.toString());
             }
         }, pool);
-        CompletableFuture.runAsync(() -> {
-                //todo 检查事务是否会失效
-                autoDeleteBill(easOutInBillDetails, existingIds);
-        }, pool);
+//        CompletableFuture.runAsync(() -> {
+//                //todo 检查事务是否会失效
+//                autoDeleteBill(easOutInBillDetails, existingIds);
+//        }, pool);
     }
 
 
@@ -212,6 +214,8 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
                     } else {
                         //srm的未入库改为提交
                         bill.setDjzt("提交");
+                        bill.setCjsj(LocalDateTime.parse(bill.getCjsj(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toLocalDate().toString());
+                        bill.setYwrq(LocalDateTime.parse(bill.getYwrq(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toLocalDate().toString());
                     }
                 })
                 .collect(Collectors.toList());