From 40767e80dc2357c4aeae4e1efb9ef0526e4081d1 Mon Sep 17 00:00:00 2001 From: sez Date: Mon, 24 Nov 2025 10:37:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=87=91=E9=A2=9D=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/OtherInApplyPushOtherInConvertPlugin.java | 3 ++- .../im/OtherOutApplyPushOtherOutConvertPlugin.java | 3 ++- .../app/plugin/operate/im/PurInConvertPlugin.java | 13 ++++++++++--- .../plugin/operate/im/YdthPurInConvertPlugin.java | 13 ++++++++++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java index 220f7b3..f104161 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java @@ -107,8 +107,9 @@ public class OtherInApplyPushOtherInConvertPlugin extends AbstractConvertPlugIn DynamicObject tqq9_registration = BusinessDataServiceHelper.loadSingle("tqq9_registration", new QFilter[]{new QFilter("number", QCP.equals, registrationCode)}); DynamicObject tqq9_proxyandfactory = BusinessDataServiceHelper.loadSingle("tqq9_proxyandfactory", new QFilter[]{new QFilter("number", QCP.equals, producer)}); + BigDecimal qty = entry.getBigDecimal("qty");//原数量 BigDecimal price = entry.getBigDecimal("price");//不含税单价 - BigDecimal amount = price.multiply(quantity);//金额 + BigDecimal amount = price.multiply(quantity).divide(qty);//金额 // 处理第一次逻辑 if (i == 0) { diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java index e5d6b29..51119d3 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java @@ -107,8 +107,9 @@ public class OtherOutApplyPushOtherOutConvertPlugin extends AbstractConvertPlugI DynamicObject tqq9_registration = BusinessDataServiceHelper.loadSingle("tqq9_registration", new QFilter[]{new QFilter("number", QCP.equals, registrationCode)}); DynamicObject tqq9_proxyandfactory = BusinessDataServiceHelper.loadSingle("tqq9_proxyandfactory", new QFilter[]{new QFilter("number", QCP.equals, producer)}); + BigDecimal qty = entry.getBigDecimal("qty");//原数量 BigDecimal price = entry.getBigDecimal("price");//单价 - BigDecimal amount = price.multiply(quantity);//金额 + BigDecimal amount = price.multiply(quantity).divide(qty);//金额 // 处理第一次逻辑 if (i == 0) { diff --git a/lc123/cloud/app/plugin/operate/im/PurInConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/PurInConvertPlugin.java index d0b607f..7f69ca2 100644 --- a/lc123/cloud/app/plugin/operate/im/PurInConvertPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/PurInConvertPlugin.java @@ -112,18 +112,22 @@ public class PurInConvertPlugin extends AbstractConvertPlugIn implements Plugin DynamicObject tqq9_registration = BusinessDataServiceHelper.loadSingle("tqq9_registration", new QFilter[]{new QFilter("number", QCP.equals, registrationCode)}); DynamicObject tqq9_proxyandfactory = BusinessDataServiceHelper.loadSingle("tqq9_proxyandfactory", new QFilter[]{new QFilter("number", QCP.equals, producer)}); + BigDecimal qty = entry.getBigDecimal("qty");//原数量 BigDecimal priceandtax = entry.getBigDecimal("priceandtax");//含税单价 BigDecimal price = entry.getBigDecimal("price");//不含税单价 - BigDecimal amountandtax = priceandtax.multiply(quantity);//折扣后价税合计 - BigDecimal amount = price.multiply(quantity);//金额 + BigDecimal amountandtax = priceandtax.multiply(quantity).divide(qty);//折扣后价税合计 + BigDecimal amount = price.multiply(quantity).divide(qty);//金额 BigDecimal taxamount = amountandtax.subtract(amount);//税额 // 处理第一次逻辑 if (i == 0) { entry.set("taxamount", taxamount);//税额 + entry.set("curtaxamount", taxamount);//税额(本位币) entry.set("amountandtax", amountandtax);//折扣后价税合计 - entry.set("amount", amount); + entry.set("curamountandtax",amountandtax);//价税合计(本位币) + entry.set("amount", amount);//金额 + entry.set("curamount",amount);//金额(本位币) entry.set("remainreturnqty", quantity);//未退库数量 entry.set("remainreturnbaseqty", quantity);//未退库基本数量 entry.set("remainjoinpriceqty", quantity); //剩余应付数量 @@ -156,8 +160,11 @@ public class PurInConvertPlugin extends AbstractConvertPlugIn implements Plugin } newEntry.set("taxamount", taxamount);//税额 + newEntry.set("curtaxamount", taxamount);//税额(本位币) newEntry.set("amountandtax", amountandtax);//折扣后价税合计 + newEntry.set("curamountandtax",amountandtax);//价税合计(本位币) newEntry.set("amount", amount);//金额 + newEntry.set("curamount",amount);//金额(本位币) newEntry.set("remainreturnqty", quantity);//未退库数量 newEntry.set("remainreturnbaseqty", quantity);//未退库基本数量 newEntry.set("remainjoinpriceqty", quantity); //剩余应付数量 diff --git a/lc123/cloud/app/plugin/operate/im/YdthPurInConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/YdthPurInConvertPlugin.java index cfc8b61..8765f75 100644 --- a/lc123/cloud/app/plugin/operate/im/YdthPurInConvertPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/YdthPurInConvertPlugin.java @@ -123,10 +123,11 @@ public class YdthPurInConvertPlugin extends AbstractConvertPlugIn implements Plu DynamicObject tqq9_registration = BusinessDataServiceHelper.loadSingle("tqq9_registration", new QFilter[]{new QFilter("number", QCP.equals, registrationCode)}); DynamicObject tqq9_proxyandfactory = BusinessDataServiceHelper.loadSingle("tqq9_proxyandfactory", new QFilter[]{new QFilter("number", QCP.equals, producer)}); + BigDecimal qty = entry.getBigDecimal("qty");//原数量 BigDecimal priceandtax = entry.getBigDecimal("priceandtax");//含税单价 BigDecimal price = entry.getBigDecimal("price");//不含税单价 - BigDecimal amountandtax = priceandtax.multiply(quantity);//折扣后价税合计 - BigDecimal amount = price.multiply(quantity);//金额 + BigDecimal amountandtax = priceandtax.multiply(quantity).divide(qty);//折扣后价税合计 + BigDecimal amount = price.multiply(quantity).divide(qty);//金额 BigDecimal taxamount = amountandtax.subtract(amount);//税额 @@ -135,8 +136,11 @@ public class YdthPurInConvertPlugin extends AbstractConvertPlugIn implements Plu if (i == 0) { entry.set("taxamount", taxamount);//税额 + entry.set("curtaxamount", taxamount);//税额(本位币) entry.set("amountandtax", amountandtax);//折扣后价税合计 - entry.set("amount", amount); + entry.set("curamountandtax",amountandtax);//价税合计(本位币) + entry.set("amount", amount);//金额 + entry.set("curamount",amount);//金额(本位币) entry.set("remainreturnqty", quantity);//未退库数量 entry.set("remainreturnbaseqty", quantity);//未退库基本数量 entry.set("remainjoinpriceqty", quantity); //剩余应付数量 @@ -169,8 +173,11 @@ public class YdthPurInConvertPlugin extends AbstractConvertPlugIn implements Plu } newEntry.set("taxamount", taxamount);//税额 + newEntry.set("curtaxamount", taxamount);//税额(本位币) newEntry.set("amountandtax", amountandtax);//折扣后价税合计 + newEntry.set("curamountandtax",amountandtax);//价税合计(本位币) newEntry.set("amount", amount);//金额 + newEntry.set("curamount",amount);//金额(本位币) newEntry.set("remainreturnqty", quantity);//未退库数量 newEntry.set("remainreturnbaseqty", quantity);//未退库基本数量 newEntry.set("remainjoinpriceqty", quantity); //剩余应付数量