MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../../layuiadmin/PubCustom.js"></script>
			<style>
			.layui-col-xs4 {
			width: 12.333333%
			@@ -158,9 +159,9 @@
			var HBillNo = $('#HBillNo').val()
			var HBillType = '1207'
			var HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
			var HPackUnionInterID_In = $("#HPackUnionInterID_In").val() //è°å¥ç»æååç
			var HWhID = $("#HWHID").val() //è°å¥ä»åº
			var HSPID = $("#HSPID").val() //è°å¥ä»ä½
			var HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //è°å¥ç»æååç
			var HWhID = $('#HWHID').val() //è°å¥ä»åº
			var HSPID = $('#HSPID').val() //è°å¥ä»ä½
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"]
			var SourceFlag = sessionStorage["SourceFlag"]; //ææ¡ç å·²æ«æ å¿
			@@ -210,20 +211,20 @@
			//#endregion

			//#region ä»ç¼ååè¡¨ä¸è¿åä¿¡æ¯
			function getBillTemp() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			var params = getBillTemp();
			var HInterID_Temp = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			var HBillNo_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·
			var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼ååè¡¨ä¸è¿åææ¡ç
			//function getBillTemp() {
			// var vars = [], hash;
			// var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			// for (var i = 0; i < hashes.length; i++) {
			// hash = hashes[i].split('=');
			// vars.push(hash[0]);
			// vars[hash[0]] = hash[1];
			// }
			// return vars;
			//}
			//var params = getBillTemp();
			//var HInterID_Temp = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			//var HBillNo_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·
			//var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼ååè¡¨ä¸è¿åææ¡ç

			//#endregion

			@@ -231,13 +232,12 @@


			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var OperationType = 0; //ç´æ¥æ°å¢
			} else {
			var OperationType = 2;//æä½ç±»å
			var OperationType = 1; //ç¼åä¸æå¼
			}


			if (HInterID_Temp == null \|\| HInterID_Temp == 0) {
			if (OperationType == 0 && HInterID == 0) {
			//è·åæå¤§åæ®IDãåæ®å·
			$.ajax({
			type: "GET",
			@@ -257,26 +257,70 @@
			});
			SourceFlag = false;
			}
			else if (OperationType == 0 && HInterID != 0) {
			SourceFlag = true;
			}
			//ä»ç¼ååè¡¨ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å
			else {
			var HInterID_Temp = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			var HBillNo_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·
			var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼ååè¡¨ä¸è¿åææ¡ç

			$('#HInterID').val(HInterID_Temp)
			$('#HBillNo').val(HBillNo_Temp)
			$('#HBarCode_Pack_In').val(HBarCode_Pack_Temp)
			else if (HInterID == 0) {
			$("#HBarCode_Pack_In").val(params[params[0]]);
			$("#HBarCode_Pack_In").attr("readonly", "readonly");
			HInterID = $('#HInterID').val()
			HBillNo = $('#HBillNo').val()
			HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
			$("#HBarCode").focus();
			$("#HPackUnionInterID_In").val(params[params[0]]);
			$("#HWHName").val(params[params[0]]);
			$("#HWHID").val(params[params[0]]);
			$("#HSPName").val(params[params[0]]);
			$("#HSPID").val(params[params[0]]);
			$("#HBarCode").select();
			$("#HBarCode").focus(); //è·ååæ
			document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');

			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			SourceFlag = true;
			}
			else {
			SourceFlag = true;
			}

			//if (HInterID_Temp == null \|\| HInterID_Temp == 0) {
			// //è·åæå¤§åæ®IDãåæ®å·
			// $.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
			// data: { "HBillType": HBillType },
			// success: function (d) {
			// if (d.count == 1) {
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// HInterID = $('#HInterID').val()
			// HBillNo = $('#HBillNo').val()
			// }
			// else {
			// layer.msg(d.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			// }
			// }
			// });
			// SourceFlag = false;
			//}
			////ä»ç¼ååè¡¨ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å
			//else {
			// var HInterID_Temp = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			// var HBillNo_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·
			// var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼ååè¡¨ä¸è¿åææ¡ç

			// $('#HInterID').val(HInterID_Temp)
			// $('#HBillNo').val(HBillNo_Temp)
			// $('#HBarCode_Pack_In').val(HBarCode_Pack_Temp)
			// $("#HBarCode_Pack_In").attr("readonly", "readonly");
			// HInterID = $('#HInterID').val()
			// HBillNo = $('#HBillNo').val()
			// HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
			// $("#HBarCode").focus();
			// element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');

			// //æ¾ç¤ºè¡¨ä½æç»
			// DisBillEntryList();
			// SourceFlag = true;
			//}

			//å¤±è´¥æç¤ºé³
			function playSound() {
			@@ -334,8 +378,14 @@
			$("#HSPID").val(result.data.hSPIDField);
			$("#HBarCode").select();
			$("#HBarCode").focus(); //è·ååæ
			document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
			$('#cmdHBarCode_Pack_In').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
			//document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '2');
			//å¨å±åéèµå¼
			HBarCode_Pack_In = $('#HBarCode_Pack_In').val() //è°å¥ææ¡ç
			HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //è°å¥ç»æååç
			HWhID = $('#HWHID').val() //è°å¥ä»åº
			HSPID = $('#HSPID').val() //è°å¥ä»ä½
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			SourceFlag = true;
			@@ -404,6 +454,7 @@
			playSound();
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			playSound();
			@@ -430,7 +481,9 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_MoveStockBill_HuanTuo_Json",
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
			data: {
			"HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID
			},
			success: function (result) {
			if (result.count == 1) {
			playSound_OK();
			@@ -533,13 +586,15 @@
			layer.load(3);
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false; //æé®åä¸ºå¯ç¼è¾ç¶æ
			}
			layer.closeAll("loading"); //å³éå è½½å±
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			playSound();
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false;
			}
			});

	WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html	133 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -451,13 +451,14 @@
			layer.load(3);
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false; //æé®åä¸ºå¯ç¼è¾ç¶æ
			}
			layer.closeAll("loading"); //å³éå è½½å±
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false;
			}
			});