MES-WEB-LayUI.git

			@@ -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>
			@@ -580,6 +580,339 @@
			});
			//#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() == "1401") {
			//æºåç±»åæ¯éå®è®¢å
			url = "/Xs_SeOrderBill/PushList";
			} else if ($("#BillType").val() == "1205") {
			//æºåç±»åæ¯éå®åºåºå
			url = "/Kf_SellOutBill/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() == "1401") {
			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].éå®æ¹å¼
			});

			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": ""

			, "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 = 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;

			} else if ($("#BillType").val() == "1205") {
			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].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			});
			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": ""

			, "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++) {
			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;
			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

			//#region å¤éæ¡ç¶æåæ´
			@@ -696,33 +1029,41 @@
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)

			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));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
			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
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			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;
			@@ -744,29 +1085,39 @@
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = value * 1; //åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)
			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));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
			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
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			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;
			@@ -789,32 +1140,85 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = value * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)
			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));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
			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
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			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;
			case "HTaxPrice": //æ°é
			case "HDiscountRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HDiscountRate: oldText
			});
			table.render(option);
			layer.msg("ææ£çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HTaxRate: HTaxRate * 100 //å°HTaxRateå±æ§çå¼ä¹ä»¥100ï¼å¹¶æ´æ°ä¸ºæ°çå¼ ç¨çä¹100 ä»å°æ°ç±»ååä¸ºæ´æ°ææµ®ç¹å
			, HQty: HQty //æ´æ°HQtyåæ®µï¼ï¼å¶å¼æ¥èªåéHQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼å¶å¼æ¥èªåéHPrice
			, HMoney: HMoney //æ´æ°HMoneyåæ®µï¼å¶å¼æ¥èªåéHMoney
			, HTaxMoney: HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼å¶å¼æ¥èªåéHTaxMoney
			, HTaxPrice: HTaxPrice //æ´æ°HTaxPriceåæ®µï¼å¶å¼æ¥èªåéHTaxPrice
			, HDiscountRate: HDiscountRate //æ´æ°HDiscountRateåæ®µï¼å¶å¼æ¥èªåéHDiscountRate
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			});
			break;
			case "HTaxPrice": //å«ç¨åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			@@ -828,33 +1232,41 @@
			return;
			}
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = value * 1; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·=å«ç¨åæ®/(1+ç¨ç)

			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/

			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			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));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
			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
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			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;
			@@ -1749,6 +2161,11 @@
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(0); //å®¡æ ¸
			}
			//ä¿ååæµè§
			//ReRoadBillMain();
			}
			@@ -1929,6 +2346,10 @@
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HCusID").val();
			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",
			@@ -1943,10 +2364,25 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			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.ç©æä»£ç
			@@ -1955,13 +2391,15 @@
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			, HPrice: HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, 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 = [];
			}
			@@ -2331,6 +2769,7 @@
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async:false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			async: false,
			@@ -2380,6 +2819,10 @@
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			//åæ¶å»ç»å