From ab1bae4f1222fe89203f298007b6e3ad51dd8253 Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Wed, 19 Mar 2025 14:51:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E8=B7=9F=E5=8D=95=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A7=E5=88=B6=E5=8F=B0-=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=80=BB=E9=9C=80=E6=B1=82=E7=8E=B0=E6=9C=89=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=98=AF=E5=90=88=E5=90=8C=E5=B7=B2=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=87=8F=E5=8E=BB=E8=B0=83=E6=8B=A8=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=95=B0=E9=87=8F=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=86=8D=E5=87=8F=E5=8E=BB=E5=85=B6=E4=BB=96=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E5=87=8F=E5=8E=BB=E8=B7=9F=E5=8D=95=E4=BB=BB=E5=8A=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E4=B8=8A=E7=9A=84=E5=8F=96=E6=B6=88=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/tracktaskconsoleFormPlugIn.java            | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java b/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java
index 9d94cbc7..f4a9bf5c 100644
--- a/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java
+++ b/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java
@@ -261,7 +261,7 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be
                  yem_tolreqqty   = yem_tolreqqty.subtract(yemCancelNum);
                 model.setValue("yem_tolreqqty", yem_tolreqqty, i);
                 //处理库存差
-                BigDecimal yem_qtysub = easyem_gmpjqty.add(cmmpyem_gmpjqty).add(yem_buyfromcmmp).subtract(yem_tolreqqty);
+                BigDecimal yem_qtysub = easyem_gmpjqty.add(cmmpyem_gmpjqty).add(yem_buyfromcmmp).subtract(tolreqqty);
                 model.setValue("yem_qtysub", yem_qtysub, i);
             }
             this.getView().showMessage("查询库存成功！");
@@ -299,21 +299,10 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be
     @NotNull
     private static BigDecimal getDelivernoticeqty(DynamicObject yem_bd_products, long materialNumid) {
         List<Long> productId = getProductId(yem_bd_products);
-        //获取仓库分类为（国贸各事业部仓库）id集合
-        DynamicObjectCollection whColl = QueryServiceHelper.query("yem_warehouse", "id",
-                new QFilter[]{new QFilter("yem_sort", QCP.equals, "D"),
-                        new QFilter("enable", QCP.equals, "1")});
-        ArrayList<Long> whids = new ArrayList<>();
-        for (DynamicObject wh : whColl) {
-            whids.add(wh.getLong("id"));
-        }
         QFilter qFilter = new QFilter("billstatus", QCP.equals, "C");
         qFilter.and("yem_billtype.number", QCP.equals, "yem_es_delivernotice_o");
         qFilter.and("yem_es_materialinfo.yem_materiel.id", QCP.equals, materialNumid);
         qFilter.and("yem_bd_products.id", QCP.in, productId);
-        qFilter.and("yem_es_materialinfo.yem_warehouse.yem_sort.id", QCP.in, whids);
-        //调出仓库的仓库分类为（国贸各事业部仓库）
-
         DynamicObject[] yemEsDelivernotice = BusinessDataServiceHelper.load("yem_es_delivernotice", "id,billno" +
                         ",yem_es_materialinfo,yem_es_materialinfo.yem_qty,yem_es_materialinfo.yem_materiel,billstatus,yem_billtype,yem_bd_products"
                 , new QFilter[]{qFilter});