MES-WEB-LayUI.git

parent: 1c28114c | 补丁 | 提交 | ignore whitespace

wtt

2024-09-06 4e59107262049ff708e24686603befb18865fd73

部分单据回车选择源单

4个文件已修改

	WebTM/views/采购管理/应付单/Cg_PayableBill.html	294 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html	89 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html	132 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -92,7 +92,7 @@
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; ">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -574,6 +574,243 @@
                get_checkMainSource();
            });
            //#endregion

            //#region åè½¦éæ©æºå
            $('#HMainSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HMainSourceBillNo').val();//ï¼æºååæ®å·ï¼
                if (event.keyCode == 13) {
                    var ajaxLoad = layer.load();
                    var url;
                    //å¤æææ¬æ¡æ¯å¦ææ°æ®    new
                    if (HSourceBillNo == "") {
                        return;
                    }
                    if ($("#BillType").val() == "1102") {
                        //æºåç±»åæ¯éè´è®¢å
                        url = "/Cg_POOrderBill/PushList";
                    } else if ($("#BillType").val() == "1201") {
                        //æºåç±»åæ¯æ¶æéç¥å
                        url = "/Kf_POStockInBill/PushList";
                    }
                    $.ajax({
                        url: GetWEBURL() + url,
                        type: "GET",
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                                var dataArray = result.data;
                                if ($("#BillType").val() == "1102") {
                                    form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                        "HMainSourceInterID": "0"
                                        , "HMainSourceEntryID": "0"
                                        /*, "HMainSourceBillNo": ""*/
                                        , "HMainSourceBillType": $("#BillType").val()

                                        , "HDeptID": dataArray[0].HDeptID
                                        , "HDeptName": dataArray[0].é¨é¨
                                        , "HMangerID": dataArray[0].HManagerID
                                        , "HMangerName": dataArray[0].ä¸»ç®¡
                                        , "HEmpID": dataArray[0].HEmpID
                                        , "HEmpName": dataArray[0].ä¸å¡å
                                        , "HSupID": dataArray[0].HSupID
                                        , "HSupName": dataArray[0].ä¾åºå
                                        , "HCurID": dataArray[0].HCurID
                                        , "HCurName": dataArray[0].å¸å«
                                        , "HExRate": dataArray[0].æ±ç
                                        , "HSSID": dataArray[0].HSSID
                                        , "HSSName": dataArray[0].ç»ç®æ¹å¼
                                        , "HPSStyleID": dataArray[0].HPSStyleID
                                        , "HPSStyleName": dataArray[0].éè´æ¹å¼
                                    });

                                    //åè¡¨Entry  èµå¼
                                    var rowdataEntry = [];
                                    for (var i = 0; i < dataArray.length; i++) {
                                        var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é;                           //æ°é
                                        var HPrice = dataArray[i].åä»·;               //åä»·
                                        var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                                        var HTaxRate = dataArray[i].ç¨ç * 0.01;           //ç¨ç
                                        var HTaxMoney = Number((HMoney * HTaxRate));         //ç¨é¢=éé¢*ç¨ç
                                        var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                                        var HExRate = $("#HExRate").val();                      //æ±ç
                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                                        var HMoneyBB = HMoney * HExRate;
                                        rowdataEntry.push(
                                            {
                                                "HMaterID": dataArray[i].HMaterID
                                                , "ç©æä»£ç ": dataArray[i].ç©æä»£ç 
                                                , "ç©æåç§°": dataArray[i].ç©æåç§°
                                                , "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
                                                , "HUnitID": dataArray[i].HUnitID
                                                , "è®¡éåä½": dataArray[i].è®¡éåä½
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , "HTaxRate": dataArray[i].ç¨ç
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
                                                , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                                                , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                                                , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                                                , "HRemark": ""

                                                , "HSourceInterID": dataArray[i].hmainid
                                                , "HSourceEntryID": dataArray[i].hsubid
                                                , "HSourceBillNo": dataArray[i].åæ®å·
                                                , "HSourceBillType": dataArray[i].åæ®ç±»å
                                                , "HRelationQty": "0"
                                                , "HRelationMoney": "0"

                                                , 'HPOOrderInterID': "0"
                                                , 'HPOOrderEntryID': "0"
                                                , 'HPOOrderBillNo': ""

                                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                                                , "HSeOrderInterID": dataArray[i].hmainid
                                                , "HSeOrderEntryID": dataArray[i].hsubid
                                                , "HSeOrderBillNo": dataArray[i].åæ®å·
                                            }
                                        );
                                    }
                                    optionEntry.data = rowdataEntry;
                                    table.render(optionEntry);
                                    //åè¡¨æ±æ»
                                    for (var i = 0; i < rowdataEntry.length; i++) {
                                        var item = rowdataEntry[i];

                                        for (var j = i + 1; j < rowdataEntry.length; j++) {
                                            if (rowdataEntry[j].HMaterID == item.HMaterID) {
                                                rowdataEntry[i].HQty += rowdataEntry[j].HQty;//æ°é
                                                rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
                                                rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
                                                rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
                                                var HExRate = $("#HExRate").val();
                                                rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
                                                rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
                                                rowdataEntry.splice(j, 1);
                                                j = j - 1;
                                            }
                                        }
                                    }
                                    set_InitGridHaveSource();
                                    option.data = rowdataEntry;

                                } else if ($("#BillType").val() == "1201") {
                                    form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                        "HMainSourceInterID": "0"
                                        , "HMainSourceEntryID": "0"
                                        /*, "HMainSourceBillNo": ""*/
                                        , "HMainSourceBillType": $("#BillType").val()

                                        , "HDeptID": dataArray[0].HDeptID
                                        , "HDeptName": dataArray[0].é¨é¨
                                        , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
                                        , "HMangerName": dataArray[0].ä¸»ç®¡
                                        , "HEmpID": dataArray[0].HEmpID
                                        , "HEmpName": dataArray[0].ä¸å¡å
                                        , "HSupID": dataArray[0].HSupID
                                        , "HSupName": dataArray[0].ä¾åºå
                                        , "HCurID": dataArray[0].HCurID
                                        , "HCurName": dataArray[0].å¸å«
                                        , "HExRate": dataArray[0].æ±ç
                                        , "HSSID": "0"
                                        , "HSSName": ""
                                        , "HPSStyleID": dataArray[0].HPSStyleID
                                        , "HPSStyleName": dataArray[0].éè´æ¹å¼
                                    });
                                    //åè¡¨Entry  èµå¼
                                    var rowdataEntry = [];
                                    for (var i = 0; i < dataArray.length; i++) {
                                        var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é;                           //æ°é
                                        var HPrice = dataArray[i].åä»·;               //åä»·
                                        var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                                        var HTaxRate = dataArray[i].ç¨ç * 0.01;           //ç¨ç
                                        var HTaxMoney = Number((HMoney * HTaxRate));         //ç¨é¢=éé¢*ç¨ç
                                        var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                                        var HExRate = $("#HExRate").val();                      //æ±ç
                                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                                        var HMoneyBB = HMoney * HExRate;
                                        rowdataEntry.push(
                                            {
                                                "HMaterID": dataArray[i].HMaterID
                                                , "ç©æä»£ç ": dataArray[i].ç©æä»£ç 
                                                , "ç©æåç§°": dataArray[i].ç©æåç§°
                                                , "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
                                                , "HUnitID": dataArray[i].HUnitID
                                                , "è®¡éåä½": dataArray[i].è®¡éåä½
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , "HTaxRate": dataArray[i].ç¨ç
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
                                                , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                                                , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                                                , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                                                , "HRemark": ""

                                                , "HSourceInterID": dataArray[i].hmainid
                                                , "HSourceEntryID": dataArray[i].hsubid
                                                , "HSourceBillNo": dataArray[i].åæ®å·
                                                , "HSourceBillType": dataArray[i].åæ®ç±»å
                                                , "HRelationQty": "0"
                                                , "HRelationMoney": "0"

                                                , 'HPOOrderInterID': "0"
                                                , 'HPOOrderEntryID': "0"
                                                , 'HPOOrderBillNo': ""

                                                // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                                                , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
                                                , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
                                                , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
                                            }
                                        );
                                    }
                                    optionEntry.data = rowdataEntry;
                                    table.render(optionEntry);
                                    //åè¡¨æ±æ»
                                    for (var i = 0; i < rowdataEntry.length; i++) {
                                        var item = rowdataEntry[i];
                                        for (var j = i + 1; j < rowdataEntry.length; j++) {
                                            if (rowdataEntry[j].HMaterID == item.HMaterID) {
                                                rowdataEntry[i].HQty += rowdataEntry[j].HQty;
                                                rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
                                                rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
                                                rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
                                                var HExRate = $("#HExRate").val();
                                                rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
                                                rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
                                                rowdataEntry.splice(j, 1);
                                                j = j - 1;
                                            }
                                        }
                                    }
                                    set_InitGridHaveSource();
                                    option.data = rowdataEntry;
                                    
                                }
                                haveSource = true;
                                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

