From cfee129bf2774f038fce465ccebaedfc533ae63a Mon Sep 17 00:00:00 2001 From: zzs Date: Mon, 14 Oct 2024 21:55:37 +0800 Subject: [PATCH] =?UTF-8?q?wip(fix):=E8=8E=B7=E5=8F=96=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../es/salesorder/from/SalesOrderZJEdit.java | 16 +++++++++++++++- .../wm/im/clientdemand/utils/ClientUtils.java | 18 ++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index a354c06e..0d3dde84 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -36,6 +36,8 @@ import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.sdk.plugin.Plugin; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.math.BigDecimal; import java.math.RoundingMode; @@ -49,6 +51,9 @@ import static com.yem.wm.im.clientdemand.utils.ClientUtils.bringProductModelTons */ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, BeforeF7SelectListener, HyperLinkClickListener { + private static final Logger log = LoggerFactory.getLogger(SalesOrderZJEdit.class); + + @Override public void afterLoadData(EventObject e) { super.afterLoadData(e); @@ -198,6 +203,10 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo int ParentRow = changeData.getParentRowIndex(); DynamicObject dataEntity = model.getDataEntity(); DynamicObjectCollection materialInfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); +// log.info("before__当前计算:{}", name); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 0)); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 1)); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 2)); switch (name) { case "yem_countexpense": countExpense();//选择装箱核算运输费用 携带费用信息分录 @@ -319,7 +328,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo case "yem_standardprice"://标配FOB（青岛价） ClientUtils.fobPriceAdd(model, materialInfo);//FOB单价 ClientUtils.countFobAmtSale(model, rowIndex);//销售FOB标配青岛单价 - ClientUtils.calculateSalesFCAStandardQingdaoUnitPrice(model, rowIndex);//销售FCA标配青岛单价 +// ClientUtils.calculateSalesFCAStandardQingdaoUnitPrice(model, rowIndex);//销售FCA标配青岛单价 break; case "yem_truecarpriceba": ClientUtils.countRealCatAmountRMB(model, rowIndex); @@ -561,6 +570,11 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.calculateSalesFOBUnitPrice(model, -1);//计算销售FOB单价 break; } + +// log.info("after__当前计算:{}", name); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 0)); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 1)); +// log.info("yem_safobprice:{}", model.getValue("yem_safobprice", 2)); } /** diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 68fda74a..e290c9d8 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -12,6 +12,8 @@ import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import org.apache.commons.lang3.ArrayUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.math.BigDecimal; import java.math.RoundingMode; @@ -26,6 +28,7 @@ import static com.yem.wm.es.salesorder.from.SalesOrderEdit.isZJ; * @date 2023-08-09 18:28 */ public class ClientUtils { + /** * 明细信息 获取标准价按钮 */ @@ -35,6 +38,8 @@ public class ClientUtils { String Entityname = dataEntity.getDataEntityType().getName(); BigDecimal yem_exrate = dataEntity.getBigDecimal("yem_exrate"); DynamicObjectCollection detailedinfor = getTypeColl(models); + DynamicObjectCollection materialInfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); + //提示 StringBuffer info = new StringBuffer(); //配件物料查询出的 价格 @@ -182,6 +187,7 @@ public class ClientUtils { } rowInfo++; } +// addSaPrice(models, materialInfo);//销售FOB单价（结算币别） //弹窗提示 if (info.length() > 0) { view.showMessage(info.toString()); @@ -1918,9 +1924,9 @@ public class ClientUtils { sumAmt = sumAmt.add(decimal); } -// BigDecimal sastandardfcaprice = (BigDecimal) model.getValue("yem_sastandardfcaprice", idx);//销售FCA标配青岛单价 - BigDecimal fobsubfcaamt = (BigDecimal) model.getValue("yem_fobsubfcaamt", idx);//FOB与FCA费用差额 - BigDecimal calc = sumAmt.add(fobsubfcaamt); + BigDecimal sastandardfcaprice = (BigDecimal) model.getValue("yem_sastandardfcaprice", idx);//销售FCA标配青岛单价 +// BigDecimal fobsubfcaamt = (BigDecimal) model.getValue("yem_fobsubfcaamt", idx);//FOB与FCA费用差额 + BigDecimal calc = sumAmt.add(sastandardfcaprice); model.setValue("yem_safobprice", calc, idx); } else { int rowCount = model.getEntryRowCount("yem_es_materialinfo"); @@ -1933,9 +1939,9 @@ public class ClientUtils { sumAmt = sumAmt.add(decimal); } -// BigDecimal sastandardfcaprice = (BigDecimal) model.getValue("yem_sastandardfcaprice", i);//销售FCA标配青岛单价 - BigDecimal fobsubfcaamt = (BigDecimal) model.getValue("yem_fobsubfcaamt", i);//FOB与FCA费用差额 - BigDecimal calc = sumAmt.add(fobsubfcaamt); + BigDecimal sastandardfcaprice = (BigDecimal) model.getValue("yem_sastandardfcaprice", i);//销售FCA标配青岛单价 +// BigDecimal fobsubfcaamt = (BigDecimal) model.getValue("yem_fobsubfcaamt", i);//FOB与FCA费用差额 + BigDecimal calc = sumAmt.add(sastandardfcaprice); model.setValue("yem_safobprice", calc, i); } }