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

			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -223,6 +217,21 @@
			<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;">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline">
			@@ -240,7 +249,6 @@
			</div>
			</div>
			</div>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			@@ -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

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

			//#region ä¿åæé®
			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			if (OperationType == 1 \|\| OperationType == 4) {
			@@ -2146,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]);
			}

			@@ -2184,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++;
			}
			@@ -2200,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++;
			}
			@@ -2511,10 +2645,10 @@
			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 ($("#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;
			@@ -2531,22 +2665,22 @@
			// 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 ($("#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++) {