@@ -1248,6 +1485,7 @@
                        var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                        var HExRate = $("#HExRate").val();                      //æ±ç
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                        var HMoneyBB = HMoney * HExRate;

                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1255,6 +1493,7 @@
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                        obj.update({
                            HQty: HQty
@@ -1263,6 +1502,7 @@
                            , HTaxMoney: HTaxMoney
                            , HlineTotal: HlineTotal
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1291,7 +1531,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
                        var HExRate = $("#HExRate").val();                      //æ±ç
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

                        var HMoneyBB = HMoney * HExRate;
                        //æ°åç²¾åº¦
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1301,6 +1541,7 @@
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                        obj.update({
                            HQty: HQty
@@ -1311,6 +1552,7 @@
                            , HTaxPrice, HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1341,6 +1583,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
                        var HExRate = $("#HExRate").val();                       //æ±ç
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));       //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                        var HMoneyBB = HMoney * HExRate;
                        //æ°åç²¾åº¦
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1350,6 +1593,7 @@
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                        obj.update({
                            HTaxRate: HTaxRate * 100
@@ -1362,6 +1606,7 @@
                            , HTaxPrice, HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice
                            , HlineTotalBB: HlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -1409,7 +1654,6 @@
                        });
                        table.render(option);
                        break;
                        
                    case "HTaxPrice":                                         //åä»·
                        //æ°æ®æ ¼å¼æ ¡éª  
                        temp = value + "";     //ä¿®æ¹åçå¼ è½¬ä¸ºåç¬¦ä¸² èµå¼ç»  åétemp
@@ -1436,6 +1680,7 @@
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4));   //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
                        var HExRate = $("#HExRate").val();                      //æ±ç
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4));     //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                        var HMoneyBB = HMoney * HExRate;
                        //æ°åç²¾åº¦
                        HQty = Number(HQty.toFixed(HQtyDec));
                        HPrice = Number(HPrice.toFixed(HPriceDec));
