From bfee389629ab0e64483e4506b34da8a516205660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 6 Jan 2023 22:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E4=B8=BA0=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=AC=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E7=8A=B6=E6=80=81=E4=B8=BA=E9=83=A8=E5=88=86=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/service/depotItem/DepotItemService.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index 1d905473..4ca06ded 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -652,13 +652,16 @@ public class DepotItemService {
             materialSumMap.put(materialAndSum.getMaterialExtendId(), materialAndSum.getOperNumber());
         }
         for(DepotItemVo4MaterialAndSum materialAndSum : linkList) {
-            BigDecimal materialSum = materialSumMap.get(materialAndSum.getMaterialExtendId());
-            if(materialSum!=null) {
-                if(materialSum.compareTo(materialAndSum.getOperNumber()) != 0) {
+            //过滤掉原单里面有数量为0的商品
+            if(materialAndSum.getOperNumber().compareTo(BigDecimal.ZERO) != 0) {
+                BigDecimal materialSum = materialSumMap.get(materialAndSum.getMaterialExtendId());
+                if (materialSum != null) {
+                    if (materialSum.compareTo(materialAndSum.getOperNumber()) != 0) {
+                        res = BusinessConstants.BILLS_STATUS_SKIPING;
+                    }
+                } else {
                     res = BusinessConstants.BILLS_STATUS_SKIPING;
                 }
-            } else {
-                res = BusinessConstants.BILLS_STATUS_SKIPING;
             }
         }
         return res;