From 7add40bc5a2002bcd6f3b60fd5cff07da7388c73 Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 25 Nov 2024 10:27:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=B5=A0=E9=80=81=E9=85=8D=E4=BB=B6=E9=A1=B5=E7=AD=BE=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=B5=8B=E5=80=BC=202.=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8D=95=E5=8F=B0=E6=95=B0=E5=8F=91=E8=BF=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 261d35ff592bf49af854912f550c63857057fae7) --- .../es/salesorder/utils/SalesOrderUtils.java | 54 ++++++------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java index 581886e9..468755b8 100644 --- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java +++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java @@ -416,25 +416,11 @@ public class SalesOrderUtils { materielId.add(materiel.getLong("id")); } } - String yemBdProductsid = ""; - DynamicObject yemBdProducts = dataEntitie.getDynamicObject("yem_bd_products"); - if (yemBdProducts != null) { - yemBdProductsid = yemBdProducts.getString("number"); - } - if ("CC".equals(yemBdProducts.getString("number"))) {//叉车 - yemBdProductsid = "CCPJ"; - } else if ("ZZJ".equals(yemBdProducts.getString("number"))) {//装载机 - yemBdProductsid = "ZZJPJ"; - } else if ("TLJ".equals(yemBdProducts.getString("number"))) {//拖拉机 - yemBdProductsid = "TLJPJ"; - } String selectFields = DynamicObjectUtil.getSelectfields("yem_pricelibrary", false); selectFields = DynamicObjectUtil.getEntrySelectfields(selectFields, "yem_pricelibrary", "yem_accessory", false); DynamicObject[] accPriceLibrarys = BusinessDataServiceHelper.load("yem_pricelibrary", selectFields, - new QFilter[]{new QFilter("yem_accessory.yem_material", QCP.in, materielId) - , new QFilter("billstatus", QCP.equals, "C") - , new QFilter("yem_productclass.number", QCP.equals, yemBdProductsid) - ,new QFilter("yem_cancelstatus", QCP.equals, "0")}); + new QFilter[]{new QFilter("yem_accessory.yem_material", QCP.in, materielId), + new QFilter("billstatus", QCP.equals, "C")}); for (DynamicObject accPriceLibrary : accPriceLibrarys) { Map> allMap = new HashMap<>(); Date bizDate = accPriceLibrary.getDate("yem_bizdate"); @@ -1123,9 +1109,9 @@ public class SalesOrderUtils { for (DynamicObject destport : destports) { DynamicObject port = destport.getDynamicObject("fbasedataid"); if (port == null) continue; - port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_namecn"); - if (!port.getString("yem_namecn").isEmpty()) { - sb.append(port.getString("yem_namecn")).append(";"); + port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_factory"); + if (!port.getString("yem_factory").isEmpty()) { + sb.append(port.getString("yem_factory")).append(";"); } } if (sb.lastIndexOf(";") == sb.length() - 1) { @@ -1240,26 +1226,20 @@ public class SalesOrderUtils { List value = entry.getValue(); DynamicObject basemodelib = BusinessDataServiceHelper.loadSingle(productmodelId, "yem_bd_basemodelib"); long products = basemodelib.getLong("yem_products.id"); - BigDecimal qty = BigDecimal.ZERO; - BigDecimal singlepartgiftmat = BigDecimal.ZERO; +// BigDecimal singlepartgiftmat = BigDecimal.ZERO; for (DynamicObject dynamicObject : value) { - BigDecimal yemSinglepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); - if (yemSinglepartgiftmat.compareTo(BigDecimal.ZERO) != 0) { - qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); - } - if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) { - singlepartgiftmat = yemSinglepartgiftmat; - } + BigDecimal qty = dynamicObject.getBigDecimal("yem_qty"); + BigDecimal singlepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); // 单台配件金额 + BigDecimal amount = qty.multiply(singlepartgiftmat); + if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue; + DynamicObject addNew = giftEntry.addNew(); + addNew.set("yem_giveproactype", products); // 产品机型 + addNew.set("yem_qtyint", qty); // 台数 + addNew.set("yem_singleamt", singlepartgiftmat); // 单台配件金额 + addNew.set("yem_singleamtlocal", singlepartgiftmat.multiply(exrate)); // 单台配件金额（本位币） + addNew.set("yem_giveamt", amount); // 配件金额 + addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币 } - BigDecimal amount = qty.multiply(singlepartgiftmat); - if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue; - DynamicObject addNew = giftEntry.addNew(); - addNew.set("yem_giveproactype", products); // 产品机型 - addNew.set("yem_qtyint", qty); // 台数 - addNew.set("yem_singleamt", singlepartgiftmat); // 单台配件金额 - addNew.set("yem_singleamtlocal", singlepartgiftmat.multiply(exrate)); // 单台配件金额（本位币） - addNew.set("yem_giveamt", amount); // 配件金额 - addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币 } }