MES-WEB-LayUI.git

			@@ -415,51 +415,53 @@
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			com = " and ([" + ColName + "] " + com + ")";
			}
			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";

			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			com1 = "like ''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			com1 = "like ''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			com1 = "like ''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			com1 = "not like ''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			break;
			}
			// sWhere += " and " + ColName1 + " " + com1;
			com1 = " and (" + ColName1 + " " + com1 + ")";
			com1 = " and ([" + ColName1 + "] " + com1 + ")";
			}

			if (ColName12 != 0 && Comparator2 != 0) {
			var com2 = "";
			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {

			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			com2 = "like ''%" + ColContent2 + "%''";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			com2 = "like ''%" + ColContent2 + "''";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			com2 = "like ''" + ColContent2 + "%''";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			com2 = "not like ''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			com2 = "" + Comparator2 + " ''" + ColContent2 + "''";
			break;
			}
			com2 = " and (" + ColName2 + " " + com2 + ")";
			com2 = " and ([" + ColName2 + "] " + com2 + ")";
			// swhere += " and " + colname2 + " " + com2;
			}

			@@ -607,6 +609,7 @@
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/MaterOutSumReport/MaterOutSumReport_Cloth',
			async:false,
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			@@ -617,6 +620,40 @@
			data1.data[i].æ¥æ = data1.data[i]["æ¥æ"].split("T")[0];
			}
			}

			var totalArray = ["çäº§æ°é", "ç½å¯åå¸"];

			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			}
			else if (data[i].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}


			option.cols = [col];
			option.data = data1.data;

			option.data = data1.data;
			//var num = 0;
			@@ -668,12 +705,16 @@
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();


			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();


			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			switch (Comparator) {
			case "7":
			@@ -692,10 +733,57 @@
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			com = " and ([" + ColName + "] " + com + ")";
			}
			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {

			switch (Comparator1) {
			case "7":
			com1 = "like ''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like ''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like ''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like ''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			break;
			}
			// sWhere += " and " + ColName1 + " " + com1;
			com1 = " and ([" + ColName1 + "] " + com1 + ")";
			}

			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {

			switch (Comparator2) {
			case "7":
			com2 = "like ''%" + ColContent2 + "%''";
			break;
			case "8":
			com2 = "like ''%" + ColContent2 + "''";
			break;
			case "9":
			com2 = "like ''" + ColContent2 + "%''";
			break;
			case "10":
			com2 = "not like ''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator2 + " ''" + ColContent2 + "''";
			break;
			}
			com2 = " and ([" + ColName2 + "] " + com2 + ")";
			// swhere += " and " + colname2 + " " + com2;
			}
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var OtherSearch = getSWhereByHUser();
			var OtherSearch = com + com1 + com2 + getSWhereByHUser();

			sWhere = {
			HBeginDate: HBeginDate
			@@ -770,6 +858,7 @@
			ColFilter();
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async:false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {