From 3076a9d20f2130ae619bfbd26260596caa6f6ef6 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <DIMO1992>
Date: Wed, 12 Jun 2024 10:23:20 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eas/dao/mapper/AllocationBillMapper.java         |  4 ++--
 .../eas/dao/xml/EasOutInBillDetailMapper.xml         | 12 ++++++------
 .../org/nl/wms/database/eas/dto/InventoryInfos.java  |  5 ++++-
 .../eas/service/impl/AllocationBillServiceImpl.java  |  6 +++---
 .../eas/service/impl/EasOutInBillServiceImpl.java    |  7 ++++---
 .../eas/service/impl/ReceiptBillServiceImpl.java     |  2 +-
 .../java/org/nl/wms/schedule/EasBillSchedule.java    |  6 +++---
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java
index ac1c517..aee4a25 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java
@@ -22,10 +22,10 @@ public interface AllocationBillMapper extends BaseMapper<AllocationBill> {
 
 
     @DS("oracle_eas")
-    Long getAllocationCount(@Param("fuzzy") String fuzzy,@Param("ckbm") String ckbm);
+    Long getAllocationCount(@Param("fuzzy") String fuzzy,@Param("drkcbm") String drkcbm,@Param("dckcbm") String dckcbm);
 
     @DS("oracle_eas")
-    List<AllocationBillQuery> allocationPage(@Param("fuzzy") String fuzzy, @Param("ckbm") String ckbm,@Param("page") Integer page, @Param("size") Integer size );
+    List<AllocationBillQuery> allocationPage(@Param("fuzzy") String fuzzy,@Param("drkcbm") String drkcbm,@Param("dckcbm") String dckcbm,@Param("page") Integer page, @Param("size") Integer size );
 
 
     @Select("SELECT COUNT(*) FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL WHERE DJID = #{djid}")
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 f50f3ab..a179b46 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
@@ -5,7 +5,7 @@
         SELECT *
         FROM EAS_NOBLE.V_UC_OUTINBILL
         WHERE DJZT = '提交'
-          AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '60' DAY(3)
+          AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '1' DAY(3)
     </select>
     <select id="selectSrmPages" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT *,
@@ -14,13 +14,13 @@
         WHERE DJZT = '未入库'
           AND CJSJ >= DATE_SUB(
                 CURDATE(),
-                INTERVAL 60 DAY)
+                INTERVAL 1 DAY)
     </select>
     <select id="selectPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT *
         FROM EAS_NOBLE.V_UC_OUTINBILL
         WHERE DJZT = '提交'
-          AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '15' DAY(3)
+          AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '30' DAY(3)
     </select>
     <select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT *,
@@ -29,21 +29,21 @@
         WHERE DJZT = '未入库'
           AND CJSJ >= DATE_SUB(
                 CURDATE(),
-                INTERVAL 15 DAY)
+                INTERVAL 30 DAY)
     </select>
     <select id="selectEasIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT DJID,
                FLID
         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 '30' DAY(3)
     </select>
     <select id="selectSrmIds" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
         SELECT FLID,
                DJID
         FROM V_WMS_INBILL_THIRD
         WHERE DJZT = '未入库'
