MES-WEB-LayUI.git

			@@ -395,7 +395,7 @@
			, table = layui.table
			, form = layui.form
			, element = layui.element;

			//å°sessionçå¼èµå¼ç»çé¢æ§ä»¶ï¼sessionå¼æ¥æºä¸ä¸ä¸æ¬¡æ°æ®éæ©
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHNAME").val(sessionStorage["HWHName"]);
			$("#HStockPlaceID").val(sessionStorage["HSPID"]);
			@@ -413,10 +413,10 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];
			var HSourceFlag = sessionStorage["SourceFlag"];//æºåå·²æ è®°


			//è·ååæ°
			//è·ååæ°ï¼è·åè·³è½¬è¿æ¥çåæ°ï¼
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			@@ -427,6 +427,8 @@
			}
			return vars;
			}


			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			@@ -462,8 +464,7 @@
			//ç¼è¾å è½½æ°æ®
			var sInterID = $("#HInterID").val();
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			elem: '#wl-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
			@@ -488,8 +489,6 @@
			});
			}



			//å¨æå è½½æºåç±»ååè¡¨ new

			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			@@ -498,12 +497,12 @@

			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			//å¤ææ¯å¦æ°å¢
			//å¤ææ¯å¦æ°å¢ï¼å¦ææ¯æ°å¢åæ®åè·åæå¤§åå·åæå¤§åç
			if (linterid == null \|\| linterid == 0) {
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1204' },
			success: function (d) {
			@@ -518,7 +517,7 @@
			RoadBillSub(linterid);
			}

			//éæ©ä»åº
			//éæ©ä»åºï¼äºä»¶ï¼
			form.on('submit(HWHID-BT)', function () {
			layer.open({
			type: 2
			@@ -534,7 +533,8 @@
			}
			})
			});
			//éæ©ä»åº

			//éæ©ä»åºï¼äºä»¶ï¼
			form.on('submit(HFIFOWHID-BT)', function () {
			layer.open({
			type: 2
			@@ -550,7 +550,7 @@
			}
			})
			});
			//éæ©ä»ä½
			//éæ©ä»ä½ï¼äºä»¶ï¼
			form.on('submit(HSpID-BT)', function () {
			layer.open({
			type: 2
			@@ -566,7 +566,7 @@
			}
			})
			});
			//éæ©ä¾åºå
			//éæ©ä¾åºåï¼äºä»¶ï¼
			form.on('submit(HSupID-BT)', function () {
			layer.open({
			type: 2
			@@ -583,39 +583,9 @@
			})
			});

			//form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'é¢æäººåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			//form.on('submit(HSecManagerID-BT)', function (data) {//éæ©éªæ¶
			// var sMainStr = JSON.stringify(data.field);
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'åæäººåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});


			//éæ©ä¿ç®¡
			//éæ©ä¿ç®¡ï¼äºä»¶ï¼
			form.on('submit(HKeeperID-BT)', function () {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -638,7 +608,7 @@
			, btn2: function (index, layero) { }
			})
			});
			//éæ©åè´§
			//éæ©åè´§ï¼äºä»¶ï¼
			form.on('submit(HSecManagerID-BT)', function (data) {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -662,7 +632,7 @@
			})
			});

			//éæ©é¨é¨
			//éæ©é¨é¨ï¼äºä»¶ï¼
			form.on('submit(HDeptID-BT)', function () {
			layer.open({
			type: 2
			@@ -679,13 +649,17 @@
			})
			});

			//éåºæé®ï¼äºä»¶ï¼
			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			window.history.back();
			});
			})

			//ç¼è¾
			//ç¼è¾æé®ï¼äºä»¶ï¼
			form.on('submit(cmdModify)', function () {//ç¼è¾
			var sSubStr = table.cache['wl-table'];
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			@@ -705,34 +679,9 @@
			// }
			});



			//$('#HStockPlaceName').on('keydown', function (event) { //æ«ä»ä½
			// var HBarCode = $('#HStockPlaceName').val()
			// if (event.keyCode == 13) {
			// //å¤æææ¬æ¡æ¯å¦ææ°æ® new
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetSpName_Json",
			// type: "GET",
			// data: { "HBarCode": HBarCode },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// $("#HStockPlaceName").val(result.data[0].HName);
			// $("#HStockPlaceID").val(result.data[0].HItemID);
			// $("#HWHID").val(result.data[0].HWHID);
			// $("#HWHNAME").val(result.data[0].HWhName);
			// element.tabChange('tab-MateOutBill', '2');
			// }
			// else {
			// layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// layer.closeAll("loading");
			// }
			// });
			// }
			//});


			//æ«ä»ä½
			//æ«ä»ä½æ¡ç äºä»¶
			$('#HStockPlaceName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HStockPlaceName').val()
			if (event.keyCode == 13) {
			@@ -1016,7 +965,6 @@
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {

			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			@@ -1133,28 +1081,36 @@
			}
			});
			}

			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { 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 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, page: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80, totalRow: true}
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80, totalRow: true}
			, { 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 }
			, { field: 'HPieceQty', title: 'æ¡ç æ°é', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}


			function playSound() {
			var audio = document.getElementById("cs");
			audio.play();
			@@ -1175,6 +1131,8 @@
			if (HPPQty == "") {
			HPPQty = 0;
			}
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			$.ajax({
			url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
			type: "GET",
			@@ -1185,28 +1143,29 @@
			$("#HBillType").attr("disabled", "true");
			element.tabChange('tab-MateOutBill', '2');
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			playSound1();
			playSound1();//ææ¾å£°é³
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {
			$.ajax({
			url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1204', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			$("#HBarCode_B").val(result.data.list2[0].HBarCode);
			$("#HMaterName_B").val(result.data.list2[0].HMaterName);
			$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
			$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
			$("#HUnitName_B").val(result.data.list2[0].HUnitName);
			$("#HQty_B").val(result.data.list2[0].HQty);
			$("#HTMQty_B").val(result.data.list2[0].HTMQty);
			$("#HWHName_B").val(result.data.list2[0].HWHName);
			$("#HSPName_B").val(result.data.list2[0].HSPName);
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});
			@@ -1237,6 +1196,8 @@
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);
			$("#HWHNAME").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);
			}
			function GetHSupValue(obj) { //è¿åä¾åºå
			$("#HSupName").val(obj[0].HName);
			@@ -1255,6 +1216,12 @@
			$("#HDeptID").val(obj[0].HItemID);
			}
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			//if (reg.test($("#HQty").val()) == false \|\| $("#HQty").val() == '') {
			// layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if ($("#HSourceBillNo").val() == '') {
			// layer.msg("è¯·åæ«æºå!", { icon: 5 });
			// return false;