~jhz/KaiShanLAYUI-invalid.git

			@@ -106,68 +106,44 @@
			,height: 'full-50'
			, page: true
			, cols: [[
			{ field: 'éæ©', title: 'éæ©', width: 110 }
			//, { field: 'hmainid', title: 'hmainid', width: 110 }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 165 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 175 }
			, { field: 'æ£éªå', title: 'æ£éªå', width: 170 }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 165 }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 160 }
			//, { field: 'HProcExchInterID', title: 'HProcExchInterID', width: 220 }
			, { field: 'å®¢æ·æ¡ç ', title: 'å®¢æ·æ¡ç ', width: 95 }
			, { field: 'å®¢æ·æ¡ç NEW', title: 'å®¢æ·æ¡ç NEW', width: 80 }
			, { field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', width: 95 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 95 }
			//, { field: 'HProcID', title: 'HProcID', width: 80 }
			, { field: 'å½åå·¥åºä»£ç ', title: 'å½åå·¥åºä»£ç ', width: 120 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 182 }
			//, { field: 'HMaterID', title: 'HMaterID', width: 80 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 182 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 80 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 182 }
			//, { field: 'HunitID', title: 'HunitID', width: 105 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 105 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 105 }
			, { field: 'æ¨¡ç©´å·', title: 'æ¨¡ç©´å·', width: 105 }
			, { field: 'ç©æè¾å©1', title: 'ç©æè¾å©1', width: 105 }
			, { field: 'ç©æè¾å©2', title: 'ç©æè¾å©2', width: 105 }
			, { field: 'åºç«æ¶é´', title: 'åºç«æ¶é´', width: 105 }
			//, { field: 'HEmpID', title: 'HEmpID', width: 105 }
			, { field: 'æä½åä»£ç ', title: 'æä½åä»£ç ', width: 105 }
			, { field: 'æä½å', title: 'æä½å', width: 105 }
			//, { field: 'HSourceID', title: 'HSourceID', width: 105 }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', width: 105 }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', width: 105 }
			//, { field: 'HGroupID', title: 'HGroupID', width: 105 }
			, { field: 'çäº§çç»ä»£ç ', title: 'çäº§çç»ä»£ç ', width: 105 }
			, { field: 'çäº§çç»', title: 'çäº§çç»', width: 105 }
			, { field: 'ä»»å¡æ°é', title: 'ä»»å¡æ°é', width: 105 }
			, { field: 'æ°é', title: 'æ°é', width: 105 }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 105 }
			, { field: 'å·¥æ¶', title: 'å·¥æ¶', width: 105 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 105 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 105 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 105 }
			//, { field: 'HSubID', title: 'HSubID', width: 105 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 105 }
			//, { field: 'HBillType', title: 'HBillType', width: 105 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 105 }
			{ field: 'åºç«æ¶é´', title: 'åºç«æ¶é´', width: 120 }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 80 }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 165 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 100 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 100 }
			, { field: 'LOTæ°é', title: 'è®¢åæ°é', width: 100 }
			, { field: 'æ¥æ¶æ°é', title: 'æ¥æ¶æ°é', width: 100 }
			, { field: 'çäº§çç»', title: 'çäº§çç»', width: 100 }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', width: 100 }
			, { field: 'æä½å', title: 'æä½å', width: 100 }
			//,{ field: 'HEmpID', title: 'HEmpID', width: 110 }
			//, { field: 'HGroupID', title: 'HGroupID', sort: true, width: 165 }
			//, { field: 'HMaterID', title: 'HMaterID', width: 175 }
			//, { field: 'HProcID', title: 'HProcID', width: 170 }
			//, { field: 'HSourceID', title: 'HSourceID', width: 165 }
			//, { field: 'hmainid', title: 'hmainid', width: 95 }
			//, { field: 'å½åå·¥åºä»£ç ', title: 'å½åå·¥åºä»£ç ', width: 80 }
			//, { field: 'æ¥æ¶æ°é', title: 'æ¥æ¶æ°é', width: 182 }
			//, { field: 'æä½åä»£ç ', title: 'æä½åä»£ç ', width: 105 }
			//, { field: 'çäº§çç»ä»£ç ', title: 'çäº§çç»ä»£ç ', width: 105 }
			//, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', width: 105 }
			]]
			};

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
			url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			console.log(data1)
			if (data1.count == 1) {
			option.data = data1.data;
			if (data1.code == 1) {
			option.data = data1.data.h_v_MES_StationOutBillList;
			table.render(option);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.alert(data1.code + data1.msg, { icon: 5 });
			}
			}, error: function () {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥!", {
			@@ -201,19 +177,19 @@
			}
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
			url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			if (data1.code == 1) {
			option.data = data1.data.h_v_MES_StationOutBillList;
			table.render(option);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.alert(data1.code + data1.msg, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å