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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zzs 2024-11-25 10:39:29 +08:00
commit 44ded3a0cb
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1226,12 +1226,10 @@ public class SalesOrderUtils {
List<DynamicObject> value = entry.getValue(); List<DynamicObject> value = entry.getValue();
DynamicObject basemodelib = BusinessDataServiceHelper.loadSingle(productmodelId, "yem_bd_basemodelib"); DynamicObject basemodelib = BusinessDataServiceHelper.loadSingle(productmodelId, "yem_bd_basemodelib");
long products = basemodelib.getLong("yem_products.id"); long products = basemodelib.getLong("yem_products.id");
BigDecimal qty = BigDecimal.ZERO; // BigDecimal singlepartgiftmat = BigDecimal.ZERO;
BigDecimal singlepartgiftmat = BigDecimal.ZERO;
for (DynamicObject dynamicObject : value) { for (DynamicObject dynamicObject : value) {
qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); BigDecimal qty = dynamicObject.getBigDecimal("yem_qty");
singlepartgiftmat = singlepartgiftmat.add(dynamicObject.getBigDecimal("yem_singlepartgiftmat")); // 单台配件金额 BigDecimal singlepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); // 单台配件金额
}
BigDecimal amount = qty.multiply(singlepartgiftmat); BigDecimal amount = qty.multiply(singlepartgiftmat);
if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue; if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue;
DynamicObject addNew = giftEntry.addNew(); DynamicObject addNew = giftEntry.addNew();
@ -1243,6 +1241,7 @@ public class SalesOrderUtils {
addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币 addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币
} }
} }
}
public static List<Long> filterColor(IDataModel model, String entryKey) { public static List<Long> filterColor(IDataModel model, String entryKey) {
ArrayList<Long> list = Lists.newArrayList(); ArrayList<Long> list = Lists.newArrayList();

7
src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsZJFormPlugin.java
View File

@ -2,6 +2,7 @@ package com.yem.wm.es.shippingdetails.form;
import com.yem.wm.es.Util.TotalUtil; import com.yem.wm.es.Util.TotalUtil;
import com.yem.wm.es.Util.ZJUtils; import com.yem.wm.es.Util.ZJUtils;
import com.yem.wm.im.clientdemand.utils.ClientUtils;
import kd.bos.bill.AbstractBillPlugIn; import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.bill.OperationStatus; import kd.bos.bill.OperationStatus;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
@ -42,10 +43,10 @@ public class ShippingDetailsZJFormPlugin extends AbstractBillPlugIn {
DynamicObjectCollection materialInfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection materialInfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
switch (name) { switch (name) {
case "yem_qty" : case "yem_qty" :
// ZJUtils.setRandomDataTools(model); ZJUtils.setRandomDataTools(model);
ZJUtils.countOrderSumNumberZJ(model); ZJUtils.countOrderSumNumberZJ(model);
// TotalUtil.setGiftGiving(model); TotalUtil.setGiftGiving(model);
// ClientUtils.addSaAmountTk(model,rowIndex);//销售金额（价格条款）结算币别 ClientUtils.addSaAmountTk(model,rowIndex);//销售金额（价格条款）结算币别
break; break;
case "yem_lenghtunit" ://长度单位 case "yem_lenghtunit" ://长度单位
case "yem_vol" ://体积 case "yem_vol" ://体积