MES-WEB-LayUI.git

			@@ -155,16 +155,16 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">

			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			<!--<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			@@ -209,13 +209,13 @@
			</div>
			<!--<div class="layui-row">

			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			@@ -267,20 +267,6 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			@@ -298,18 +284,32 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -580,6 +580,116 @@
			}
			});

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

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

			layer.msg("åä»·è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -765,7 +875,7 @@
			obj.update({
			HMoney: oldText
			});
			/* table.render(option);*/
			table.render(option);

			layer.msg("éé¢è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -775,7 +885,7 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = value * 1;
			var HPrice = (HMoney / HQty); //åä»·=éé¢/æ°é
			var HTaxRate = value * 0.01; //ç¨ç
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			@@ -1049,11 +1159,11 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")

			});
			//åè¡¨ èµå¼
			@@ -1102,7 +1212,7 @@
			}
			});

			//#region ä¿åæé®
			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			if (OperationType == 1 \|\| OperationType == 4) {
			@@ -1471,7 +1581,11 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });

			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(0); //å®¡æ ¸
			}
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			//ReRoadBillMain();
			@@ -2180,13 +2294,17 @@

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

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