diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractEeasurementBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractEeasurementBillPlugin.java
index 0f206da..cd3ba53 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractEeasurementBillPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractEeasurementBillPlugin.java
@@ -80,57 +80,57 @@ public class ContractEeasurementBillPlugin extends ContractMeasureBillEditPlugin
     @Override
     public void propertyChanged(PropertyChangedArgs e) {
         super.propertyChanged(e);
-        String name = e.getProperty().getName();
-        ChangeData changeData = e.getChangeSet()[0];
-        int rowIndex = changeData.getRowIndex();
-        int parentRowIndex = changeData.getParentRowIndex();
-        BigDecimal curtaxprice = BigDecimal.ZERO;//当前含税单价
-        BigDecimal currentprice = BigDecimal.ZERO;//当前单价
-        BigDecimal qty = BigDecimal.ZERO;//数量
-        BigDecimal taxrate = BigDecimal.ZERO;//税率
-        if(name.equals("curtaxprice")||name.equals("currentprice")) {
-            if (parentRowIndex>=0&&rowIndex>=0){
-                Object curtaxpriceobj = this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
-                if (curtaxpriceobj != null) {
-                    curtaxprice = (BigDecimal) curtaxpriceobj;
-                }
-                Object currentpriceobj = this.getModel().getValue("currentprice", rowIndex, parentRowIndex);
-                if (currentpriceobj != null) {
-                    currentprice = (BigDecimal) currentpriceobj;
-                    ;
-                }
-                Object totalqtyibj = this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
-                if (totalqtyibj != null) {
-                    qty = (BigDecimal) totalqtyibj;
-                }
-                Object entrytaxrateobj = this.getModel().getValue("entrytaxrate", rowIndex, parentRowIndex);
-                if (entrytaxrateobj != null) {
-                    BigDecimal entrytaxrate = (BigDecimal) entrytaxrateobj;
-                    taxrate = entrytaxrate.divide(new BigDecimal(100)).add(new BigDecimal(1));
-                }
-                if (name.equals("curtaxprice") && curtaxprice.compareTo(new BigDecimal(0))>0) {
-                    BigDecimal divide = curtaxprice.divide(taxrate,6, RoundingMode.HALF_UP);//当前单价
-                    BigDecimal multiply = divide.multiply(qty);//当前金额
-                    BigDecimal multiply1 = curtaxprice.multiply(qty);//当前价税合计
-                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
-//                    this.getModel().getDataEntity().set("currentprice",divide, rowIndex, parentRowIndex);
-                    this.getModel().setValue("currentprice",divide, rowIndex, parentRowIndex);//当前单价
-                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
-                    this.getModel().setValue("currenttaxamt", subtract,rowIndex, parentRowIndex);//当前税额
-                    this.getModel().setValue("currentoftax", multiply1,rowIndex, parentRowIndex);//当前价税合计
-                } else if (name.equals("currentprice")&&currentprice.compareTo(new BigDecimal(0))>0) {
-                    BigDecimal divide = currentprice.multiply(taxrate);//当前含税单价
-                    BigDecimal multiply = currentprice.multiply(qty);//当前金额
-                    BigDecimal multiply1 = divide.multiply(qty);//当前价税合计
-                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
-                    this.getModel().setValue("curtaxprice",divide, rowIndex, parentRowIndex);//当前含税单价
-                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
-                    this.getModel().setValue("currenttaxamt",multiply1, rowIndex, parentRowIndex);//当前税额
-                    this.getModel().setValue("currentoftax",subtract, rowIndex, parentRowIndex);//当前价税合计
-                }
-                this.getView().updateView();
-            }
-
-        }
+//        String name = e.getProperty().getName();
+//        ChangeData changeData = e.getChangeSet()[0];
+//        int rowIndex = changeData.getRowIndex();
+//        int parentRowIndex = changeData.getParentRowIndex();
+//        BigDecimal curtaxprice = BigDecimal.ZERO;//当前含税单价
+//        BigDecimal currentprice = BigDecimal.ZERO;//当前单价
+//        BigDecimal qty = BigDecimal.ZERO;//数量
+//        BigDecimal taxrate = BigDecimal.ZERO;//税率
+//        if(name.equals("curtaxprice")||name.equals("currentprice")) {
+//            if (parentRowIndex>=0&&rowIndex>=0){
+//                Object curtaxpriceobj = this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
+//                if (curtaxpriceobj != null) {
+//                    curtaxprice = (BigDecimal) curtaxpriceobj;
+//                }
+//                Object currentpriceobj = this.getModel().getValue("currentprice", rowIndex, parentRowIndex);
+//                if (currentpriceobj != null) {
+//                    currentprice = (BigDecimal) currentpriceobj;
+//                    ;
+//                }
+//                Object totalqtyibj = this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
+//                if (totalqtyibj != null) {
+//                    qty = (BigDecimal) totalqtyibj;
+//                }
+//                Object entrytaxrateobj = this.getModel().getValue("entrytaxrate", rowIndex, parentRowIndex);
+//                if (entrytaxrateobj != null) {
+//                    BigDecimal entrytaxrate = (BigDecimal) entrytaxrateobj;
+//                    taxrate = entrytaxrate.divide(new BigDecimal(100)).add(new BigDecimal(1));
+//                }
+//                if (name.equals("curtaxprice") && curtaxprice.compareTo(new BigDecimal(0))>0) {
+//                    BigDecimal divide = curtaxprice.divide(taxrate,6, RoundingMode.HALF_UP);//当前单价
+//                    BigDecimal multiply = divide.multiply(qty);//当前金额
+//                    BigDecimal multiply1 = curtaxprice.multiply(qty);//当前价税合计
+//                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
+////                    this.getModel().getDataEntity().set("currentprice",divide, rowIndex, parentRowIndex);
+//                    this.getModel().setValue("currentprice",divide, rowIndex, parentRowIndex);//当前单价
+//                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
+//                    this.getModel().setValue("currenttaxamt", subtract,rowIndex, parentRowIndex);//当前税额
+//                    this.getModel().setValue("currentoftax", multiply1,rowIndex, parentRowIndex);//当前价税合计
+//                } else if (name.equals("currentprice")&&currentprice.compareTo(new BigDecimal(0))>0) {
+//                    BigDecimal divide = currentprice.multiply(taxrate);//当前含税单价
+//                    BigDecimal multiply = currentprice.multiply(qty);//当前金额
+//                    BigDecimal multiply1 = divide.multiply(qty);//当前价税合计
+//                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
+//                    this.getModel().setValue("curtaxprice",divide, rowIndex, parentRowIndex);//当前含税单价
+//                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
+//                    this.getModel().setValue("currenttaxamt",multiply1, rowIndex, parentRowIndex);//当前税额
+//                    this.getModel().setValue("currentoftax",subtract, rowIndex, parentRowIndex);//当前价税合计
+//                }
+//                this.getView().updateView();
+//            }
+//
+//        }
     }
 }
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java
index 9a22320..8ee6245 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractMeasurementBillEditPlugin.java
@@ -122,58 +122,58 @@ public class InContractMeasurementBillEditPlugin extends InContractMeasureBillEd
     @Override
     public void propertyChanged(PropertyChangedArgs e) {
         super.propertyChanged(e);
-        String name = e.getProperty().getName();
-        ChangeData changeData = e.getChangeSet()[0];
-        int rowIndex = changeData.getRowIndex();
-        int parentRowIndex = changeData.getParentRowIndex();
-        BigDecimal curtaxprice = BigDecimal.ZERO;//当前含税单价
-        BigDecimal currentprice = BigDecimal.ZERO;//当前单价
-        BigDecimal qty = BigDecimal.ZERO;//数量
-        BigDecimal taxrate = BigDecimal.ZERO;//税率
-        if(name.equals("curtaxprice")||name.equals("currentprice")) {
-            if (parentRowIndex>=0&&rowIndex>=0){
-                Object curtaxpriceobj = this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
-                if (curtaxpriceobj != null) {
-                    curtaxprice = (BigDecimal) curtaxpriceobj;
-                }
-                Object currentpriceobj = this.getModel().getValue("currentprice", rowIndex, parentRowIndex);
-                if (currentpriceobj != null) {
-                    currentprice = (BigDecimal) currentpriceobj;
-                    ;
-                }
-                Object totalqtyibj = this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
-                if (totalqtyibj != null) {
-                    qty = (BigDecimal) totalqtyibj;
-                }
-                Object entrytaxrateobj = this.getModel().getValue("entrytaxrate", rowIndex, parentRowIndex);
-                if (entrytaxrateobj != null) {
-                    BigDecimal entrytaxrate = (BigDecimal) entrytaxrateobj;
-                    taxrate = entrytaxrate.divide(new BigDecimal(100)).add(new BigDecimal(1));
-                }
-                if (name.equals("curtaxprice") && curtaxprice.compareTo(new BigDecimal(0))>0) {
-                    BigDecimal divide = curtaxprice.divide(taxrate,6,RoundingMode.HALF_UP);//当前单价
-                    BigDecimal multiply = divide.multiply(qty);//当前金额
-                    BigDecimal multiply1 = curtaxprice.multiply(qty);//当前价税合计
-                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
-//                    this.getModel().getDataEntity().set("currentprice",divide, rowIndex, parentRowIndex);
-                    this.getModel().setValue("currentprice",divide, rowIndex, parentRowIndex);//当前单价
-                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
-                    this.getModel().setValue("currenttaxamt", subtract,rowIndex, parentRowIndex);//当前税额
-                    this.getModel().setValue("currentoftax", multiply1,rowIndex, parentRowIndex);//当前价税合计
-                } else if (name.equals("currentprice")&&currentprice.compareTo(new BigDecimal(0))>0) {
-                    BigDecimal divide = currentprice.multiply(taxrate);//当前含税单价
-                    BigDecimal multiply = currentprice.multiply(qty);//当前金额
-                    BigDecimal multiply1 = divide.multiply(qty);//当前价税合计
-                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
-                    this.getModel().setValue("curtaxprice",divide, rowIndex, parentRowIndex);//当前含税单价
-                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
-                    this.getModel().setValue("currenttaxamt",multiply1, rowIndex, parentRowIndex);//当前税额
-                    this.getModel().setValue("currentoftax",subtract, rowIndex, parentRowIndex);//当前价税合计
-                }
-                this.getView().updateView();
-        }
-
-        }
+//        String name = e.getProperty().getName();
+//        ChangeData changeData = e.getChangeSet()[0];
+//        int rowIndex = changeData.getRowIndex();
+//        int parentRowIndex = changeData.getParentRowIndex();
+//        BigDecimal curtaxprice = BigDecimal.ZERO;//当前含税单价
+//        BigDecimal currentprice = BigDecimal.ZERO;//当前单价
+//        BigDecimal qty = BigDecimal.ZERO;//数量
+//        BigDecimal taxrate = BigDecimal.ZERO;//税率
+//        if(name.equals("curtaxprice")||name.equals("currentprice")) {
+//            if (parentRowIndex>=0&&rowIndex>=0){
+//                Object curtaxpriceobj = this.getModel().getValue("curtaxprice", rowIndex, parentRowIndex);
+//                if (curtaxpriceobj != null) {
+//                    curtaxprice = (BigDecimal) curtaxpriceobj;
+//                }
+//                Object currentpriceobj = this.getModel().getValue("currentprice", rowIndex, parentRowIndex);
+//                if (currentpriceobj != null) {
+//                    currentprice = (BigDecimal) currentpriceobj;
+//                    ;
+//                }
+//                Object totalqtyibj = this.getModel().getValue("totalqty", rowIndex, parentRowIndex);
+//                if (totalqtyibj != null) {
+//                    qty = (BigDecimal) totalqtyibj;
+//                }
+//                Object entrytaxrateobj = this.getModel().getValue("entrytaxrate", rowIndex, parentRowIndex);
+//                if (entrytaxrateobj != null) {
+//                    BigDecimal entrytaxrate = (BigDecimal) entrytaxrateobj;
+//                    taxrate = entrytaxrate.divide(new BigDecimal(100)).add(new BigDecimal(1));
+//                }
+//                if (name.equals("curtaxprice") && curtaxprice.compareTo(new BigDecimal(0))>0) {
+//                    BigDecimal divide = curtaxprice.divide(taxrate,6,RoundingMode.HALF_UP);//当前单价
+//                    BigDecimal multiply = divide.multiply(qty);//当前金额
+//                    BigDecimal multiply1 = curtaxprice.multiply(qty);//当前价税合计
+//                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
+////                    this.getModel().getDataEntity().set("currentprice",divide, rowIndex, parentRowIndex);
+//                    this.getModel().setValue("currentprice",divide, rowIndex, parentRowIndex);//当前单价
+//                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
+//                    this.getModel().setValue("currenttaxamt", subtract,rowIndex, parentRowIndex);//当前税额
+//                    this.getModel().setValue("currentoftax", multiply1,rowIndex, parentRowIndex);//当前价税合计
+//                } else if (name.equals("currentprice")&&currentprice.compareTo(new BigDecimal(0))>0) {
+//                    BigDecimal divide = currentprice.multiply(taxrate);//当前含税单价
+//                    BigDecimal multiply = currentprice.multiply(qty);//当前金额
+//                    BigDecimal multiply1 = divide.multiply(qty);//当前价税合计
+//                    BigDecimal subtract = multiply1.subtract(multiply);//当前税额
+//                    this.getModel().setValue("curtaxprice",divide, rowIndex, parentRowIndex);//当前含税单价
+//                    this.getModel().setValue("currentamt", multiply,rowIndex, parentRowIndex);//当前金额
+//                    this.getModel().setValue("currenttaxamt",multiply1, rowIndex, parentRowIndex);//当前税额
+//                    this.getModel().setValue("currentoftax",subtract, rowIndex, parentRowIndex);//当前价税合计
+//                }
+//                this.getView().updateView();
+//        }
+//
+//        }
     }
 
     protected void updateAmount(ChangeData changeData) {