From 33511a25f01e39df06b771e239045267ded08dcb Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Mon, 8 Nov 2021 16:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4=EF=BC=8C=E7=B4=AF=E8=AE=A1=E5=B7=B2?=
 =?UTF-8?q?=E4=B8=8A=E6=96=99=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java  | 3 +++
 .../mesnac/dispatch/service/impl/IssueItemServiceImpl.java  | 4 +++-
 dispatch/src/main/resources/mapper/IssueItemMapper.xml      | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java
index 876851ea..7cde682f 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java
@@ -22,4 +22,7 @@ import java.util.List;
 public interface IssueItemMapper extends BaseMapper<IssueItem> {
 
     BigDecimal selectInvIssueQty(@Param("site") String site, @Param("inventory") String inventory);
+
+    //查询上料表的上料数据
+    BigDecimal selectLoadInventoryQty(@Param("site") String site, @Param("inventoryId") String inventoryId);
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java
index f123c26d..6165b1bf 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java
@@ -217,7 +217,9 @@ public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem
 
                             meInventoryService.validateAndAdd(request);
                         } else {
-                            issueInvQty = issueInvQty.add(inventoryModel.getQtyOnHand());
+                            String inventoryId = inventoryModel.getInventoryId();
+                            BigDecimal handOnQty = issueItemMapper.selectLoadInventoryQty(site, inventoryId);
+                            issueInvQty = issueInvQty.add(inventoryModel.getQtyOnHand()).add(handOnQty);
 
                             //库存修改
                             InventoryValidateAndUpdateWithReceiveQuantityOverrideRequest request = new InventoryValidateAndUpdateWithReceiveQuantityOverrideRequest();
diff --git a/dispatch/src/main/resources/mapper/IssueItemMapper.xml b/dispatch/src/main/resources/mapper/IssueItemMapper.xml
index 7485fc24..8d7d524d 100644
--- a/dispatch/src/main/resources/mapper/IssueItemMapper.xml
+++ b/dispatch/src/main/resources/mapper/IssueItemMapper.xml
@@ -344,4 +344,10 @@
         WHERE SITE = #{site} AND INVENTORY = #{inventory}
         GROUP BY SITE, INVENTORY
     </select>
+
+    <select id="selectInvIssueQty" resultType="java.math.BigDecimal">
+        SELECT NVL(SUM(ZLI.QTY_ON_HAND),0)  FROM Z_LOAD_INVENTORY ZLI
+        WHERE ZLI.SITE = #{site} AND ZLI.INVENTORY_ID = #{inventoryId}
+    </select>
+
 </mapper>