MES-WEB-LayUI.git

			@@ -195,7 +195,7 @@
			var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿åæ°æ®ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var HInterID_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			var HBillNo_Temp = params[params[2]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·

			window.HSPObj = [];
			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -261,13 +261,15 @@

			var data = [];
			listOption.cols = [[
			{ field: 'HCarBarCode', title: 'å°è½¦ç¼å·', width: 118 }
			{ type: 'checkbox', fixed: 'left', width: 20 }
			, { field: 'HCarBarCode', title: 'å°è½¦ç¼å·', width: 118 }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 110 }
			, { field: 'HEquipBarCode', title: 'æºå°', width: 110 }
			, { field: 'HWhID', title: 'HWhID', hide: true }
			, { field: 'è°å¥ä»åº', title: 'è°å¥ä»åº', width: 110 }
			, { field: 'HSPID', title: 'HSPID', hide: true }
			, { field: 'è°å¥ä»ä½', title: 'è°å¥ä»ä½', width: 110 }
			, { field: 'HEquipID', title: 'HEquipID', width: 110, hide: true }
			, { field: 'HEquipBarCode', title: 'æºå°', width: 110 }
			]];
			listOption.data = data;
			table.render(listOption);
			@@ -279,8 +281,8 @@
			pFocus.select();
			pFocus.focus(); //è·ååæ
			} else {
			//åæ é»è®¤å¨ä»ä½ä½ç½®ä¸
			var pFocus = $("#HStockPlaceName");
			//åæ é»è®¤å¨æ¡ç ä½ç½®ä¸
			var pFocus = $("#HCarBarCode");
			pFocus.select();
			pFocus.focus(); //è·ååæ
			}
			@@ -308,10 +310,21 @@
			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(wl-table)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			$(".layui-table-body tr ").attr({ "style": "background:" }); //å¶ä»træ¢å¤åæ ·
			obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //éä¸è¡æ ·å¼
			obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //éä¸radioæ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.wl-table, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			@@ -333,8 +346,8 @@
			pFocus.select();
			pFocus.focus(); //è·ååæ
			} else {
			//åæ é»è®¤å¨ä»ä½ä½ç½®ä¸
			var pFocus = $("#HStockPlaceName");
			//åæ é»è®¤å¨æ¡ç ä½ç½®ä¸
			var pFocus = $("#HCarBarCode");
			pFocus.select();
			pFocus.focus(); //è·ååæ
			}
			@@ -494,9 +507,35 @@
			$("#HStockPlaceID").val(result.data[0].HItemID);
			$("#HWHName").val(result.data[0].HWhName);
			$("#HWHID").val(result.data[0].HWHID);
			//åæ æ¾ç¤ºå°æ¡ç ä¸
			$("#HCarBarCode").select();
			$("#HCarBarCode").focus();
			//åæ æ¾ç¤ºå°ä»ä½ä¸
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();

			//å¦ææç»è¡åªæä¸è¡æ°æ®ï¼åèªå¨å¸¦å¥æ«ç åºä½ãæºå°ãè¥æå¤è¡åéå¾éå¤éæ¡æè½å¸¦å¥åºä½ãæºå°ä¿¡æ¯
			if (listOption.data.length == 1) {
			listOption.data[0].HWhID = result.data[0].HWHID;
			listOption.data[0].è°å¥ä»åº = result.data[0].HWhName;
			listOption.data[0].HSPID = result.data[0].HItemID;
			listOption.data[0].è°å¥ä»ä½ = result.data[0].HName;
			listOption.data[0].ä»ä½ä»£ç = result.data[0].HNumber;
			} else {
			var checkStatus = table.checkStatus('wl-table')
			var checkdata = checkStatus.data;
			for (var i = 0; i < checkdata.length; i++) {
			for (var j = 0; j < listOption.data.length; j++) {
			if (checkdata[i].HCarBarCode == listOption.data[j].HCarBarCode) {
			listOption.data[j].HWhID = result.data[0].HWHID;
			listOption.data[j].è°å¥ä»åº = result.data[0].HWhName;
			listOption.data[j].HSPID = result.data[0].HItemID;
			listOption.data[j].è°å¥ä»ä½ = result.data[0].HName;
			listOption.data[j].ä»ä½ä»£ç = result.data[0].HNumber;
			}
			}
			}
			}

			//å·æ°è¡¨æ ¼
			table.render(listOption);
			}
			else {
			playSound();
			@@ -536,6 +575,33 @@
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			, end: function () {
			//å¦ææç»è¡åªæä¸è¡æ°æ®ï¼åèªå¨å¸¦å¥æ«ç åºä½ãæºå°ãè¥æå¤è¡åéå¾éå¤éæ¡æè½å¸¦å¥åºä½ãæºå°ä¿¡æ¯
			if (listOption.data.length == 1) {
			listOption.data[0].HWhID = HSPObj[0].HWHID;
			listOption.data[0].è°å¥ä»åº = HSPObj[0].HWhName;
			listOption.data[0].HSPID = HSPObj[0].HItemID;
			listOption.data[0].è°å¥ä»ä½ = HSPObj[0].HName;
			listOption.data[0].ä»ä½ä»£ç = HSPObj[0].HNumber;
			} else {
			var checkStatus = table.checkStatus('wl-table')
			var checkdata = checkStatus.data;
			for (var i = 0; i < checkdata.length; i++) {
			for (var j = 0; j < listOption.data.length; j++) {
			if (checkdata[i].HCarBarCode == listOption.data[j].HCarBarCode) {
			listOption.data[j].HWhID = HSPObj[0].HWHID;
			listOption.data[j].è°å¥ä»åº = HSPObj[0].HWhName;
			listOption.data[j].HSPID = HSPObj[0].HItemID;
			listOption.data[j].è°å¥ä»ä½ = HSPObj[0].HName;
			listOption.data[j].ä»ä½ä»£ç = HSPObj[0].HNumber;
			}
			}
			}
			}

			//å·æ°è¡¨æ ¼
			table.render(listOption);
			}
			})
			});

			@@ -544,10 +610,64 @@
			//#region æºå°ï¼è®¾å¤ï¼
			//æ«æè®¾å¤æ¡ç
			$('#HEquipBarCode').on('keydown', function (event) {
			if (event.keyCode == 13) {
			//åæ æ¾ç¤ºå°æ¡ç ä¸
			$("#HCarBarCode").select();
			$("#HCarBarCode").focus();
			if (event.keyCode == 13) {
			//å¤ææ«ææºå°æ¯å¦åå¨
			var HEquipBarCode = $("#HEquipBarCode").val();

			$.ajax({
			url: GetWEBURL() + "/WEBSController/IsExistEquip",
			type: "GET",
			data: { "HEquipBarCode": HEquipBarCode },
			success: function (result) {
			if (result.code == 1) {
			//å¤ææºå°ï¼è®¾å¤ï¼ç æ¯å¦å¯ä¸
			if (result.data.length > 1) {
			layer.msg("æºå°æ¡ç ï¼" + HEquipBarCode + "ï¼ä¸å¯ä¸ï¼è¯·ç¡®è®¤ãåå¨" + result.data.length + "æ¡è®°å½");
			}

			//å¦ææç»è¡åªæä¸è¡æ°æ®ï¼åèªå¨å¸¦å¥æ«ç åºä½ãæºå°ãè¥æå¤è¡åéå¾éå¤éæ¡æè½å¸¦å¥åºä½ãæºå°ä¿¡æ¯
			if (listOption.data.length == 1) {
			if (listOption.data[0].HWhID != 0 \|\| listOption.data[0].HSPID != 0) {
			layer.msg("å°è½¦" + listOption.data[0].HCarBarCode + "ï¼å·²ç»å®åºä½" + listOption.data[0].è°å¥ä»ä½);
			return;
			}

			listOption.data[0].HEquipID = result.data[0].HEquipID;
			listOption.data[0].HEquipBarCode = result.data[0].æºå°æ¡ç ;
			}
			else {
			var checkStatus = table.checkStatus('wl-table')
			var checkdata = checkStatus.data;
			for (var i = 0; i < checkdata.length; i++) {
			if (checkdata[i].HWhID != 0 \|\| checkdata[i].HSPID != 0) {
			layer.msg("å°è½¦" + checkdata[i].HCarBarCode + "ï¼å·²ç»å®åºä½" + checkdata[i].è°å¥ä»ä½);
			return;
			}
			}

			for (var i = 0; i < checkdata.length; i++) {
			for (var j = 0; j < listOption.data.length; j++) {
			if (checkdata[i].HCarBarCode == listOption.data[j].HCarBarCode) {
			listOption.data[j].HEquipID = result.data[0].HEquipID;
			listOption.data[j].HEquipBarCode = result.data[0].æºå°æ¡ç ;
			}
			}
			}
			}

			//å·æ°è¡¨æ ¼
			table.render(listOption);
			//åæ è·³è½¬å°æºå°ä½ç½®
			$("#HEquipBarCode").focus();
			} else {
			layer.msg(result.Message);
			//åæ è·³è½¬å°æºå°ä½ç½®
			$("#HEquipBarCode").focus();
			}
			}
			});

			$("#HEquipBarCode").val("");
			}
			});

			@@ -576,7 +696,7 @@
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/WEBSController/set_SaveTrolleyPositionBill_Json2",
			url: GetWEBURL() + "/WEBSController/set_SaveTrolleyPositionBill_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "msg": sMainSub },
			dataType: "json",
			@@ -731,25 +851,6 @@

			//æ«æ¡ç
			function GetMeesageByBarCode(obj) {
			if (($("#HWHID").val() == 0 \|\| $("#HStockPlaceID").val() == 0) && $("#HEquipBarCode").val() == "" ) {
			layer.msg("è¯·ç»´æ¤åºä½ä¿¡æ¯æèæºå°ä¿¡æ¯åå¨æ«å°è½¦æ¡ç ï¼", {
			icon: 0, time: 1500, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();
			$('#HCarBarCode').val('');
			});
			return;
			}

			//ä»åºãä»ä½ææ¬æ¡ä¸ºç©ºæ¶ï¼æ¸ç©ºå¯¹åºID
			if ($("#HWHName").val() == '') {
			$("#HWHID").val("0");
			}
			if ($("#HStockPlaceName").val() == '') {
			$("#HStockPlaceID").val("0");
			}

			var sBarCode = $('#HCarBarCode').val()
			if (sBarCode == '') {
			playSound();
			@@ -760,13 +861,59 @@
			$("#HCarBarCode").focus();
			});
			return;
			}

			for (var i = 0; i < listOption.data.length; i++) {
			if (listOption.data[i].HCarBarCode == sBarCode) {
			layer.msg("å°è½¦æ¡ç ï¼" + sBarCode + "ï¼å·²åå¨äºåè¡¨ç¬¬" + (i+1) + "è¡ï¼è¯·å¿éå¤æ«æï¼");
			return;
			}
			}


			layer.load(3)

			listOption.data.push({ "HCarBarCode": sBarCode, "HWhID": $("#HWHID").val(), "è°å¥ä»åº": $("#HWHName").val(), "HSPID": $("#HStockPlaceID").val(), "è°å¥ä»ä½": $("#HStockPlaceName").val(),"HEquipID": 0, "HEquipBarCode": $("#HEquipBarCode").val() });
			table.render(listOption);
			//å¤æå°è½¦ç¶æ
			$.ajax({
			url: GetWEBURL() + "/WEBSController/CarIsused",
			type: "GET",
			data: { "HCarBarCode": sBarCode },
			success: function (result) {
			if (result.code == 1) {
			//å¤æå°è½¦ç æ¯å¦å¯ä¸
			if (result.data.length > 1) {
			layer.msg("å°è½¦æ¡ç ï¼" + sBarCode + "ï¼ä¸å¯ä¸ï¼è¯·ç¡®è®¤ãåå¨" + result.data.length + "æ¡è®°å½");
			}
			//å¤æå°è½¦æ¯å¦ç»å®åºä½
			if (result.data[0].ä»ä½ä»£ç != "" && result.data[0].ä»ä½ä»£ç != null && result.data[0].ä»ä½ä»£ç != undefined) {
			layer.confirm('å°è½¦' + result.data[0].å°è½¦ç¼å· + 'å·²ç»å®åºä½' + result.data[0].ä»ä½ä»£ç + ',æ¯å¦ç»§ç»æä½', {
			btn: ['æ¯', 'å¦'] //æé®
			}, function (index) {
			//æé®1
			layer.close(index);
			listOption.data.push({ "HCarBarCode": sBarCode, "HWhID": 0, "è°å¥ä»åº": "", "HSPID": 0, "ä»ä½ä»£ç ": "", "è°å¥ä»ä½": "", "HEquipID": 0, "HEquipBarCode": "" });
			//å·æ°è¡¨æ ¼
			table.render(listOption);
			//åæ è·³è½¬å°ä»ä½ä½ç½®
			$("#HStockPlaceName").focus();
			}, function (index) {
			//æé®2
			//åæ è·³è½¬å°æ¡ç ä½ç½®
			$("#HCarBarCode").focus();
			});
			} else {
			listOption.data.push({ "HCarBarCode": sBarCode, "HWhID": 0, "è°å¥ä»åº": "", "HSPID": 0,"ä»ä½ä»£ç ": "" ,"è°å¥ä»ä½": "", "HEquipID": 0, "HEquipBarCode": "" });
			//å·æ°è¡¨æ ¼
			table.render(listOption);
			//åæ è·³è½¬å°ä»ä½ä½ç½®
			$("#HStockPlaceName").focus();
			}
			} else {
			layer.msg(result.Message);
			//åæ è·³è½¬å°æ¡ç ä½ç½®
			$("#HCarBarCode").focus();
			}
			}
			});

			if (sBarCode != "") {
			$('#HCarBarCode').val("");
			@@ -884,6 +1031,8 @@
			$("#HStockPlaceID").val(obj[0].HItemID);
			$("#HWHName").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);

			HSPObj = obj;
			}
			}