From beca721acf4e026640d9ff22862136ea8c6df96c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 14 九月 2024 08:50:47 +0800
Subject: [PATCH] 物料列表后端分页完善

---
 WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html |  224 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 177 insertions(+), 47 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 4dc9552..7d3373e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -155,16 +155,16 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">閫夊崟鍙�</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
 
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                             <!--<label class="layui-form-label">閫夊崟鍙�</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
-            </div>-->
+                    <div class="layui-input-inline">
+                        <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+                    </div>-->
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">璐熻矗浜�</label>
@@ -209,13 +209,13 @@
                                     </div>
                                     <!--<div class="layui-row">
 
-        <div class="layui-col-xs7 layui-inline">
-            <label class="layui-form-label">鎽樿</label>
-            <div class="layui-input-block">
-                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
-            </div>
-        </div>
-    </div>-->
+                <div class="layui-col-xs7 layui-inline">
+                    <label class="layui-form-label">鎽樿</label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+                    </div>
+                </div>
+            </div>-->
                                     <div class="layui-row">
                                         <div class="layui-col-xs7 layui-inline">
                                             <label class="layui-form-label">澶囨敞</label>
@@ -267,20 +267,6 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
@@ -298,18 +284,32 @@
                                                 <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                                </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -580,6 +580,116 @@
                 }
             });
 
+            //#region 鍥炶溅閫夋嫨婧愬崟
+            $('#HSourceBillNo').on('keydown', function (event) {
+                var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+                if (event.keyCode == 13) {
+                    var ajaxLoad = layer.load();
+                    var url;
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (HSourceBillNo == "") {
+                        return;
+                    }
+                    if ($("#HSourceBillType").val() == "1102") {
+                        //婧愬崟绫诲瀷鏄噰璐鍗�
+                        url = "/Cg_POOrderBill/PushList";
+                    } else if ($("#HSourceBillType").val() == "1103") {
+                        //婧愬崟绫诲瀷鏄敹鏂欓�氱煡鍗�
+                        url = "/Cg_POInStockBill/PushList";
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + url,
+                        type: "GET",
+                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var checkStatus = result;
+                                if ($("#HSourceBillType").val() == "1102") {
+                                    option.data = [];//娓呯┖瀛愯〃
+                                    $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+                                    $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
+
+                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
+                                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+                                    $("#HWHID").val(checkStatus.data[0].HWHID);
+                                    $("#HWHName").val(checkStatus.data[0].浠撳簱);
+                                    $("#HSupID").val(checkStatus.data[0].HSupID);
+                                    $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
+                                    $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
+                                    $("#HManagerName").val(checkStatus.data[0].涓荤);
+                                    $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+                                    $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+
+                                    var j = 0;
+                                    for (var i = 0; i < result.data.length; i++) {
+                                        var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+                                        var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+                                        var HNewlineTotal = HNewMoney + HNewTaxMoney;
+                                        option.data.push({
+                                            "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                            "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+                                            "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+                                            "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney,"HOrderPrice": checkStatus.data[j].閲戦,
+                                            "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                            "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+                                        })
+                                        j++;
+                                    }
+
+                                } else if ($("#HSourceBillType").val() == "1103") {
+                                    option.data = [];//娓呯┖瀛愯〃
+                                    $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+                                    $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
+                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
+                                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+                                    $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+                                    $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+                                    $("#HSupID").val(checkStatus.data[0].HSupID);
+                                    $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
+                                    $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
+                                    $("#HManagerName").val(checkStatus.data[0].涓荤);
+                                    $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+                                    $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+                                    var j = 0;
+                                    for (var i = 0; i < result.data.length; i++) {
+                                        var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+                                        var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+                                        var HNewlineTotal = HNewMoney + HNewTaxMoney;
+                                        option.data.push({
+                                            "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                            "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
+                                            "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+                                            "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                            "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                            "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                            "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+                                        })
+                                        j++;
+                                    }
+                                }
+                                table.render(option);
+                                layer.close(ajaxLoad);
+                                layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
+                            } else {
+                                layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                layer.close(ajaxLoad);
+                            }
+                        }, error: function () {
+                            layer.alert(result.Message + "鍙戠敓閿欒!", { icon: 5 });
+                            layer.close(ajaxLoad);
+                        }
+                    });
+                }
+            });
+            //#endregion
 
             //#endregion
 
