MES-WEB-LayUI.git

			@@ -299,19 +299,20 @@
			// å¯ç¨å°è½¦ä¿¡æ¯1å2
			$('#HCarBarCode').removeAttr('disabled');
			$('#HCarBarCode_2').removeAttr('disabled');

			$('#HBarCode').removeAttr('disabled');
			// ç¦ç¨å¶ä»åæ®µ
			$('#HWHName').attr('disabled', 'disabled');
			$('#HStockPlaceName').attr('disabled', 'disabled');
			$('#HWHName_2').attr('disabled', 'disabled');
			$('#HStockPlaceName_2').attr('disabled', 'disabled');
			$('#HBarCode').attr('disabled', 'disabled');
			//$('#HBarCode').attr('disabled', 'disabled');
			$('#HWHID-BT').addClass('layui-btn-disabled').attr('disabled', true);
			$('#HSpID-BT').addClass('layui-btn-disabled').attr('disabled', true);
			$('#HWHID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);
			$('#HSpID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);

			layer.msg("å·²å¯ç¨å°è½¦è½¬ç§»æ¨¡å¼ï¼å°è½¦ä¿¡æ¯1å2å¯ä»¥è¾å¥/æ«æ", { icon: 1 });
			clearTableData();
			break;

			case 'warehouse': // ä»åºè½¬ç§»
			@@ -325,12 +326,14 @@
			$('#HSpID-BT').removeClass('layui-btn-disabled').attr('disabled', false);
			$('#HWHID-BT_2').removeClass('layui-btn-disabled').attr('disabled', false);
			$('#HSpID-BT_2').removeClass('layui-btn-disabled').attr('disabled', false);
			$('#HCarBarCode').removeAttr('disabled');

			// ç¦ç¨å°è½¦ä¿¡æ¯
			$('#HCarBarCode').attr('disabled', 'disabled');
			// $('#HCarBarCode').attr('disabled', 'disabled');
			$('#HCarBarCode_2').attr('disabled', 'disabled');

			layer.msg("å·²å¯ç¨ä»åºè½¬ç§»æ¨¡å¼ï¼ä»åºä»ä½1ã2åç©ææ¡ç å¯ä»¥è¾å¥/æ«æ", { icon: 1 });
			clearTableData();
			break;

			case 'car_warehouse': // å°è½¦-ä»åºè½¬ç§»
			@@ -350,6 +353,7 @@
			$('#HSpID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);

			layer.msg("å·²å¯ç¨å°è½¦-ä»åºè½¬ç§»æ¨¡å¼ï¼å°è½¦ä¿¡æ¯1ãä»åºä»ä½1åç©ææ¡ç å¯ä»¥è¾å¥/æ«æ", { icon: 1 });
			clearTableData();
			break;
			}

			@@ -387,6 +391,16 @@
			//ç¨æ·æ¨¡åæéå¤æ
			CheckModRight();


			function clearTableData() {
			// æ¸ç©ºè¡¨æ ¼æ°æ®
			listOption.data = [];
			currentTableData = [];
			table.reload('wl-table', {
			data: []
			});
			// table.render(listOption);
			}
			function CheckModRight() {
			layer.load(3);
			$.ajax({
			@@ -484,9 +498,11 @@
			, { field: 'ç©ææ¡ç ', title: 'ç©ææ¡ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'æ¡ç ä¸ªæ°', title: 'æ¡ç ä¸ªæ°', width: 100 }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 100 }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 100 }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 100 }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100 }
			, { field: 'å°è½¦æ¡ç ', title: 'å°è½¦æ¡ç ', width: 100 }
			]];
			listOption.data = data;
			table.render(listOption);
			@@ -560,7 +576,7 @@
			//$("#HBarCode").select();
			//$("#HBarCode").focus();
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			DisBillEntryList_CarMaterial();
			HSourceFlag = true;
			element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
			}
			@@ -802,49 +818,11 @@
			$("#HCarBarCode").focus();
			});
			return;
			}
			}
			element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList_CarMaterial();
			layer.load(3)
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_WorkShop_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillType": sSourceBillType, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) {
			playSound_OK();
			if (sBarCode.startsWith("GXLX")) {
			$("#HMainSourceBillNo").val(sBarCode);
			$("#HSourceBillNo").val(sBarCode);
			}

			if (HSourceFlag != true) {
			HSourceFlag = true;
			}
			element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			}
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			});
			layer.closeAll("loading");

			}
			@@ -1065,6 +1043,7 @@
			if (result.count == 1) {
			playSound_OK();
			layer.alert("åºåè½¬ç§»æå");
			clearTableData();
			}
			else {
			playSound();
			@@ -1167,13 +1146,14 @@
			$("#HBarCode").focus(); //è·ååæ
			});

			//æ«æå°è½¦æ¡ç
			$('#HCarBarCode').on('keydown', function (event) {
			if (event.keyCode == 13) {
			//$("#HBarCode").select();
			//$("#HBarCode").focus(); //è·ååæ
			}
			});
			////æ«æå°è½¦æ¡ç
			//$('#HCarBarCode').on('keydown', function (event) {
			// if (event.keyCode == 13) {
			// GetMeesageByCarBarCode();
			// //$("#HBarCode").select();
			// //$("#HBarCode").focus(); //è·ååæ
			// }
			//});

			//ç»å®
			function BindBetweenCarHw(obj) {
			@@ -1249,89 +1229,17 @@
			$("#HBarCode").val("");

			}
			//#region æ¾ç¤ºç©æåè¡¨ä¿¡æ¯

			function DisBillList() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			var data = [];
			var col = [];
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in result.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(result.list[key].ColmCols)) {
			titleData[key] = result.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'radio', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:

			if (data[i].name == 'æ°é' \|\| data[i].name == 'æºåæ°é' \|\| data[i].name == 'æ¡ç ä¸ªæ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
			} else if (data[i].name == 'ç©æä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
			} else if (data[i].name == 'ç©æåç§°' \|\| data[i].name == 'è§æ ¼åå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
			}
			}
			}
			}
			columns = col;
			listOption.cols = [columns];
			listOption.data = result.data.Materlist;
			listOption.totalRow = true;
			table.cache['wl-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.render(listOption);
			}
			else {
			listOption.cols = [[
			{ field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'ç©ææ¡ç ', title: 'ç©ææ¡ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'æ¡ç ä¸ªæ°', title: 'æ¡ç ä¸ªæ°', width: 100 }
			]];
			listOption.data = data;
			table.render(listOption);
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}

			//#endregion
			//#region æ¾ç¤ºç©æåè¡¨ä¿¡æ¯

			function DisBillEntryList_CarMaterial() {
			var HCarBarCode = $("#HCarBarCode").val();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			url: GetWEBURL() + '/WEBSController/GetMaterIDByCarBarCode',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			data: { "CarBarCode": HCarBarCode},
			success: function (result) {
			var data = [];
			var col = [];
			@@ -1383,11 +1291,14 @@
			else {
			listOption.cols = [[
			{ field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'ç©ææ¡ç ', title: 'ç©ææ¡ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'æ¡ç ä¸ªæ°', title: 'æ¡ç ä¸ªæ°', width: 100 }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 100 }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 100 }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 100 }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100 }
			, { field: 'å°è½¦æ¡ç ', title: 'å°è½¦æ¡ç ', width: 100 }
			]];
			listOption.data = data;
			table.render(listOption);

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html	179 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2,12 +2,12 @@
			function GetWEBURL() {
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/"; //ééå²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8080/API/"; //çä»ªæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)