生产领料剩余金额根据含税金额相减

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java

@@ -444,10 +444,10 @@ public class ServiceHGCW012 extends ServiceBase {
                             if(hgcg003B.getInvoiceRemainingAmount().compareTo(BigDecimal.ZERO) > 0){
                                 paramMap.put(HGCG003B.FIELD_INVOICE_REMAINING_AMOUNT, hgcg003B.getInvoiceRemainingAmount().subtract(hgcw013.getSaveInvoiceAmount()));
                             }else{
-                                paramMap.put(HGCG003B.FIELD_INVOICE_REMAINING_AMOUNT, hgcg003B.getAmount().subtract(hgcw013.getSaveInvoiceAmount()));
+                                paramMap.put(HGCG003B.FIELD_INVOICE_REMAINING_AMOUNT, hgcg003B.getTaxIncludeAmount().subtract(hgcw013.getSaveInvoiceAmount()));
                             }
                             //收货金额等于开票金额
-                            if(hgcg003B.getAmount().compareTo(hgcg003B.getInvoiceAmount().add(hgcw013.getSaveInvoiceAmount())) == 0){
+                            if(hgcg003B.getTaxIncludeAmount().compareTo(hgcg003B.getInvoiceAmount().add(hgcw013.getSaveInvoiceAmount())) == 0){
                                 paramMap.put(HGCG003B.FIELD_IS_INVOICING, HGConstant.CgIsInvoicing.S_1);
                             }
                         }

src/main/webapp/HG/CW/HGCW012A.js

@@ -323,6 +323,14 @@ $(function () {
                     align:"right",
                     enable: false,
                     locked: false
+                },{
+                    field: "taxIncludeAmount",
+                    title: "含税金额",
+                    headerTemplate: "<span style='color: '>含税金额 </span>",
+                    format:"{0:C2}",
+                    align:"right",
+                    enable: false,
+                    locked: false
                 },
                 {
                     field: "thisSettlementAmount",
@@ -419,7 +427,7 @@ $(function () {
                     locked: false,
                     template: function (item) {
                         if (item.isInvoicing == 0 && item.invoiceRemainingAmount == 0){
-                            item.invoiceRemainingAmount = item.amount;
+                            item.invoiceRemainingAmount = item.taxIncludeAmount;
                         }
                         return kendo.format("{0:N2}",parseFloat(item.invoiceRemainingAmount));
                     }