@@ -1445,6 +1690,7 @@
                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                        HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
                        HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
                        HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
                        //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                        obj.update({                    //æ´æ°è¡¨æ ¼æ°æ®                æ¹æ³æ¯è¯¥å¯¹è±¡æä¾çä¸ä¸ªæ¹æ³ï¼ç¨äºæ´æ°å¶åé¨ç¶ææä¸ä¹å³èçæ°æ®æº
                            HQty: HQty                               //æ´æ°HQtyåæ®µï¼HQty
@@ -1455,6 +1701,7 @@
                            , HTaxPrice, HTaxPrice                   //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
                            , HRelTaxPrice: HRelTaxPrice            //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
                            , HlineTotalBB: HlineTotalBB              //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
                            , HMoneyBB: HMoneyBB
                        });
                        table.render(option);
                        break;
@@ -2589,6 +2836,15 @@
                //åè¡¨Entry  èµå¼
                var rowdataEntry = [];
                for (var i = 0; i < dataArray.length; i++) {
                    var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é;                           //æ°é
                    var HPrice = dataArray[i].åä»·;               //åä»·
                    var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                    var HTaxRate = dataArray[i].ç¨ç * 0.01;           //ç¨ç
                    var HTaxMoney = Number((HMoney * HTaxRate));         //ç¨é¢=éé¢*ç¨ç
                    var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                    var HExRate = $("#HExRate").val();                      //æ±ç
                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                    var HMoneyBB = HMoney * HExRate;
                    rowdataEntry.push(
                        {
                            "HMaterID": dataArray[i].HMaterID
@@ -2597,17 +2853,17 @@
                            , "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
                            , "HUnitID": dataArray[i].HUnitID
                            , "è®¡éåä½": dataArray[i].è®¡éåä½
                            , "HQty": dealDoubleToFixed(dataArray[i].æ°é - dataArray[i].å³èæ°é, 1)
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , "HTaxRate": dataArray[i].ç¨ç
                            , 'HTaxMoney': "0"                                                         //
                            , "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
                            , 'HMoneyBB': dealDoubleToFixed(dataArray[i].éé¢ * dataArray[0].æ±ç, 2)
                            , 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
                            , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                            , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                            , "HRemark": ""

                            , "HSourceInterID": dataArray[i].hmainid
@@ -2642,6 +2898,7 @@
                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
                            var HExRate = $("#HExRate").val();
                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
                            rowdataEntry.splice(j, 1);
                            j = j - 1;
                        }
@@ -2703,6 +2960,15 @@
                //åè¡¨Entry  èµå¼
                var rowdataEntry = [];
                for (var i = 0; i < dataArray.length; i++) {
                    var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é;                           //æ°é
                    var HPrice = dataArray[i].åä»·;               //åä»·
                    var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                    var HTaxRate = dataArray[i].ç¨ç * 0.01;           //ç¨ç
                    var HTaxMoney = Number((HMoney * HTaxRate));         //ç¨é¢=éé¢*ç¨ç
                    var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                    var HExRate = $("#HExRate").val();                      //æ±ç
                    var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));      //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                    var HMoneyBB = HMoney * HExRate;
                    rowdataEntry.push(
                        {
                            "HMaterID": dataArray[i].HMaterID
@@ -2711,14 +2977,17 @@
                            , "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
                            , "HUnitID": dataArray[i].HUnitID
                            , "è®¡éåä½": dataArray[i].è®¡éåä½
                            , "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é, 1)
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , "HTaxRate": dataArray[i].ç¨ç
                            , 'HTaxMoney': "0"                                                         //
                            , "HMoney": dataArray[i].éé¢
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
                            , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
                            , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
                            , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
                            , "HRemark": ""

                            , "HSourceInterID": dataArray[i].hmainid
@@ -2752,6 +3021,7 @@
                            rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
                            var HExRate = $("#HExRate").val();
                            rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
                            rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
                            rowdataEntry.splice(j, 1);
                            j = j - 1;
                        }

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏÍ¨Öªµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -881,7 +881,7 @@
                                    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 HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
                                        option.data.push({
                                            "HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
                                            "HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
@@ -894,7 +894,7 @@
                                    }
                                    table.render(option);
                                    layer.close(ajaxLoad);
                                    layer.msg("æ¥è¯¢æå", { time: 1 * 1000,icon: 1 });
                                    layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
                                }
                            } else {
                                layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õÍ¨Öªµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -229,7 +229,7 @@
                                         <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; background-color: #efefef4d;"   readonly>
                                                <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>
@@ -591,6 +591,84 @@
                }
            });

            //#region åè½¦éæ©æºå
            $('#HSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HSourceBillNo').val();//ï¼æºååæ®å·ï¼
                if (event.keyCode == 13) {
                    var ajaxLoad = layer.load();
                    //å¤æææ¬æ¡æ¯å¦ææ°æ®    new
                    if (HSourceBillNo == "") {
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + '/Xs_SeOrderBill/PushList',
                        type: "GET",
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                                var checkStatus = result;
                                if ($("#HSourceBillType").val() == "1401") {
                                    option.data = [];//æ¸ç©ºåè¡¨
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
                                    $("#HProjectNumber").val(checkStatus.data[0].é¡¹ç®ç¼ç );
                                    $("#HProjectName").val(checkStatus.data[0].é¡¹ç®åç§°);

                                    $("#HCusID").val(checkStatus.data[0].HCusID);
                                    $("#HCusName").val(checkStatus.data[0].å®¢æ·);
                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
                                    $("#HDeptName").val(checkStatus.data[0].é¨é¨);
                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
                                    $("#HManagerName").val(checkStatus.data[0].ä¸»ç®¡);
                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
                                    $("#HEmpName").val(checkStatus.data[0].ä¸å¡å);
                                    $("#HCurID").val(checkStatus.data[0].HCurID);
                                    $("#HCurName").val(checkStatus.data[0].å¸å«);
                                    $("#HExRate").val(checkStatus.data[0].æ±ç);
                                    $("#HWHID").val(checkStatus.data[0].ä¸»ä»åºid);
                                    $("#HWHName").val(checkStatus.data[0].ä¸»ä»åº);

                                    var j = 0;
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HQty = checkStatus.data[i].æ°é - checkStatus.data[i].å³èæ°é;                           //æ°é
                                        var HPrice = checkStatus.data[i].åä»·;               //åä»·
                                        var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                                        option.data.push({
                                            "HMaterID": checkStatus.data[i].HMaterID
                                            , "ç©æä»£ç ": checkStatus.data[i].ç©æä»£ç 
                                            , "ç©æåç§°": checkStatus.data[i].ç©æåç§°
                                            , "è§æ ¼åå·": checkStatus.data[i].è§æ ¼åå·
                                            , "HUnitID": checkStatus.data[i].HUnitID
                                            , "è®¡éåä½": checkStatus.data[i].è®¡éåä½
                                            , "HWHID": checkStatus.data[i].HWhID
                                            , "åè´§ä»åº": checkStatus.data[i].åä»åº
                                            , "HQty": HQty,
                                             "HPrice": checkStatus.data[i].åä»·,
                                             "HMoney": HMoney
                                            , "HRemark": ""
                                            , "HSourceBillNo": checkStatus.data[i].åæ®å·
                                            , "HSourceBillType": checkStatus.data[i].HBillType
                                            , "HSourceInterID": checkStatus.data[i].hmainid
                                            , "HSourceEntryID": checkStatus.data[i].hsubid
                                        })
                                        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

            //#region çå¬ååæ ¼ç¼è¾  ååæ ¼ç¼è¾å åæ´
            table.on('edit(mainTable)', function (obj) {
                //æ°å¼æ ¼å¼æ ¡éªå·¥å·
@@ -733,6 +811,9 @@
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            var HQty = checkStatus.data[i].æ°é - checkStatus.data[i].å³èæ°é;                           //æ°é
                            var HPrice = checkStatus.data[i].åä»·;               //åä»·
                            var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                            option.data.push({
                                "HMaterID": checkStatus.data[i].HMaterID
                                , "ç©æä»£ç ": checkStatus.data[i].ç©æä»£ç 
@@ -742,10 +823,10 @@
                                , "è®¡éåä½": checkStatus.data[i].è®¡éåä½
                                , "HWHID": checkStatus.data[i].HWhID
                                , "åè´§ä»åº": checkStatus.data[i].åä»åº
                                , "HQty": checkStatus.data[i].æ°é,
                                , "HQty": HQty,
                                "HPrice": checkStatus.data[i].åä»·,
                                "HMoney": checkStatus.data[i].éé¢, "HRemark": ""
                            
                                "HMoney": HMoney
                                , "HRemark": ""
                                , "HSourceBillNo": checkStatus.data[i].åæ®å·
                                , "HSourceBillType": checkStatus.data[i].HBillType
                                , "HSourceInterID": checkStatus.data[i].hmainid

 WebTM/views/ÑéÊÕÈë¿â/Íâ¹ºÈë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -155,7 +155,7 @@
                                        <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>
@@ -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].é¡¹ç®ä»£ç );
                                    $("#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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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].é¡¹ç®ä»£ç );
                                    $("#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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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

@@ -1102,7 +1212,7 @@
                }
            });

      //#region ä¿åæé®
            //#region ä¿åæé®
            form.on('submit(Saver)', function (data) {
                //#region å¤ææºåç¶æ
                if (OperationType == 1 || OperationType == 4) {
@@ -2184,13 +2294,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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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++;
                            }
@@ -2200,14 +2314,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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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++;
                            }

			@@ -92,7 +92,7 @@
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; ">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -574,6 +574,243 @@
			get_checkMainSource();
			});
			//#endregion

			//#region åè½¦éæ©æºå
			$('#HMainSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HMainSourceBillNo').val();//ï¼æºååæ®å·ï¼
			if (event.keyCode == 13) {
			var ajaxLoad = layer.load();
			var url;
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			return;
			}
			if ($("#BillType").val() == "1102") {
			//æºåç±»åæ¯éè´è®¢å
			url = "/Cg_POOrderBill/PushList";
			} else if ($("#BillType").val() == "1201") {
			//æºåç±»åæ¯æ¶æéç¥å
			url = "/Kf_POStockInBill/PushList";
			}
			$.ajax({
			url: GetWEBURL() + url,
			type: "GET",
			data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var dataArray = result.data;
			if ($("#BillType").val() == "1102") {
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			/, "HMainSourceBillNo": ""/
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": dataArray[0].HSSID
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			});

			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].åæ®ç±»å
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			optionEntry.data = rowdataEntry;
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			var item = rowdataEntry[i];

			for (var j = i + 1; j < rowdataEntry.length; j++) {
			if (rowdataEntry[j].HMaterID == item.HMaterID) {
			rowdataEntry[i].HQty += rowdataEntry[j].HQty;//æ°é
			rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
			rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			}
			}
			set_InitGridHaveSource();
			option.data = rowdataEntry;

			} else if ($("#BillType").val() == "1201") {
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			/, "HMainSourceBillNo": ""/
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			});
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].åæ®ç±»å
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			// , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			optionEntry.data = rowdataEntry;
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			var item = rowdataEntry[i];
			for (var j = i + 1; j < rowdataEntry.length; j++) {
			if (rowdataEntry[j].HMaterID == item.HMaterID) {
			rowdataEntry[i].HQty += rowdataEntry[j].HQty;
			rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
			rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			}
			}
			set_InitGridHaveSource();
			option.data = rowdataEntry;

			}
			haveSource = true;
			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

			@@ -1248,6 +1485,7 @@
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1255,6 +1493,7 @@
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -1263,6 +1502,7 @@
			, HTaxMoney: HTaxMoney
			, HlineTotal: HlineTotal
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1291,7 +1531,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1301,6 +1541,7 @@
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -1311,6 +1552,7 @@
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1341,6 +1583,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1350,6 +1593,7 @@
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HTaxRate: HTaxRate * 100
			@@ -1362,6 +1606,7 @@
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1409,7 +1654,6 @@
			});
			table.render(option);
			break;

			case "HTaxPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + ""; //ä¿®æ¹åçå¼ è½¬ä¸ºåç¬¦ä¸² èµå¼ç» åétemp
			@@ -1436,6 +1680,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1445,6 +1690,7 @@
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ® æ¹æ³æ¯è¯¥å¯¹è±¡æä¾çä¸ä¸ªæ¹æ³ï¼ç¨äºæ´æ°å¶åé¨ç¶ææä¸ä¹å³èçæ°æ®æº
			HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			@@ -1455,6 +1701,7 @@
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -2589,6 +2836,15 @@
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			@@ -2597,17 +2853,17 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é - dataArray[i].å³èæ°é, 1)
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].éé¢ * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			@@ -2642,6 +2898,7 @@
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			@@ -2703,6 +2960,15 @@
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			@@ -2711,14 +2977,17 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é, 1)
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dataArray[i].éé¢
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			@@ -2752,6 +3021,7 @@
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}

			@@ -881,7 +881,7 @@
			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 HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
			@@ -894,7 +894,7 @@
			}
			table.render(option);
			layer.close(ajaxLoad);
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000,icon: 1 });
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
			}
			} else {
			layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });

			@@ -229,7 +229,7 @@
			<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; background-color: #efefef4d;" readonly>
			<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>
			@@ -591,6 +591,84 @@
			}
			});

			//#region åè½¦éæ©æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val();//ï¼æºååæ®å·ï¼
			if (event.keyCode == 13) {
			var ajaxLoad = layer.load();
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			return;
			}
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/PushList',
			type: "GET",
			data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var checkStatus = result;
			if ($("#HSourceBillType").val() == "1401") {
			option.data = [];//æ¸ç©ºåè¡¨
			$("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
			$("#HProjectNumber").val(checkStatus.data[0].é¡¹ç®ç¼ç );
			$("#HProjectName").val(checkStatus.data[0].é¡¹ç®åç§°);

			$("#HCusID").val(checkStatus.data[0].HCusID);
			$("#HCusName").val(checkStatus.data[0].å®¢æ·);
			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);
			$("#HManagerID").val(checkStatus.data[0].HManagerID);
			$("#HManagerName").val(checkStatus.data[0].ä¸»ç®¡);
			$("#HEmpID").val(checkStatus.data[0].HEmpID);
			$("#HEmpName").val(checkStatus.data[0].ä¸å¡å);
			$("#HCurID").val(checkStatus.data[0].HCurID);
			$("#HCurName").val(checkStatus.data[0].å¸å«);
			$("#HExRate").val(checkStatus.data[0].æ±ç);
			$("#HWHID").val(checkStatus.data[0].ä¸»ä»åºid);
			$("#HWHName").val(checkStatus.data[0].ä¸»ä»åº);

			var j = 0;
			for (var i = 0; i < result.data.length; i++) {
			var HQty = checkStatus.data[i].æ°é - checkStatus.data[i].å³èæ°é; //æ°é
			var HPrice = checkStatus.data[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			option.data.push({
			"HMaterID": checkStatus.data[i].HMaterID
			, "ç©æä»£ç ": checkStatus.data[i].ç©æä»£ç
			, "ç©æåç§°": checkStatus.data[i].ç©æåç§°
			, "è§æ ¼åå·": checkStatus.data[i].è§æ ¼åå·
			, "HUnitID": checkStatus.data[i].HUnitID
			, "è®¡éåä½": checkStatus.data[i].è®¡éåä½
			, "HWHID": checkStatus.data[i].HWhID
			, "åè´§ä»åº": checkStatus.data[i].åä»åº
			, "HQty": HQty,
			"HPrice": checkStatus.data[i].åä»·,
			"HMoney": HMoney
			, "HRemark": ""
			, "HSourceBillNo": checkStatus.data[i].åæ®å·
			, "HSourceBillType": checkStatus.data[i].HBillType
			, "HSourceInterID": checkStatus.data[i].hmainid
			, "HSourceEntryID": checkStatus.data[i].hsubid
			})
			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

			//#region çå¬ååæ ¼ç¼è¾ ååæ ¼ç¼è¾å åæ´
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			@@ -733,6 +811,9 @@
			ProcessNumber.push(checkStatus.data[i]);
			}
			for (var i = 0; i < ProcessNumber.length; i++) {
			var HQty = checkStatus.data[i].æ°é - checkStatus.data[i].å³èæ°é; //æ°é
			var HPrice = checkStatus.data[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			option.data.push({
			"HMaterID": checkStatus.data[i].HMaterID
			, "ç©æä»£ç ": checkStatus.data[i].ç©æä»£ç
			@@ -742,10 +823,10 @@
			, "è®¡éåä½": checkStatus.data[i].è®¡éåä½
			, "HWHID": checkStatus.data[i].HWhID
			, "åè´§ä»åº": checkStatus.data[i].åä»åº
			, "HQty": checkStatus.data[i].æ°é,
			, "HQty": HQty,
			"HPrice": checkStatus.data[i].åä»·,
			"HMoney": checkStatus.data[i].éé¢, "HRemark": ""

			"HMoney": HMoney
			, "HRemark": ""
			, "HSourceBillNo": checkStatus.data[i].åæ®å·
			, "HSourceBillType": checkStatus.data[i].HBillType
			, "HSourceInterID": checkStatus.data[i].hmainid

			@@ -155,7 +155,7 @@
			<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>
			@@ -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].é¡¹ç®ä»£ç );
			$("#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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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].é¡¹ç®ä»£ç );
			$("#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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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

			@@ -1102,7 +1212,7 @@
			}
			});

			//#region ä¿åæé®
			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			if (OperationType == 1 \|\| OperationType == 4) {
			@@ -2184,13 +2294,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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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++;
			}
			@@ -2200,14 +2314,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, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": 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++;
			}