From a75c458ae2bc9852e3a38e1ab975a616b2ea2d43 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Wed, 8 May 2024 10:22:04 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=84=E7=90=86=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E5=AE=9E=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=AE=A1=E6=A0=B8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EasOutInBillDetailServiceImpl.java      |  3 ++-
 .../service/impl/EasOutInBillServiceImpl.java    |  2 ++
 .../org/nl/wms/schedule/EasBillSchedule.java     | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
index 04d919c..869a8e7 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
@@ -208,6 +208,7 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
                     updateWrapper.set("update_name", SecurityUtils.getCurrentNickName());
                     updateWrapper.set("update_time", DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyy-MM-dd"));
                     easOutInBillDetailMapper.update(null, updateWrapper);
+                    ieasOutInBillService.audit(ids,false);
                 });
             } else {
                 boolean isValid = entityList.stream()
@@ -229,7 +230,7 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
                 }
                 UpdateWrapper<EasOutInBillDetail> updateWrapper = new UpdateWrapper<>();
                 if(sysl.compareTo(BigDecimal.ZERO)==0) {
-                    updateWrapper.set("djzt", "审核");
+                    updateWrapper.set("djzt", "待审核");
                 }
                 updateWrapper.eq("flid", entityList.get(0).getFlid());
                 updateWrapper.set("czsl", czsl);
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 c6af8e4..ea362ec 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
@@ -386,6 +386,8 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
 
     /**
      * 单据审核
+     * 手动审核：特殊情况下，某些单据明细行物料库存不足，但是必须出库，或是某些单据明细行确实不需要出库，出库数量为0，其余单据明细行都满足出库数量，需要手动强制审核单据
+     * 自动审核：所有单据明细行的出入库操作数量都等于目标数量，则定时查询自动审核
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
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 9f1d6e0..dbbf431 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
@@ -73,6 +73,22 @@ public class EasBillSchedule {
                 //autoDeleteBill(easOutInBillDetails, existingIds);
             }
         }
+    }
+
+
+    /**
+     * eas单据数据同步
+     */
+    @Async("taskExecutor")
+    @Scheduled(cron = "0/30 * * * * *")
+    public void automaticAuditBills() {
+
+        List<EasOutInBillDetail> easOutInBillDetailList = easOutInBillDetailMapper.selectList(new LambdaQueryWrapper<EasOutInBillDetail>().eq(EasOutInBillDetail::getDjzt, "待审核"));
+
+
+
+
+
     }
 
     /**