-          AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 15 DAY)
+          AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
     </select>
     <select id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo">
         SELECT
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/InventoryInfos.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/InventoryInfos.java
index 2e46553..3a40679 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/InventoryInfos.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/InventoryInfos.java
@@ -24,7 +24,10 @@ public class InventoryInfos extends Model<InventoryInfos> {
     //@TableId(value = "id", type = IdType.NONE)
 
 
-
+    /**
+     * 库存id
+     */
+    private String id;
 
     /**
      * 物料编码
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
index 34d36f3..2145c72 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
@@ -68,14 +68,14 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
         AtomicLong totalCount = new AtomicLong(0L);
         CompletableFuture<Void> count = CompletableFuture.runAsync(() -> {
             try {
-                totalCount.set(allocationBillMapper.getAllocationCount(params.getFuzzy(), params.getKczzbm()));
+                totalCount.set(allocationBillMapper.getAllocationCount(params.getFuzzy(),params.getDrkcbm(), params.getDckcbm()));
             } catch (Exception e) {
                 log.error("异常信息：" + e);
             }
         }, pool);
         CompletableFuture<List<AllocationBillQuery>> page = CompletableFuture.supplyAsync(() -> {
             try {
-                return allocationBillMapper.allocationPage(params.getFuzzy(), params.getKczzbm(), params.getPage(), params.getSize());
+                return allocationBillMapper.allocationPage(params.getFuzzy(),params.getDrkcbm(), params.getDckcbm(),params.getPage(), params.getSize());
             } catch (Exception e) {
                 log.error("异常信息：" + e);
                 return Collections.emptyList();
@@ -262,7 +262,7 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
                         // 如果不存在该记录，则插入数据
                         AllocationBill bill = new AllocationBill();
                         bill.setFlid(id);
-                        bill.setShjg(msgDto.getMsg());
+                        bill.setShjg("审核失败："+msgDto.getMsg());
                         bill.setUpdate_id(SecurityUtils.getCurrentUsername());
                         bill.setUpdate_name(SecurityUtils.getCurrentNickName());
                         bill.setUpdate_time(DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyy-MM-dd"));
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 555876d..6b88137 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
@@ -99,7 +99,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
         }, pool);
         CompletableFuture<Void> allocation = CompletableFuture.runAsync(() -> {
             try {
-                allocationCount.set(allocationBillMapper.getAllocationCount("", ""));
+                allocationCount.set(allocationBillMapper.getAllocationCount("", "", ""));
             } catch (Exception e) {
                 log.error("异常信息：" + e);
             }
@@ -302,6 +302,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
                     bill.setCode(IdUtil.getStringId());
                     bill.setTjkwbm(bill.getKwbm());
                     bill.setCzsl(BigDecimal.ZERO);
+                    bill.setCzsl(BigDecimal.ZERO);
                     bill.setKcsl(BigDecimal.ZERO);
                     if (bill.getSl().compareTo(BigDecimal.ZERO) < 0) {
                         bill.setSl(bill.getSl().abs());
@@ -621,7 +622,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
                 msgDto = wmsToEasService.sendWebService(billJson);
                 if (msgDto != null) {
                     if (msgDto.getResult() == 0) {
-                        msg = msgDto.getMsg();
+                        msg = "审核失败："+msgDto.getMsg();
                     }
                 }
             } else {
@@ -630,7 +631,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
                 srmMsgDto = wmsToSrmService.sendWebPostData(billJson, 1);
                 if (srmMsgDto != null) {
                     if ("false".equals(srmMsgDto.getSuccess())) {
-                        msg = srmMsgDto.getMessage();
+                        msg = "审核失败："+srmMsgDto.getMessage();
                     }
                 }
             }
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
index 29f6aa5..c48270e 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
@@ -187,7 +187,7 @@ public class ReceiptBillServiceImpl extends ServiceImpl<ReceiptBillMapper, Recei
                         // 如果不存在该记录，则插入数据
                         ReceiptBill bill = new ReceiptBill();
                         bill.setFlid(id);
-                        bill.setShjg(srmMsgDto.getMessage());
+                        bill.setShjg("审核失败："+srmMsgDto.getMessage());
                         bill.setUpdate_id(SecurityUtils.getCurrentUsername());
                         bill.setUpdate_name(SecurityUtils.getCurrentNickName());
                         bill.setUpdate_time(DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyy-MM-dd"));
diff --git a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java
index 752da57..3d1e769 100644
--- a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java
+++ b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java
@@ -46,7 +46,7 @@ public class EasBillSchedule {
      * eas单据数据同步
      */
     @Async("taskExecutor")
-    @Scheduled(cron = "0/60 * * * * *")
+    @Scheduled(cron = "0/120 * * * * *")
     public void getEasOutInBills() {
         // 获取eas视图查询未提交的单据
         List<EasOutInBillDetail> easOutInBillDetails = easOutInBillDetailMapper.selectPageWithInventory();
@@ -65,7 +65,7 @@ public class EasBillSchedule {
 
 
     @Async("taskExecutor")
-    @Scheduled(cron = "0/30 * * * * *")
+    @Scheduled(cron = "0/45 * * * * *")
     public void insertOutInBills() {
         // 获取eas视图查询未提交的单据
         List<EasOutInBillDetail> easOutInBillDetails = easOutInBillDetailMapper.selectEasPages();
@@ -84,7 +84,7 @@ public class EasBillSchedule {
 
 
     @Async("taskExecutor")
-    @Scheduled(cron = "0/60 * * * * *")
+    @Scheduled(cron = "0/90 * * * * *")
     public void insertUsers() {
         List<SysUser> newUsers =sysUserMapper.queryUserList();
         List<SysUser> existingUsers =sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getIs_used,"1"));