Merge remote-tracking branch 'origin/master'

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);

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>