zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
zhangzhiguo 2025-04-08 20:12:21 +08:00
parent 5905dfac07 7f9f3b41ed
commit e6e589697f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractEeasurementBillPlugin.java
View File

@ -137,6 +137,11 @@ public class ContractEeasurementBillPlugin extends ContractMeasureBillEditPlugin
int parentRowIndex = changeData.getParentRowIndex(); int parentRowIndex = changeData.getParentRowIndex();
if (StringUtils.equals(propName, "zcgj_hsjell")) { if (StringUtils.equals(propName, "zcgj_hsjell")) {
doLockFieldWithPriceAdjustMode((PriceAdjustModeEnum)null); doLockFieldWithPriceAdjustMode((PriceAdjustModeEnum)null);
} else if (StringUtils.equals(propName,"currentprice")) {
BigDecimal oldValue = (BigDecimal)changeData.getOldValue();
if(oldValue.compareTo(new BigDecimal(0)) == 0){return;}
BigDecimal newValue = (BigDecimal)changeData.getNewValue();
PriceChangedWarn(oldValue,newValue,rowIndex,parentRowIndex);
} else if (StringUtils.equals(propName, "thisqty") || StringUtils.equals(propName, "thisoftaxmount")) { } else if (StringUtils.equals(propName, "thisqty") || StringUtils.equals(propName, "thisoftaxmount")) {
BigDecimal oldValue = (BigDecimal)changeData.getOldValue(); BigDecimal oldValue = (BigDecimal)changeData.getOldValue();
if(oldValue.compareTo(new BigDecimal(0)) == 0){return;} if(oldValue.compareTo(new BigDecimal(0)) == 0){return;}

10
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java
View File

@ -183,6 +183,11 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
int parentRowIndex = changeData.getParentRowIndex(); int parentRowIndex = changeData.getParentRowIndex();
if (StringUtils.equals(propName, "zcgj_hsjell")) { if (StringUtils.equals(propName, "zcgj_hsjell")) {
doLockFieldWithPriceAdjustMode((PriceAdjustModeEnum)null); doLockFieldWithPriceAdjustMode((PriceAdjustModeEnum)null);
} else if (StringUtils.equals(propName,"currentprice")) {
BigDecimal oldValue = (BigDecimal)changeData.getOldValue();
if(oldValue.compareTo(new BigDecimal(0)) == 0){return;}
BigDecimal newValue = (BigDecimal)changeData.getNewValue();
PriceChangedWarn(oldValue,newValue,rowIndex,parentRowIndex);
} else if ( StringUtils.equals(propName, "thisoftaxmount")) {//StringUtils.equals(propName, "thisqty") || } else if ( StringUtils.equals(propName, "thisoftaxmount")) {//StringUtils.equals(propName, "thisqty") ||
BigDecimal oldValue = (BigDecimal)changeData.getOldValue(); BigDecimal oldValue = (BigDecimal)changeData.getOldValue();
@ -208,6 +213,11 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
listentry.set("currentamt",currentprice.multiply(totalqty));//当前金额 = 当前单价 * 数量 listentry.set("currentamt",currentprice.multiply(totalqty));//当前金额 = 当前单价 * 数量
listentry.set("currenttaxamt",curtaxprice.multiply(totalqty).subtract(currentprice.multiply(totalqty)));//当前税额 listentry.set("currenttaxamt",curtaxprice.multiply(totalqty).subtract(currentprice.multiply(totalqty)));//当前税额
listentry.set("currentoftax",curtaxprice.multiply(totalqty));//当前价税合计 listentry.set("currentoftax",curtaxprice.multiply(totalqty));//当前价税合计
// this.getModel().setValue("currentprice", currentprice,rowIndex,parentRowIndex);
// this.getModel().setValue("currentprice",currentprice, rowIndex, parentRowIndex);
// this.getModel().setValue("currentamt",currentprice.multiply(totalqty),rowIndex, parentRowIndex);
// this.getModel().setValue("currenttaxamt",curtaxprice.multiply(totalqty).subtract(currentprice.multiply(totalqty)),rowIndex, parentRowIndex);
// this.getModel().setValue("currentoftax",curtaxprice.multiply(totalqty),rowIndex, parentRowIndex);
this.getView().updateView(); this.getView().updateView();
} }
// String resname = (String)this.getModel().getValue("resname", rowIndex, parentRowIndex); // String resname = (String)this.getModel().getValue("resname", rowIndex, parentRowIndex);