MES-WEB-LayUI.git

			@@ -56,29 +56,33 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä»»å¡åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä»»å¡åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			</div>
			</div>
			@@ -95,6 +99,10 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>å·¥åºåºç«æ±æ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>æç»åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -128,11 +136,14 @@
			var sWhere = "";
			var option = "";
			var option2 = "";
			var HBillNo = "";
			var wybj = false;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//
			var HModName = "Sc_ProcessExchangeBillList";
			//åå§åçé¢
			set_ClearBill();

			@@ -162,6 +173,19 @@
			//æå°
			case 'btn_print': get_print();
			break;
			//å·¥åºåºç«æ±æ¥å
			case 'set_StationOut': set_StationOut();
			break;
			//å·¥åºè¿ç«æ¥æ¶å
			case 'get_StationIn': get_StationIn();
			break;
			//åè®¾ç½®
			case 'get_HideColumn1': get_HideColumn1();
			break;
			//æç»åè®¾ç½®
			case 'get_HideColumn2': get_HideColumn2();
			break;

			};
			});

			@@ -189,7 +213,7 @@
			//åå§åä»è¡¨åè¡¨
			set_InitGrid2();
			//æ¥è¯¢
			get_Display(sWhere);
			get_FastQuery();
			}


			@@ -198,13 +222,14 @@
			$("#SHPrintQty").val("");//æå°ç¶æ
			$("input[type='checkbox'][name='wybj']").prop('checked', false);
			form.render("checkbox");//å§å¤æ è®°
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
			$("#SHname").val("");//ç©æ\|åä»¶åç§°\|åä»¶è§æ ¼
			$("#HBillNo").val("");//åæ®å·
			//$("#btnSearch").click();
			sWhere = "";
			get_Display(sWhere);
			get_FastQuery();
			}
			//#endregion

			@@ -216,6 +241,7 @@
			var HOrderProcNO = $("#HOrderProcNO").val();//è®¢åè·è¸ªå·
			var HWorkBillNo = $("#HWorkBillNo").val();
			var SHname = $("#SHname").val();//ç©æ\|åä»¶åç§°\|åä»¶è§æ ¼
			var HBillNo = $("#HBillNo").val();//åæ®å·
			if (SHPrintQty) {//å¤ææå°ç¶æ
			if (SHPrintQty == "å¨é¨") {
			sWhere = " and æå°æ¬¡æ° >= 0 ";
			@@ -245,6 +271,9 @@
			if (SHname) {
			sWhere += " and åä»¶åç§° like '%" + SHname + "%' or åä»¶è§æ ¼ like '%" + SHname + "%'"
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'"
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -260,6 +289,7 @@
			//ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
			table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			HBillNo = datas["åæ®å·"].toString();
			var HMainID = datas.hmainid;
			var wait = layer.load();
			$.ajax({
			@@ -279,7 +309,8 @@
			layer.close(wait);
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			});
			DisPlay_HideColumn_Sec();
			});

			//#endregion
			@@ -301,12 +332,7 @@
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°' }
			, { field: 'ç±»å', title: 'ç±»å' }
			, {
			field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true, templet: function (d) {
			if (d.æ¥æ == null) {
			return "";
			}
			return util.toDateString(d.æ¥æ, "yyyy-MM-dd");
			}
			field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"
			}
			, { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·', width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
			@@ -370,13 +396,13 @@
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: [[

			{ field: 'hsubid', title: 'hsubid', hide: true}
			,{ field: 'æµæ°´å·', title: 'æµæ°´å·' }
			, { field: 'HProcID', title: 'HProcID', hide: true}
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·' }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width:100 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			, { field: 'è¿ç«å³èæ°é', title: 'è¿ç«å³èæ°é', width: 120 }
			, { field: 'åºç«å³èæ°é', title: 'åºç«å³èæ°é', width: 120 }
			, { field: 'åºç«æ¥åºå³èæ°é', title: 'åºç«æ¥åºå³èæ°é', width: 150 }
			@@ -433,8 +459,7 @@
			function get_Display(sWhere) {
			sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			@@ -452,7 +477,231 @@
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			});
			DisPlay_HideColumn();
			}


			//éèåè®¾ç½®
			function get_HideColumn1() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//éèåè®¾ç½®
			function get_HideColumn2() {
			var colName = "";
			for (var i = 1; i < option2.cols[0].length - 1; i++) {
			colName += option2.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "_Sec" + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn_Sec();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}


			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}


			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn_Sec() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName+"_Sec", "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option2.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option2.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option2.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option2.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option2.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
			option2.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option2.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option2.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option2.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option2.cols[0].length - 1; i++) {
			if (option2.cols[0][i]["fixed"] != null) {
			option2.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option2.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option2);
			} else {
			table.render(option2);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			@@ -568,6 +817,56 @@
			}
			}

			//å·¥åºåºç«æ±æ¥å
			function set_StationOut() {
			var checkStatus = table.checkStatus('mainTable2')
			, data = checkStatus.data;
			if (data.length === 1) {
			var HProcNo = data[0].æµæ°´å·.toString();

			if (HProcNo == "9999") {
			return layer.msg("æµæ°´å·ä¸è½ä¸ºè½¬å·¥åºæµæ°´å·,è¯·éæ°éæ©!");
			}
			else {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥åºæµè½¬å¡-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è½¦é´ç®¡ç/å·¥åºåºç«æ±æ¥å/Cj_StationOutBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
			})
			}

			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨ï¼');
			}
			}

			//å·¥åºè¿ç«æ¥æ¶å
			function get_StationIn() {
			var checkStatus = table.checkStatus('mainTable2')
			, data = checkStatus.data;
			if (data.length === 1) {
			var HProcNo = data[0].æµæ°´å·.toString();

			if (HProcNo == "9999") {
			return layer.msg("æµæ°´å·ä¸è½ä¸ºè½¬å·¥åºæµæ°´å·,è¯·éæ°éæ©!");
			}
			else {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥åºæµè½¬å¡-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è½¦é´ç®¡ç/å·¥åºè¿ç«æ¥æ¶å/Cj_StationInBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
			})
			}

			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨ï¼');
			}
			}

			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();