@@ -723,7 +833,7 @@
                             obj.update({
                                 HPrice: oldText
                             });
-                            /* table.render(option);*/
+                             table.render(option);
 
                             layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
                             return;
@@ -765,7 +875,7 @@
                             obj.update({
                                 HMoney: oldText
                             });
-                            /* table.render(option);*/
+                             table.render(option);
 
                             layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
                             return;
@@ -775,7 +885,7 @@
                         var HQty = obj.data.HQty * 1;                   //鏁伴噺
                         var HMoney = value * 1;
                         var HPrice = (HMoney / HQty);       //鍗曚环=閲戦/鏁伴噺
-                        var HTaxRate = value * 0.01;                       //绋庣巼
+                        var HTaxRate = obj.data.HTaxRate * 0.01;                       //绋庣巼
                         var HTaxPrice = HPrice * (1 + HTaxRate);        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
                         var HTaxMoney = HMoney * HTaxRate;              //绋庨=閲戦*绋庣巼
                         var HlineTotal = HMoney + HTaxMoney;            //浠风◣鍚堣=閲戦+绋庨
@@ -1049,11 +1159,11 @@
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HChecker": data.瀹℃牳浜�
                                 , "HCloseMan": data.鍏抽棴浜�
-                                , "HMakeDate": data.鍒跺崟鏃ユ湡
-                                , "HCheckDate": data.瀹℃牳鏃ユ湡
-                                , "HCloseDate": data.鍏抽棴鏃ユ湡
-                                , "HUpDateDate": data.淇敼鏃ユ湡
-                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
 
                             });
                             //瀛愯〃  璧嬪��
@@ -1102,7 +1212,7 @@
                 }
             });
 
-      //#region 淇濆瓨鎸夐挳
+            //#region 淇濆瓨鎸夐挳
             form.on('submit(Saver)', function (data) {
                 //#region 鍒ゆ柇婧愬崟鐘舵��
                 if (OperationType == 1 || OperationType == 4) {
@@ -1471,7 +1581,11 @@
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             layer.msg(data.Message, { icon: 1 });
-
+                            if (data.Verify == "Y") //鑷姩瀹℃牳
+                            {
+                                $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                                set_CheckBill(0); //瀹℃牳
+                            }
                             $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             //淇濆瓨鍚庢祻瑙�
                             //ReRoadBillMain();
@@ -2142,10 +2256,18 @@
                         if (checkStatus.data.length == 0) {
                             return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                         }
-                      
+                        var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+                        if (HSupID == 0 || HSupID == '') {
+                            HSupID = checkStatus.data[0]["HSupID"];
+                        }
                         //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
                         var ProcessNumber = [];
                         for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HSupID"] != HSupID) {
+                                layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+                                layer.close(index);//鍏抽棴寮圭獥
+                                return;
+                            }
                             ProcessNumber.push(checkStatus.data[i]);
                         }
 
@@ -2180,13 +2302,17 @@
                            
                             var j = 0;
                             for (var i = 0; i < checkStatus.data.length; i++) {
+                                var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+                                var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+                                var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+                                var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                 option.data.push({
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
                                     "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
                                     "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
-                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,"HMoney": checkStatus.data[j].閲戦,
+                                    "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                    "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": checkStatus.data[j].浠风◣鍚堣
+                                    "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
                                 })
                                 j++;
                             }
@@ -2196,14 +2322,18 @@
                          
                             var j = 0;
                             for (var i = 0; i < ProcessNumber.length; i++) {
+                                var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+                                var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+                                var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+                                var HNewlineTotal = HNewMoney + HNewTaxMoney;
                                 option.data.push({
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
-                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HRemark": "",
+                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
                                     "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                     "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                    "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": (checkStatus.data[j].閲戦 + (checkStatus.data[j].閲戦 * checkStatus.data[j].绋庣巼))
+                                    "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
                                 })
                                 j++;
                             }

--
Gitblit v1.9.1