From 85d54a455f60dc62b4e5faf52412608834dfdc6f Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 12 Sep 2024 16:06:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=95=B4=E6=9C=BA=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/clientdemand/utils/ClientUtils.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 ac385716..fb52f207 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 @@ -1638,11 +1638,27 @@ public class ClientUtils { */ public static void countAfterFrontAmt(IDataModel model, int row) { + DynamicObject dataEntity = model.getDataEntity(true); Boolean ifGift = (Boolean) model.getValue("yem_ifgift", row); if (!ifGift) { BigDecimal saFobAmount = (BigDecimal) model.getValue("yem_safobamount", row); BigDecimal disAmt = (BigDecimal) model.getValue("yem_disamt", row); - model.setValue("yem_afterfrontdisamt", saFobAmount.subtract(disAmt), row); + if (isFCAPriceItem(model, row)) { + // 折扣后销售金额 = 商品明细对应多功能配置中 单台加价金额（结算币别）合计值 + 销售FCA标配青岛单价- 折扣金额 + DynamicObjectCollection c = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); + + DynamicObject d = c.get(row); + DynamicObjectCollection subC = d.getDynamicObjectCollection("yem_multiconfig"); + BigDecimal sumAmt = BigDecimal.ZERO; + for (DynamicObject sub : subC) { + BigDecimal decimal = sub.getBigDecimal("yem_unitsetamount"); + sumAmt = sumAmt.add(decimal); + } + BigDecimal sastandardfcaprice = (BigDecimal) model.getValue("yem_sastandardfcaprice", row); + model.setValue("yem_afterfrontdisamt", sumAmt.add(sastandardfcaprice).subtract(disAmt)); + } else { + model.setValue("yem_afterfrontdisamt", saFobAmount.subtract(disAmt), row); + } } else { model.setValue("yem_afterfrontdisamt", null, row); } From 91e9efd122998f7ca15724086e923944124c2f07 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 12 Sep 2024 16:11:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=95=B4=E6=9C=BA=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java | 5 +++++ 1 file changed, 5 insertions(+) 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 d3d5635b..19fd43a7 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 @@ -530,6 +530,11 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo case "yem_squareqty": ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费 break; + case "yem_priceitemsp": + ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额 + ClientUtils.calculateSalesFCAStandardQingdaoUnitPrice(model, rowIndex);//销售FCA标配青岛单价 + ClientUtils.calculateSalesFOBUnitPrice(model, -1);//计算销售FOB单价 + break; } }