From e6ae5c922e77c18f4ec1bc0a236d778029391008 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Sat, 22 Mar 2025 18:18:51 +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=E8=AE=A1=E7=AE=97=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/tracktaskconsoleFormPlugIn.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 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 9610c7c6..48d2ce50 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 @@ -257,8 +257,8 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be model.setValue("yem_gmpjqty", easyem_gmpjqty.add(cmmpyem_gmpjqty), i); BigDecimal tolreqqty = gettolreqqty(yem_bd_products, materialNumid); BigDecimal yemEsDelivernoticeqty = getDelivernoticeqty(yem_bd_products, materialNumid); - BigDecimal yem_tolreqqty = tolreqqty.subtract(yemEsDelivernoticeqty); - yem_tolreqqty = yem_tolreqqty.subtract(yemCancelNum); + BigDecimal yem_tolreqqty = tolreqqty.subtract(yemEsDelivernoticeqty); + 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); @@ -290,11 +290,8 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be * 获取销售出库其他出库的已审核数量汇总数据 * * @param yem_bd_products 产品分类 - * - * @param materialNumid 物料编码 - * + * @param materialNumid 物料编码 * @return 数量汇总值 - * */ @NotNull private static BigDecimal getDelivernoticeqty(DynamicObject yem_bd_products, long materialNumid) { @@ -307,16 +304,23 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be //调出仓库的仓库分类为（国贸各事业部仓库） 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" + ",yem_es_materialinfo,yem_es_materialinfo.yem_qty,yem_es_materialinfo.yem_materiel,yem_es_materialinfo.yem_warehouse" + + ",billstatus,yem_billtype,yem_bd_products" , new QFilter[]{qFilter}); BigDecimal yemEsDelivernoticeqty = BigDecimal.ZERO; for (DynamicObject dynamicObject : yemEsDelivernotice) { DynamicObjectCollection yemEsMaterialinfo1 = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo"); for (DynamicObject object : yemEsMaterialinfo1) { - long aLong = object.getLong("yem_materiel.id"); - BigDecimal yemQty = object.getBigDecimal("yem_qty"); - if (aLong == materialNumid) { - yemEsDelivernoticeqty = yemQty.add(yemEsDelivernoticeqty); + DynamicObject yemWarehouse = object.getDynamicObject("yem_warehouse"); + if (yemWarehouse != null) { + String yemSort = yemWarehouse.getString("yem_sort"); + if (yemSort.equals("D")) { + long aLong = object.getLong("yem_materiel.id"); + BigDecimal yemQty = object.getBigDecimal("yem_qty"); + if (aLong == materialNumid) { + yemEsDelivernoticeqty = yemQty.add(yemEsDelivernoticeqty); + } + } } } }