MES-WEB-LayUI.git

			@@ -59,7 +59,8 @@
			<h1 style="text-align: center; padding: 10px 0;"><b>éè´å¥åºå</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -80,13 +81,6 @@
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>


			</div>
			<div class="layui-row">
			@@ -113,30 +107,30 @@
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éªæ¶å<label style="color:red"> * </label></label>
			<label class="layui-form-label">éªæ¶å</label>
			<div class="layui-input-inline">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¿ç®¡å<label style="color:red"> * </label></label>
			<label class="layui-form-label">ä¿ç®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å<label style="color:red"> * </label></label>
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -155,19 +149,19 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">

			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			<!--<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº<label style="color:red"> * </label></label>
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			@@ -209,18 +203,33 @@
			</div>
			<!--<div class="layui-row">

			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			</div>
			</div>

			</div>
			</div>
			</div>

			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
			@@ -240,7 +249,6 @@
			</div>
			</div>
			</div>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			@@ -267,20 +275,6 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			@@ -298,18 +292,32 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -363,7 +371,7 @@

			var allVal;
			//#endregion

			var HModName = "Add_Edit_Kf_POStockInBillList"

			//#region è¿å¥é¡µé¢å³å è½½
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -458,7 +466,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "", "HQty": "", "HRemark": "",
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			@@ -498,10 +506,10 @@
			//checkRefresh();
			}
			break;
			////åè®¾ç½®
			//case 'set_HideColumn':
			// get_HideColumn();
			// break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});

			@@ -580,6 +588,116 @@
			}
			});

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

			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);
			$("#HWHID").val(checkStatus.data[0].HWHID);
			$("#HWHName").val(checkStatus.data[0].ä»åº);
			$("#HSupID").val(checkStatus.data[0].HSupID);
			$("#HSupName").val(checkStatus.data[0].ä¾åºå);
			$("#HEmpID").val(checkStatus.data[0].HEmpID);
			$("#HEmpName").val(checkStatus.data[0].ä¸å¡å);
			$("#HManagerID").val(checkStatus.data[0].HManagerID);
			$("#HManagerName").val(checkStatus.data[0].ä¸»ç®¡);
			$("#HInvoiceBillNo").val(checkStatus.data[0].åç¥¨ç¼å·);
			$("#HInnerBillNo").val(checkStatus.data[0].åé¨åæ®å·);

			var j = 0;
			for (var i = 0; i < result.data.length; i++) {
			var HNewQty = checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é//æ°é
			var HNewMoney = checkStatus.data[j].éé¢ - checkStatus.data[j].å³èæ°é * checkStatus.data[j].åä»·//åå°å³èæ°éçéé¢
			var HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			var HNewlineTotal = HNewMoney + HNewTaxMoney;
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HWHID": checkStatus.data[j].HWHIDSub, "æ¶æä»åº": checkStatus.data[j].ä»åºåç§°,
			"HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HQtyMust": checkStatus.data[j].æ°é,
			"HQty": HNewQty, "HPrice": checkStatus.data[j].åä»·, "HMoney": HNewMoney,"HOrderPrice": checkStatus.data[j].éé¢,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": HNewlineTotal
			})
			j++;
			}

			} else if ($("#HSourceBillType").val() == "1103") {
			option.data = [];//æ¸ç©ºåè¡¨
			$("#HProjectName").val(checkStatus.data[0].é¡¹ç®åç§°);
			$("#HProjectNumber").val(checkStatus.data[0].é¡¹ç®ä»£ç );
			$("#HProjectID").val(checkStatus.data[0].HProjectID);
			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);
			$("#HWHID").val(checkStatus.data[0].ä¸»è¡¨ä»åºID);
			$("#HWHName").val(checkStatus.data[0].ä¸»è¡¨ä»åº);
			$("#HSupID").val(checkStatus.data[0].HSupID);
			$("#HSupName").val(checkStatus.data[0].ä¾åºå);
			$("#HEmpID").val(checkStatus.data[0].HEmpID);
			$("#HEmpName").val(checkStatus.data[0].ä¸å¡å);
			$("#HManagerID").val(checkStatus.data[0].HManagerID);
			$("#HManagerName").val(checkStatus.data[0].ä¸»ç®¡);
			$("#HInvoiceBillNo").val(checkStatus.data[0].åç¥¨ç¼å·);
			$("#HInnerBillNo").val(checkStatus.data[0].åé¨åæ®å·);
			var j = 0;
			for (var i = 0; i < result.data.length; i++) {
			var HNewQty = checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é//æ°é
			var HNewMoney = checkStatus.data[j].éé¢ - checkStatus.data[j].å³èæ°é * checkStatus.data[j].åä»·//åå°å³èæ°éçéé¢
			var HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			var HNewlineTotal = HNewMoney + HNewTaxMoney;
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HQtyMust": checkStatus.data[j].æ°é, "HQty": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HRemark": "",
			"HPrice": checkStatus.data[j].åä»·, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].éé¢, "HWHID": checkStatus.data[j].HWHID, "æ¶æä»åº": checkStatus.data[j].æ¶æä»åº,
			"HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": HNewlineTotal
			})
			j++;
			}
			}
			table.render(option);
			layer.close(ajaxLoad);
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
			} else {
			layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert(result.Message + "åçéè¯¯!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}
			});
			//#endregion

			//#endregion

			@@ -700,7 +818,7 @@

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			@@ -723,7 +841,7 @@
			obj.update({
			HPrice: oldText
			});
			/* table.render(option);*/
			table.render(option);

			layer.msg("åä»·è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -742,7 +860,7 @@

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			@@ -765,7 +883,7 @@
			obj.update({
			HMoney: oldText
			});
			/* table.render(option);*/
			table.render(option);

			layer.msg("éé¢è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -775,7 +893,7 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = value * 1;
			var HPrice = (HMoney / HQty); //åä»·=éé¢/æ°é
			var HTaxRate = value * 0.01; //ç¨ç
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			@@ -783,7 +901,7 @@

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			@@ -799,7 +917,6 @@
			});
			table.render(option);
			break;

			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			@@ -831,7 +948,7 @@

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			@@ -872,7 +989,7 @@

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			@@ -971,10 +1088,10 @@
			, totalRow: true
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100 }
			, { type: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { type: 'numbers',field: 'åºå·', title: 'åºå·', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100, hide: true }//æºåç±»å
			, { type: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100, hide: true }//æºåååç
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, edit: 'text', event: "HMaterID" }//f7
			@@ -987,7 +1104,7 @@
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, edit: 'text', totalRow: true }
			, { field: 'HOrderPrice', title: 'éè´éé¢', width: 100, edit: 'text', totalRow: true}
			, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
			, { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
			, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', width: 100, edit: 'text', event: "HWHID" }//f7
			, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100, edit: 'text', event: "HSPID" }//f7
			@@ -1002,6 +1119,8 @@

			option.data = [];
			table.render(option);
			DisPlay_HideColumn();

			}

			//#region å è½½è¡¨å¤´
			@@ -1048,11 +1167,11 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")

			});
			//åè¡¨ èµå¼
			@@ -1101,7 +1220,7 @@
			}
			});

			//#region ä¿åæé®
			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			if (OperationType == 1 \|\| OperationType == 4) {
			@@ -1113,8 +1232,11 @@
			var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			if (option.data[i].HSourceInterID!=0) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			}

			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			layer.alert(err, { icon: 5 });
			@@ -1136,8 +1258,10 @@
			var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			if (option.data[i].HSourceInterID != 0) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			}
			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			layer.alert(err, { icon: 5 });
			@@ -1324,6 +1448,8 @@
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HWHName": dataArray[0].ä¸»è¡¨ä»åº
			, "HWHID": dataArray[0].ä¸»è¡¨ä»åºID
			, "HSSID": "0"
			, "HSSName": ""
			, "HProjectID": dataArray[0].HProjectID
			@@ -1334,7 +1460,8 @@
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			var rowdata = [];

			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			@@ -1344,9 +1471,11 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 2)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			/, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)/
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HQtyMust": dealDoubleToFixed(dataArray[i].æ°é, 2)
			, "HOrderPrice": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			@@ -1391,10 +1520,10 @@
			//#endregion
			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			if ($("#HEmpName").val() == 0) {
			layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HEmpName").val() == 0) {
			// layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}

			if ($("#HDeptName").val() == 0) {
			layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -1408,14 +1537,14 @@
			layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HKeeperID").val() == 0) {
			layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecManagerID").val() == 0) {
			layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HKeeperID").val() == 0) {
			// layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSecManagerID").val() == 0) {
			// layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}


			var num = [];
			@@ -1460,10 +1589,15 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });

			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(0); //å®¡æ ¸
			}
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			//ReRoadBillMain();
			$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			@@ -1481,13 +1615,14 @@
			////#endregion

			function get_checkEmp() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1503,13 +1638,14 @@
			})
			}
			function get_checkSup() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¾åºååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup', 'yes']
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1526,13 +1662,14 @@
			}
			//å·¥ç¨é¡¹ç®
			function get_btnHProjectID() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¡¹ç®åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html', 'yes']
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1549,13 +1686,14 @@
			})
			}
			function get_checkWH() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä»åºåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=HWH', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1582,13 +1720,14 @@
			})
			}
			function get_checkSecManager() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'éªæ¶ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1604,13 +1743,14 @@
			})
			}
			function get_checkKeeper() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¿ç®¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1626,13 +1766,14 @@
			})
			}
			function get_checkDept() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1649,13 +1790,14 @@
			}

			function get_checkManager() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'è´è´£äººåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1826,6 +1968,7 @@
			}
			//è®¡éåä½
			if (obj.event == "HUnitID") {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1834,7 +1977,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1861,6 +2004,7 @@
			}
			//æ¶æä»åº
			if (obj.event == "HWHID") {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1869,7 +2013,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=Warehouse', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1950,7 +2094,7 @@
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			var TaxRate = getHTaxRateByHSupID();
			//if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			//}
			@@ -1985,6 +2129,7 @@
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			option.data[rowIndex + i].HTaxRate = TaxRate;
			////æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			//obj.update({
			// "HMaterID": checkStatus.data[0].HItemID
			@@ -2009,7 +2154,11 @@
			end: function () {
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0) {
			if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
			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_Supplier/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			@@ -2023,9 +2172,16 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			@@ -2042,7 +2198,7 @@
			})
			}
			});
			} else {
			} else if (typeof (OptionData.HItemID) != "undefined"){
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			@@ -2108,10 +2264,18 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}

			var HSupID = $("#HSupID").val();//å¤æä¾åºå
			if (HSupID == 0 \|\| HSupID == '') {
			HSupID = checkStatus.data[0]["HSupID"];
			}
			//è·åæ¶æéç¥åä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HSupID"] != HSupID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¾åºå!");
			layer.close(index);//å³éå¼¹çª
			return;
			}
			ProcessNumber.push(checkStatus.data[i]);
			}

			@@ -2146,13 +2310,17 @@

			var j = 0;
			for (var i = 0; i < checkStatus.data.length; i++) {
			var HNewQty = checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é//æ°é
			var HNewMoney = checkStatus.data[j].éé¢ - checkStatus.data[j].å³èæ°é * checkStatus.data[j].åä»·//åå°å³èæ°éçéé¢
			var HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			var HNewlineTotal = HNewMoney + HNewTaxMoney;
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HWHID": checkStatus.data[j].HWHIDSub, "æ¶æä»åº": checkStatus.data[j].ä»åºåç§°,
			"HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HQtyMust": checkStatus.data[j].æ°é,
			"HQty": checkStatus.data[j].æ°é-checkStatus.data[j].å³èæ°é, "HPrice": checkStatus.data[j].åä»·,"HMoney": checkStatus.data[j].éé¢,
			"HQty": HNewQty, "HPrice": checkStatus.data[j].åä»·, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].éé¢,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": checkStatus.data[j].ä»·ç¨åè®¡
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": HNewlineTotal
			})
			j++;
			}
			@@ -2162,14 +2330,18 @@

			var j = 0;
			for (var i = 0; i < ProcessNumber.length; i++) {
			var HNewQty = checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é//æ°é
			var HNewMoney = checkStatus.data[j].éé¢ - checkStatus.data[j].å³èæ°é * checkStatus.data[j].åä»·//åå°å³èæ°éçéé¢
			var HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			var HNewlineTotal = HNewMoney + HNewTaxMoney;
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HQtyMust": checkStatus.data[j].æ°é, "HQty": checkStatus.data[j].æ°é-checkStatus.data[j].å³èæ°é, "HRemark": "",
			"HPrice": checkStatus.data[j].åä»·, "HMoney": checkStatus.data[j].éé¢, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "æ¶æä»åº": checkStatus.data[j].æ¶æä»åº,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HQtyMust": checkStatus.data[j].æ°é, "HQty": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HRemark": "",
			"HPrice": checkStatus.data[j].åä»·, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].éé¢, "HWHID": checkStatus.data[j].HWHID, "æ¶æä»åº": checkStatus.data[j].æ¶æä»åº,
			"HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": (checkStatus.data[j].éé¢ + (checkStatus.data[j].éé¢ * checkStatus.data[j].ç¨ç))
			"HTaxRate": checkStatus.data[j].ç¨ç, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HlineTotal": HNewlineTotal
			})
			j++;
			}
			@@ -2306,6 +2478,29 @@
			}
			//#endregion

			//#region éè¿ä¾åºåidè·åç¨ç
			function getHTaxRateByHSupID() {
			var HTaxRate;
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0) {
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			type: "GET",
			async: false,
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç);
			}
			});
			} else {
			HTaxRate = 0;
			}
			return HTaxRate;
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåæ¶æéç¥åæ°æ®
			function getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID) {
			@@ -2333,49 +2528,159 @@
			return res;
			}
			//#endregion
			//#region åè®¾ç½®
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var colTitleName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colTitleName += option.cols[0][i]["title"] + ",";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion
			//#region ä¿åæ¹æ³æ ¡éª
			function AllowLoadData(data) {

			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";

			if ($("#HWHID").val() == 0) {
			layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HManagerID").val() == 0) {
			layer.msg("è¯·éæ©è´è´£äººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HEmpID").val() == 0) {
			layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HKeeperID").val() == 0) {
			layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecManagerID").val() == 0) {
			layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HDeptID").val() == 0) {
			layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HWHID").val() == 0) {
			// layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HManagerID").val() == 0) {
			// layer.msg("è¯·éæ©è´è´£äººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HEmpID").val() == 0) {
			// layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HKeeperID").val() == 0) {
			// layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSecManagerID").val() == 0) {
			// layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HDeptID").val() == 0) {
			// layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if ($("#HSupID").val() == 0) {
			layer.msg("è¯·éæ©ä¾åºåï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HPSStyleID").val() == 0) {
			layer.msg("è¯·éæ©éè´æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSSID").val() == 0) {
			layer.msg("è¯·éæ©ç»ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HPSStyleID").val() == 0) {
			// layer.msg("è¯·éæ©éè´æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSSID").val() == 0) {
			// layer.msg("è¯·éæ©ç»ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {

			@@ -2521,8 +2826,8 @@
			OptionData = data
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData = data
			function GetUnitValue(data) {
			OptionData = data[0]
			}

			//åå»è¿åæ¶æä»åº