From f7978ce62c15f28953b8b8727e5e7bf5f23787fb Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Thu, 28 Dec 2023 09:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CountRequestMainServiceImpl.java             |  2 +-
 .../countRecord/CountRecordDetailMapper.xml      | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
index 646cccd1..3c9a2758 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
@@ -476,7 +476,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countadjustRequestDetailDO.setInventoryQty(countRecordDetailDO.getQty());
             countadjustRequestDetailDO.setCountQty(countRecordDetailDO.getCountQty());
             //库存数量减盘点数量等于调整数量
-            countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty()));
+            countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getCountQty().subtract(countRecordDetailDO.getQty()));
             //调整数量的绝对值
             countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs());
             countadjustRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml
index 0905dc6f..dede5d77 100644
--- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml
+++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml
@@ -14,19 +14,21 @@
     <!-- 盘点记录未盘平数据-->
     <select id="getDifferenceList" parameterType="String" resultType="com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO">
         SELECT * FROM record_count_detail d1,(
-            SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
+            SELECT count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
                 SELECT id FROM record_count_main WHERE request_number=#{requestNumber}
-            ) GROUP BY master_id,count_detail_number
-        ) d2 WHERE d1.master_id=d2.master_id AND d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty!=d1.count_qty
+            ) GROUP BY count_detail_number
+        ) d2 WHERE d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty!=d1.count_qty
+        AND d1.master_id IN (SELECT id FROM record_count_main WHERE request_number=#{requestNumber})
     </select>
 
     <!-- 盘点记录盘平数据-->
     <select id="getSameList" parameterType="String" resultType="com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO">
         SELECT * FROM record_count_detail d1,(
-        SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
-        SELECT id FROM record_count_main WHERE request_number=#{requestNumber}
-        ) GROUP BY master_id,count_detail_number
-        ) d2 WHERE d1.master_id=d2.master_id AND d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty=d1.count_qty
+            SELECT count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
+                SELECT id FROM record_count_main WHERE request_number=#{requestNumber}
+            ) GROUP BY count_detail_number
+        ) d2 WHERE d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty=d1.count_qty
+        AND d1.master_id IN (SELECT id FROM record_count_main WHERE request_number=#{requestNumber})
     </select>
 
 </mapper>