MES-WEB-LayUI.git

			@@ -21,7 +21,7 @@
			<div class="layui-form-item" style="padding:15px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ¡ç </label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			@@ -70,7 +70,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
			<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -84,11 +84,11 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			</div>
			</div>
			</div>
			@@ -253,6 +253,7 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			$("#HBarCode").focus();
			@@ -268,6 +269,14 @@
			}
			return vars;
			}

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}

			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			@@ -299,7 +308,7 @@
			{
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillID: linterid, HBillType: '1202', sWhere: '' }
			@@ -369,6 +378,8 @@
			//}
			//
			//

			//éæ©ä»åº
			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			type: 2
			@@ -384,6 +395,8 @@
			}
			})
			});

			//éæ©ä»ä½
			form.on('submit(HSpID-BT)', function () {//éæ©ä»ä½
			layer.open({
			type: 2
			@@ -399,6 +412,8 @@
			}
			})
			});

			//éæ©ä¿ç®¡
			form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			layer.open({
			type: 2
			@@ -414,6 +429,8 @@
			}
			})
			});

			//éæ©éªæ¶
			form.on('submit(HSecManagerID-BT)', function (data) {//éæ©éªæ¶
			var sMainStr = JSON.stringify(data.field);
			layer.open({
			@@ -430,6 +447,8 @@
			}
			})
			});

			//éæ©é¨é¨
			form.on('submit(HDeptID-BT)', function () {//éæ©é¨é¨
			layer.open({
			type: 2
			@@ -445,6 +464,8 @@
			}
			})
			});

			//ç¼è¾
			form.on('submit(cmdModify)', function () {//ç¼è¾
			var sSubStr = table.cache['wl-table'];
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			@@ -465,7 +486,7 @@
			});

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})
			@@ -495,7 +516,7 @@
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			@@ -530,6 +551,18 @@
			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			//debugger;
			if ($("#HExplanation").val() == "") {
			if ($("#HWHNAME").val() == "å®½å¹æåä»NEW" \|\| $("#HWHNAME").val() == "æ ·æ¬ä»NEW") {
			$("#HWHNAME").val("");
			$("#HWHID").val("");
			layer.msg("è¯·æ«MESåºä½ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			else
			{
			$("#HExplanation").val($("#HWHNAME").val());
			}
			}
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = table.cache['wl-table'];
			//var sSourceType = $("#HBillType").val();
			@@ -621,9 +654,9 @@
			//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			success: function (result) {
			debugger;
			//debugger;
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			@@ -652,7 +685,7 @@
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			//if (result.data.HSourceBillType == "3711") {
			// $("#HBillType").val("3711");
			@@ -664,7 +697,7 @@
			element.tabChange('tab-ProductlnBill', '3');
			}
			else {
			if (sessionStorage["SourceFlag"] == "true") {
			if (HSourceFlag == "true") {
			element.tabChange('tab-ProductlnBill', '3');
			}
			else {
			@@ -673,7 +706,7 @@
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			//if (result.data.HSourceBillType == "3711") {
			// $("#HBillType").val("3711");
			@@ -694,28 +727,28 @@
			layer.load(3)
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			@@ -736,6 +769,8 @@
			//layer.closeAll("loading");
			//}
			});

			//æ«æºå
			$('#HSourceBillNo').on('keydown', function (event) { //æ«æºå
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			@@ -755,13 +790,13 @@
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			layer.load(3)
			element.tabChange('tab-ProductlnBill', '2');
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			@@ -793,12 +828,13 @@
			}
			});

			//æ«ä»ä½
			$('#HStockPlaceName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HStockPlaceName').val()
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			@@ -819,6 +855,48 @@
			});
			}
			});

			//æ«MESä»ä½
			$('#HMESSPName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HMESSPName').val();
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) {
			$("#HMESSPID").val(result.data[0].HWHID);
			$("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
			$("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
			$.ajax({
			url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
			type: "GET",
			data: { "HERPWHID": result.data[0].HWHID },
			success: function (result) {
			if (result.count == 1) {
			$("#HWHID").val(result.data[0].HMESWHID);
			$("#HWHNAME").val(result.data[0].HMESWHNAME);
			$("#HMESSPName").attr("readonly", "readonly");//MESä»ä½åªè¯»HExplanation
			$("#HMESSPName").css("background-color", "#efefef4d");
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			}
			});

			//å·æ°æç»é¡µç¾
			table.render({
			elem: '#mx-table'