MES-WEB-LayUI.git

			@@ -47,6 +47,7 @@
			<div class="layui-btn-group">
			<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">éæ´å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			</div>
			</div>
			@@ -65,7 +66,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			</div>
			</div>
			@@ -82,9 +83,9 @@
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			<option style="color:blue;" value="1205">éå®åºåºå</option>
			</select>-->
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			<option style="color:blue;" value="1205">éå®åºåºå</option>
			</select>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -101,7 +102,6 @@
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-inline">
			<label class="layui-form-label">éå®é¨é¨</label>
			<div class="layui-input-inline">
			@@ -128,17 +128,27 @@
			<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åä»·ç±»å</label>
			<div class="layui-input-inline">
			<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
			<option value="ææ¬ä»·" selected="selected">ææ¬ä»·</option>
			<option value="ç»ç®ä»·">ç»ç®ä»·</option>
			<option value="å»ç¨ä»·">å»ç¨ä»·</option>
			<option value="ç»ç®ä»·" selected="selected">ç»ç®ä»·</option>
			<option value="å«ç¨ä»·">å«ç¨ä»·</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®åç§°</label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectName" id="HProjectName" class="layui-input" lay-filter="HProjectName" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float:left;width:150px;">
			</div>
			</div>
			</div>
			@@ -150,7 +160,7 @@
			</div>
			</div>
			</div>



			<!--éèåæ®µ-->
			<div class="layui-row" style="display:none;">
			@@ -176,7 +186,7 @@
			</div>
			</div>

			<!--åºæ¬ä¿¡æ¯-->
			<!--å¶å®ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">

			@@ -483,6 +493,12 @@
			});
			//#endregion

			//#region éæ´å
			form.on('submit(set_SelectMainBill)', function (data) {
			set_SelectMainBill();
			});
			//#endregion

			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			@@ -536,9 +552,9 @@
			}
			//#endregion

			//if (AllowLoadData(data)) {
			if (AllowLoadData(data)) {
			set_SaveBill(data);
			//}
			}
			});
			//#endregion
			//#endregion
			@@ -600,6 +616,7 @@
			var url;
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			layer.close(ajaxLoad);
			return;
			}
			if ($("#BillType").val() == "1401") {
			@@ -638,114 +655,62 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": (dataArray[0].é¡¹ç®åç§°)
			});

			if ($("#HPriceType").val() == "ææ¬ä»·") {
			//åè¡¨ææ¬ä»·Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].HNoTaxCost; //ææ¬ä»·
			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].HNoTaxCost, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			} else {
			//åè¡¨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].HTaxPrice, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""
			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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			optionEntry.data = rowdataEntry;

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			@@ -777,11 +742,11 @@

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HMangerID": dataArray[0].hmanagerid
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HCusID": dataArray[0].hsupid
			, "HCusID": dataArray[0].HSupID
			, "HCusName": dataArray[0].å®¢æ·
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			@@ -790,100 +755,54 @@
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			});
			if ($("#HPriceType").val() == "ææ¬ä»·") {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é

			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': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			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': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

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

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""
			, '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].æºååå· : ""
			}
			);
			}
			, '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].æºååå· : ""
			}
			);
			}
			else {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "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;

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			@@ -908,6 +827,7 @@

			}
			table.render(option);
			changeHPrice();
			layer.close(ajaxLoad);
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
			} else {
			@@ -946,7 +866,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1014,6 +934,7 @@
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			@@ -1030,14 +951,23 @@
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref1.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥å¤§äº0çæ°å!");
			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			} else if (temp * 1 == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			}

			@@ -1077,7 +1007,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			//table.render(option);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1131,7 +1061,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			//table.render(option);
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1185,7 +1115,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			//table.render(option);
			break;
			case "HDiscountRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1280,12 +1210,132 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option)
			//table.render(option)
			break;
			case "HMoney": //éé¢
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0 \|\| obj.data.HQty == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HMoney: oldText
			});
			table.render(option);

			layer.msg("æ°éæéé¢è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = value * 1; //éé¢=æ°é*åä»·
			var HPrice = HMoney / HQty; //åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option);
			break;
			default:
			}
			});
			//#endregion

			//#region ä¸ææ¡äºä»¶
			// çå¬ä¸ææ¡éæ©
			form.on('select(HPriceType)', function (data) {
			console.log(data.value); // å¾å°è¢«éä¸çå¼
			changeHPrice();
			});
			//æ ¹æ®ä¸ææ¡çå¼è®¾ç½®ç©æåä»·çä¿¡æ¯
			function changeHPrice() {
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HMaterID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç©ææªéæ©ï¼");
			return false;
			} else {
			var HPrice = option.data[i]["HPrice"];
			var HMaterID = option.data[i]["HMaterID"];
			var HType = $("#HPriceType").val();
			//è·åç©æå¯¹åºåä»·ç±»åçåä»·
			$.ajax({
			url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
			type: "GET",
			async: false,
			data: { "HMaterID": HMaterID, HType: HType },
			success: function (d) {
			HPrice = Number(d.data);
			}, error: function () {
			layer.alert("åçéè¯¯!" + d.Message, { icon: 5 });
			}
			});
			var Dec = getDecByMaterID(option.data[i]["HMaterID"]) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = option.data[i]["HTaxRate"] * 0.01;
			var HExRate = $("#HExRate").val(); //æ±ç
			var HQty = option.data[i]["HQty"] * 1; //æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HDiscountRate = option.data[i]["HDiscountRate"] * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HMoneyBB = HMoney * HExRate;
			///æ°åç²¾åº¦
			option.data[i]["HQty"] = Number(HQty.toFixed(HQtyDec));
			option.data[i]["HPrice"] = Number(HPrice.toFixed(HPriceDec));
			option.data[i]["HMoney"] = Number(HMoney.toFixed(HMoneyDec));
			option.data[i]["HTaxMoney"] = Number(HTaxMoney.toFixed(HMoneyDec));
			option.data[i]["HMoneyBB"] = Number(HMoneyBB.toFixed(HMoneyDec));
			option.data[i]["HlineTotal"] = Number(HlineTotal.toFixed(HMoneyDec));
			option.data[i]["HTaxPrice"] = Number(HTaxPrice.toFixed(HPriceDec));
			option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
			option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
			}

			}
			table.render(option);
			//#endregion
			}

			//#endregion

			//#endregion

			//#endregion
			@@ -1620,13 +1670,318 @@
			{
			setInitBySellOutBill(checkStatus);
			}

			changeHPrice();
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion


			//#region éæ´å
			function set_SelectMainBill() {
			var url;
			if ($("#BillType").val() == "1401") {
			url = "../../éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
			HSourceBillName = "éå®è®¢å";
			}
			else if ($("#BillType").val() == "1205") {
			url = "../../é¢æåè´§/éå®åºåº/Kf_SellOutBillQuery.html?openType=2&HOrgID=" + HOrgID;
			HSourceBillName = "éå®åºåºå";
			}
			else {
			return layer.msg('å½åä¸æ¯æè¯¥æºåéæ©ï¼ï¼');
			}
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: '' + 'æºå' + 'åè¡¨' //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [url, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}
			var HCusID = $("#HCusID").val();//å¤æå®¢æ·
			if (HCusID == 0 \|\| HCusID == '') {
			HCusID = checkStatus.data[0]["HCusID"];
			}
			//è·åè®¾ç½®æ¡ä»¶
			var sMainWhere = " and hmainid in(";
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HCusID"] != HCusID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
			layer.close(index);//å³éå¼¹çª
			return;
			}
			sMainWhere += checkStatus.data[i]["hmainid"]
			if (i != checkStatus.data.length - 1) {
			sMainWhere += ",";
			} else {
			sMainWhere += ") ";
			}
			}
			getSeletMainInfo(sMainWhere);
			changeHPrice();
			layer.close(index);//å³éå¼¹çª
			}
			});
			}
			//#endregion

			//#region æ´åä¿¡æ¯è·åæ¹æ³
			function getSeletMainInfo(sMainWhere) {
			var ajaxLoad = layer.load();
			if ($("#BillType").val() == "1401") {
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/list',
			async: false,
			type: "GET",
			data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var dataArray = data1.data;
			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].ä¸å¡å
			, "HCusID": dataArray[0].HCusID
			, "HCusName": dataArray[0].å®¢æ·
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": dataArray[0].HSSID
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼

			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			});
			//åè¡¨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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}

			optionEntry.data = JSON.parse(JSON.stringify(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.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			return;
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			return;
			}
			});
			} else if ($("#BillType").val() == "1205") {
			$.ajax({
			url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
			type: "GET",
			async: false,
			data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			dataArray = data1.data;
			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].ä¸å¡å
			, "HCusID": dataArray[0].HSupID
			, "HCusName": dataArray[0].å®¢æ·
			, "HCurID": dataArray[0].ä¸»è¡¨å¸å«id
			, "HCurName": dataArray[0].ä¸»è¡¨å¸å«
			, "HExRate": dataArray[0].ä¸»è¡¨æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			});
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é*1 - dataArray[i].å·²å³èæ°é; //æ°é
			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': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "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 = JSON.parse(JSON.stringify(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);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			return;
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			return;
			}
			});
			} else {
			return layer.msg('å½åä¸æ¯æè¯¥æºåéæ©ï¼ï¼');
			}
			}
			//#endregion

			//#endregion

			//#region åè¡¨åå§å
			@@ -1648,13 +2003,13 @@
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, edit: 'text', event: "HUnitID"}//f7
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true, edit: 'text', event: "HQty" }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text', event: "HPrice" }
			, { field: 'HPrice', title: 'åä»·', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text', event: "HTaxPrice" }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text' }
			, { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, edit: 'text' }
			, { field: 'HMoneyBB', title: 'æ¬ä½å¸éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HlineTotal', title: 'ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HlineTotalBB', title: 'æ¬ä½å¸ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			@@ -1689,7 +2044,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1765,52 +2120,11 @@
			table.render(optionEntry);
			}
			function set_InitGridHaveSource() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, limit: 500
			, height: 500
			, loading: false
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, edit: 'text', event: "HMaterID" }//f7
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, style: 'background-color:#efefef4d;' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, edit: 'text', event: "HUnitID" }//f7
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text', event: "HPrice" }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text', event: "HTaxPrice" }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text' }
			, { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HMoneyBB', title: 'æ¬ä½å¸éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HlineTotal', title: 'ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HlineTotalBB', title: 'æ¬ä½å¸ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }

			, { field: 'HSourceInterID', title: 'æºååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HRelationQty', title: 'å³èæ°é', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HRelationMoney', title: 'å³èéé¢', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }

			, { field: 'HPOOrderInterID', title: 'éè´è®¢ååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPOOrderEntryID', title: 'éè´è®¢åååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }

			, { field: 'HSeOrderTaxPrice', title: 'è®¢åå«ç¨åä»·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSeOrderInterID', title: 'éå®è®¢ååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSeOrderEntryID', title: 'éå®è®¢åååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			//éä¸æºååæ°éä¸å¯ç¼è¾
			for (var i = 0; i < option.cols[0].length; i++) {
			if (option.cols[0][i]["field"] == "HQty") {
			option.cols[0][i]["edit"] = false;
			}
			}
			}
			//#endregion
			@@ -1858,6 +2172,8 @@
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HExplanation": data.æè¦
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HProjectID": (data.HProjectID == null ? 0 : data.HProjectID)
			, "HProjectName": data.é¡¹ç®åç§°

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			@@ -2008,8 +2324,8 @@
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			@@ -2089,8 +2405,8 @@
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			@@ -2208,6 +2524,7 @@
			function AllowLoadData(data) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";

			//#region è¡¨å¤´æ°æ®æ£éª
			@@ -2270,11 +2587,11 @@

			//å®åæ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éä¸è½ä¸º0ï¼");
			if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			} else if (temp * 1 == 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			}

			@@ -2305,25 +2622,26 @@
			return false;
			}

			//éé¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HMoney"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////éé¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HMoney"] + "";
			//if (temp == "0") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			//ä»·ç¨åè®¡æ ¼å¼æ ¡éª
			temp = option.data[i]["HTaxMoney"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ä»·ç¨åè®¡ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ä»·ç¨åè®¡è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////ç¨é¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HTaxMoney"] + "";
			////if (temp == "0") {
			//// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢ä¸è½ä¸º0ï¼");
			//// return false;
			////} else
			//if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢è¯·è¾å¥ä¸å°äº0çæ°åï¼");
			// return false;
			//}

			//åè´§ä»åºéç©ºéªè¯
			if (option.data[i]["HWHID"] == "0") {
			@@ -2367,11 +2685,13 @@
			if (typeof (OptionData.HItemID) != "undefined") {
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HCusID").val();
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			var HPrice = obj.data.HPrice * 1;
			var HTaxRate = obj.data.HTaxRate*0.01;
			if (HSupID != 0) {
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			$.ajax({
			url: GetWEBURL() + "/Gy_Customer/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			@@ -2380,63 +2700,51 @@
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			var HExRate = $("#HExRate").val(); //æ±ç
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HMoneyBB = HMoney * HExRate;
			///æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			})
			OptionData = [];
			HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			}
			});
			} else {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			OptionData = [];
			}
			var HExRate = $("#HExRate").val(); //æ±ç
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HMoneyBB = HMoney * HExRate;
			///æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			})
			OptionData = [];
			}
			}
			})
			@@ -2509,9 +2817,14 @@
			}
			, end: function () {
			if (typeof (OptionData.HItemID) != "undefined") {

			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HCusID").val();
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			var HPrice = obj.data.HPrice * 1;
			var HTaxRate = obj.data.HTaxRate*0.01;
			if (HSupID != 0) {
			$.ajax({
			url: GetWEBURL() + "/Gy_Customer/xg",
			@@ -2521,46 +2834,52 @@
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			var HExRate = $("#HExRate").val(); //æ±ç
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			})
			OptionData = [];
			HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			}
			});
			} else {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			OptionData = [];
			}
			var HExRate = $("#HExRate").val(); //æ±ç
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HMoneyBB = HMoney * HExRate;
			///æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));

			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			})
			OptionData = [];
			}
			}
			})
			@@ -2575,14 +2894,15 @@
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			if (rowIndex === '0') {
			if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else if (haveSource == true) {
			layer.msg('ææºåæ æ³å é¤ï¼ï¼ï¼');
			}else {
			obj.del();
			obj.del();//åå é¤
			table.cache["mainTable"].splice(rowIndex, 1); //â¡å½»åºç§»é¤åç´ ï¼ä»ç¼åéç§»é¤è¿ä¸è¡
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			table.render(option);
			layer.close(index);
			}
			});
			@@ -2956,97 +3276,55 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			});

			if ($("#HPriceType").val() == "ææ¬ä»·") {
			//åè¡¨ææ¬ä»·Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é;
			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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "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)
			, "HRemark": ""

			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].HNoTaxCost, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].HNoTaxCost, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			} else {
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 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)
			, "HRemark": ""

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

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			optionEntry.data = rowdataEntry;

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			@@ -3104,7 +3382,6 @@
			return;
			}
			}

			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			@@ -3126,97 +3403,56 @@
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼

			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": dataArray[0].HProjectID == null ? "0" : dataArray[0].HProjectID
			});
			if ($("#HPriceType").val() == "ææ¬ä»·") {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].ææ¬åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].ææ¬åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].ææ¬åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "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].æºååå· : ""
			}
			);
			}
			}
			else {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "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;
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é * 1 - dataArray[i].å³èæ°é;
			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': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "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 = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			@@ -3299,7 +3535,7 @@
			function getDecByMaterID(HMaterID) {
			var resultData = {};
			$.ajax({ // å¼æ¥è¯·æ±
			url: GetWEBURL() + "Gy_Material/getDecByID", //è¯·æ±å°å
			url: GetWEBURL() + "/Gy_Material/getDecByID", //è¯·æ±å°å
			async: false, //æ¯å¦å¼å¯å¼æ¥
			type: "GET", //è¯·æ±ç±»å
			data: { //å®ä¹åéå°æå¡å¨çæ°æ®