MES-WEB-LayUI.git

			@@ -333,7 +333,7 @@
			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHNAME").val(sessionStorage["HWHName"]);
			$("#HSupID").val(sessionStorage["HSPID"]);
			$("#HStockPlaceID").val(sessionStorage["HSPID"]);
			$("#HStockPlaceName").val(sessionStorage["HSPName"]);
			//$("#HSupID").val(sessionStorage["HSupID"]);
			//$("#HSupName").val(sessionStorage["HSupName"]);
			@@ -348,6 +348,7 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];

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

			@@ -412,7 +413,7 @@
			$("#HSupName").val(result.data[0].HSupName);
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			element.tabChange('tab-EntrustOutBill', '2');
			layer.load(3);
			}
			@@ -485,8 +486,7 @@



			//éæ©ä»åº
			form.on('submit(HWHID-BT)', function () {
			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -494,13 +494,28 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});
			////éæ©ä»åº
			//form.on('submit(HWHID-BT)', function () {
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});

			//éæ©ä»ä½
			form.on('submit(HSpID-BT)', function () {
			@@ -637,7 +652,7 @@

			//éåºæé®
			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			HSourceFlag = false;
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			@@ -721,7 +736,7 @@
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			@@ -729,6 +744,7 @@
			$("#HStockPlaceName").val(result.data[0].HName);
			$("#HWHID").val(result.data[0].HWHID);
			$("#HWHNAME").val(result.data[0].HWhName);
			$("#HStockPlaceID").val(result.data[0].HItemID);
			element.tabChange('tab-POStockInBill', '2');
			}
			else {
			@@ -826,10 +842,10 @@
			var sBillNo = $("#HBillNo").val()
			var sQty = $("#HQty").val()
			var sWHID = $("#HWHID").val()
			var sSPID = $("#HSupID").val()
			var sSPID = $("#HStockPlaceID").val()
			var sHBillType = $("#HBillType").val()
			var sSourceBillNo = $("#HSourceBillNo").val()
			var Flag = sessionStorage["SourceFlag"];
			var Flag = HSourceFlag;
			var sMouldManagerCtl = "N"; //æ¯å¦å¯ç¨å¨å·ç®¡ç
			var sFIFOCtl = "N"; //æ¯å¦å¯ç¨åè¿ååºç®¡ç
			var sQty = $("#HQty").val();
			@@ -849,14 +865,79 @@
			$('#HQty').val("");
			}
			$.ajax({
			url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": '1211', "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sWHID, "HSPID": sSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": Flag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			//url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
			//type: "GET",
			//data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "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);
			$("#HStockPlaceName").val("");
			$("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2'); //è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'ä»ä½æ¡ç ') {
			$("#HStockPlaceName").val(result.data.HSPName);
			$("#HStockPlaceID").val(result.data.HSPID);
			$("#HWHNAME").val(result.data.HWhName);
			$("#HWHID").val(result.data.HWhID);
			$("#HNote").val(";ä¸é®æ«ç ä»ä½æ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'é¨é¨æ¡ç ') {
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç ");
			element.tabChange('tab-EntrustOutBill', '2');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			$("#HBillType").val(result.data.hSourceBillTypeField == null ? "1604" : result.data.hSourceBillTypeField);
			if (result.data.hSourceBillTypeField == "1604") {
			$("#HBillType").empty();
			$("#HBillType").val("1604");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å§å¤è®¢å-ææ' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ä¸é®æ«ç æºåæ¡ç ");
			element.tabChange('tab-EntrustOutBill', '3');
			}
			else {
			if (HSourceFlag == true) {
			element.tabChange('tab-EntrustOutBill', '3');
			}
			else {
			HSourceFlag = true;
			$("#HNote").val(";ç©ææ¡ç ");
			element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			}
			}
			playSound1();
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æ¡ç ï¼æå\n");
			element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			//element.tabChange('tab-EntrustOutBill', '3'); //è·³è½¬é¡µç¾
			layer.load(3)
			table.render({
			elem: '#wl-table'
			@@ -943,7 +1024,7 @@
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			playSound1();
			$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "æ«æºåå·ï¼æå\n");
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			element.tabChange('tab-EntrustOutBill', '2'); //è·³è½¬é¡µç¾
			layer.load(3)
			table.render({