MES-WEB-LayUI.git

			@@ -138,7 +138,7 @@
			<div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MaterialUpperBill_PDA">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;">åæ®ä¿¡æ¯</li>
			<!--<li lay-id="2" style="padding:1px;">ä¸æ¶ä¿¡æ¯</li>-->
			<li lay-id="2" style="padding:1px;">ç©ææ¡ç ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åæ®ä¿¡æ¯-->
			@@ -481,6 +481,7 @@
			var data = [];
			listOption.cols = [[
			{ field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'ç©ææ¡ç ', title: 'ç©ææ¡ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			@@ -777,10 +778,76 @@
			});
			return;
			}
			else {
			GetMeesageByCarBarCode();
			}
			}
			});

			//æ«æ¡ç
			function GetMeesageByCarBarCode(obj) {
			//ä»åºãä»ä½ææ¬æ¡ä¸ºç©ºæ¶ï¼æ¸ç©ºå¯¹åºID
			var sHWHID = $("#HWHID").val()
			var sHSPID = $("#HStockPlaceID").val()
			var sHQty = $("#HQty").val()
			var sSourceBillType = "-1"
			var sCarBarCode = $("#HCarBarCode").val()
			//todo æ²¡æå*å é¤æ¡ç çåè½ï¼åç»è¥æéè¦åå®å
			if (sCarBarCode == '') {
			playSound();
			layer.msg("å°è½¦æ¡ç ä¸ºç©ºï¼è¯·æ«æå°è½¦æ¡ç ï¼", {
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HCarBarCode").select();
			$("#HCarBarCode").focus();
			});
			return;
			}
			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");

			}

			//#endregion

			@@ -1241,6 +1308,7 @@
			else {
			listOption.cols = [[
			{ field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'ç©ææ¡ç ', title: 'ç©ææ¡ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			@@ -1256,7 +1324,80 @@
			}

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

			function DisBillEntryList_CarMaterial() {
			$.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;
			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 }
			]];
			listOption.data = data;
			table.render(listOption);
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}

			//#endregion


			});