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 1148cba4..581886e9 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,11 +416,25 @@ 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[]{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")}); for (DynamicObject accPriceLibrary : accPriceLibrarys) { Map> allMap = new HashMap<>(); Date bizDate = accPriceLibrary.getDate("yem_bizdate"); @@ -1234,7 +1248,7 @@ public class SalesOrderUtils { qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); } if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) { - singlepartgiftmat = yemSinglepartgiftmat ; + singlepartgiftmat = yemSinglepartgiftmat; } } BigDecimal amount = qty.multiply(singlepartgiftmat);