violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
1.外销合同提交获取标准价
This commit is contained in:
ljw 2024-12-19 18:39:20 +08:00
parent 40a3632539
commit 32e006e6b6
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
View File

@ -416,11 +416,25 @@ public class SalesOrderUtils {
materielId.add(materiel.getLong("id")); 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); String selectFields = DynamicObjectUtil.getSelectfields("yem_pricelibrary", false);
selectFields = DynamicObjectUtil.getEntrySelectfields(selectFields, "yem_pricelibrary", "yem_accessory", false); selectFields = DynamicObjectUtil.getEntrySelectfields(selectFields, "yem_pricelibrary", "yem_accessory", false);
DynamicObject[] accPriceLibrarys = BusinessDataServiceHelper.load("yem_pricelibrary", selectFields, DynamicObject[] accPriceLibrarys = BusinessDataServiceHelper.load("yem_pricelibrary", selectFields,
new QFilter[]{new QFilter("yem_accessory.yem_material", QCP.in, materielId), new QFilter[]{new QFilter("yem_accessory.yem_material", QCP.in, materielId)
new QFilter("billstatus", QCP.equals, "C")}); , 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) { for (DynamicObject accPriceLibrary : accPriceLibrarys) {
Map<Long, Map<String, Object>> allMap = new HashMap<>(); Map<Long, Map<String, Object>> allMap = new HashMap<>();
Date bizDate = accPriceLibrary.getDate("yem_bizdate"); Date bizDate = accPriceLibrary.getDate("yem_bizdate");
@ -1234,7 +1248,7 @@ public class SalesOrderUtils {
qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); qty = qty.add(dynamicObject.getBigDecimal("yem_qty"));
} }
if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) { if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) {
singlepartgiftmat = yemSinglepartgiftmat ; singlepartgiftmat = yemSinglepartgiftmat;
} }
} }
BigDecimal amount = qty.multiply(singlepartgiftmat); BigDecimal amount = qty.multiply(singlepartgiftmat);