From 1eae2c9080c2ddefe254c797b13e50c593951013 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 25 May 2023 14:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=AF=8F=E5=A4=A9=E5=87=8C=E6=99=A8=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F=E4=B8=BA=E9=9B=B6?=
 =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DepositoryRecordMapper.java        |  6 ++++++
 .../mapper/DepositoryRecordMapper.xml         |  9 ++++++++-
 .../scheduled/SaticScheduleTask.java          | 10 +++++++++-
 .../service/DepositoryRecordService.java      |  5 +++++
 .../impl/DepositoryRecordServiceImpl.java     | 20 +++++++++++++++++++
 5 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
index ea51cc11..519b6769 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
@@ -279,6 +279,12 @@ public interface DepositoryRecordMapper {
      */
     List<ApplicationOutRecord> findApplicationOutRecordPByCondition(Map<String,Object> map);
 
+    /**
+     * 获取所有数量为0的出库单
+     * @return
+     */
+    List<ApplicationOutRecord> findApplicationOutRecordPForBad();
+
     /**
      * 查询当前用户出库记录及其管理仓库的出库记录
      * @param map 查询条件
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 3e866603..13a54146 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -562,7 +562,7 @@
             and applyRemark like CONCAT('%', #{applyRemark}, '%')
         </if>
         <if test="aorcode != null and aorcode != null">
-            and aorcode = #{code}
+            and aorcode = #{aorcode}
         </if>
         <if test="departmenthead != null and departmenthead != null">
             and departmenthead = #{departmenthead}
@@ -618,6 +618,13 @@
 
     </select>
 
+    <select id="findApplicationOutRecordPForBad" resultMap="applicationOutRecord">
+        select
+        <include refid="ApplicationOutRecordInfo"/>
+        from applicationOutRecordInfo
+        where quantity = 0;
+    </select>
+
 
     <select id="findApplicationOutRecordPByUser" parameterType="map"   resultMap="applicationOutRecord">
         select
diff --git a/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java b/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
index 07bdbae4..d62ceef0 100644
--- a/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
+++ b/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
@@ -1,6 +1,7 @@
 package com.dreamchaser.depository_manage.scheduled;
 
 import com.dreamchaser.depository_manage.controller.WebSocketController;
+import com.dreamchaser.depository_manage.service.DepositoryRecordService;
 import com.dreamchaser.depository_manage.service.MaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -16,7 +17,10 @@ import org.springframework.scheduling.annotation.Scheduled;
 public class SaticScheduleTask {
 
     @Autowired
-    MaterialService materialService;
+    private MaterialService materialService;
+
+    @Autowired
+    private DepositoryRecordService depositoryRecordService;
 
     // 每天凌晨0点执行一次
     @Scheduled(cron = "0 0 0 * * ?")
@@ -25,6 +29,10 @@ public class SaticScheduleTask {
     }
 
 
+    @Scheduled(cron = "0 0 0 * * ?")
+    private void clearOutBadData(){
+        depositoryRecordService.clearOutBadData();
+    }
 
 
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
index 292045d2..23c0b503 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
@@ -474,4 +474,9 @@ public interface DepositoryRecordService {
      * @return
      */
     Integer updateOutMinRecordInfo(Map<String,Object> map,UserByPort userToken,String userAgent,String userKey,String token);
+
+    /**
+     * 删除出错的出库数据
+     */
+    void clearOutBadData();
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 222f3e72..be54ee2e 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package com.dreamchaser.depository_manage.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.config.PublicConfig;
 import com.dreamchaser.depository_manage.config.QyWxConfig;
@@ -2039,6 +2040,22 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         return result;
     }
 
+    /**
+     * 删除出错的数据
+     */
+    @Override
+    public void clearOutBadData() {
+        List<ApplicationOutRecord> applicationOutRecordPForBad = depositoryRecordMapper.findApplicationOutRecordPForBad();
+        for (ApplicationOutRecord record : applicationOutRecordPForBad) {
+            Integer id = record.getId();
+            List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id);
+            if(applicationOutRecordMinByParent == null || applicationOutRecordMinByParent.size() <= 0){
+                log.warn(DateUtil.getNowTime()+":    删除出错的出库订单："+ JSONObject.toJSONString(record));
+                depositoryRecordMapper.deleteApplicationOutRecordById(id);
+            }
+        }
+    }
+
     /**
      * 用于完成出库时的相关处理操作
      *
@@ -4421,6 +4438,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         List<ApplicationOutRecord> list = depositoryRecordMapper.findApplicationOutRecordPByCondition(map);
         List<ApplicationOutRecordP> result = new ArrayList<>();
         for (ApplicationOutRecord recordP : list) {
+            if (recordP.getQuantity() == null || 0 == recordP.getQuantity()) {
+                continue;
+            }
             UserByPort userByPortById = LinkInterfaceUtil.FindUserById(recordP.getApplicantId(), userKey, token);
             String time = DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime()));
             recordP.setApplicantName(userByPortById.getName());