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-20 20:23:07 +08:00
parent 2be019fb95
commit da7aa098ab
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
View File

@ -420,9 +420,9 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
case "yem_singlenumber": case "yem_singlenumber":
ZJUtils.countCostSumAmountZJ(model);// ZJUtils.countCostSumAmountZJ(model);//
break; break;
case "yem_marketraisepribase": // case "yem_marketraisepribase":
ClientUtils.countStandardSales(model); // ClientUtils.countStandardSales(model);
break; // break;
case "yem_giftcurrency": case "yem_giftcurrency":
countGiftRate(); countGiftRate();
break; break;

10
src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
View File

@ -12,8 +12,6 @@ import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter; import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@ -114,11 +112,7 @@ public class ClientUtils {
// list.add(new QFilter("yem_productclass.number",QCP.equals,yemBdProductsid)); // list.add(new QFilter("yem_productclass.number",QCP.equals,yemBdProductsid));
//读取价格库数据 //读取价格库数据
DynamicObject yem_pricelibrary = null; DynamicObject yem_pricelibrary = null;
if (multiconfig != null && !multiconfig.isEmpty()) { yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
} else {
yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
}
if (yem_pricelibrary != null) { if (yem_pricelibrary != null) {
//多功能配置分录行无数据 则跳过查询价格库 //多功能配置分录行无数据 则跳过查询价格库
if (multiconfig != null && !multiconfig.isEmpty()) { if (multiconfig != null && !multiconfig.isEmpty()) {
@ -1950,7 +1944,7 @@ public class ClientUtils {
/** /**
* 计算销售FOB单价 * 计算销售FOB单价
* <p> * <p>
* 销售FOB单价=商品明细对应多功能配置中 单台加价金额（结算币别）合计值 + 销售FCA标配青岛单价+FOB与FCA费用差额 * 销售FOB单价=商品明细对应多功能配置中 单台加价金额（结算币别）合计值 + 销售FCA标配青岛单价
*/ */
public static void calculateSalesFOBUnitPrice(IDataModel model, int idx) { public static void calculateSalesFOBUnitPrice(IDataModel model, int idx) {
// if (!isFCAPriceItem(model, idx)) { // if (!isFCAPriceItem(model, idx)) {