MES-WEB-LayUI.git

			@@ -466,20 +466,100 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index];
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}
			obj.update({
			HProcName: checkStatus.data[0].å·¥åº
			, HProcID: checkStatus.data[0].HItemID
			, HProcNumber: checkStatus.data[0].å·¥åºä»£ç

			//è·åå·¥åºä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			ProcessNumber.push("'" + checkStatus.data[i]["å·¥åºä»£ç "] + "'");
			}

			//è·åå½åä½ç½®æå¨è¡æ°
			var NowNum = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
			NowNum = i + 1;
			}
			}

			//æ¥è¯¢å·¥ä½ä¸å¿çæ°æ®
			var WorkCente = [];
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°,p.HNumber å·¥åºä»£ç from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "sWhere": sWhere },
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			WorkCente = data.data;
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			}
			});


			//å¤æéæ©çæ°æ®æ»æ° æ¯å¦å¤§äºè¡¨æ ¼ç°æçæ°æ®
			if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
			//è·åè¡¨æ ¼å©ä½è¡æ°é
			var num = ProcessNumber.length - option.data.length + (NowNum - 1);
			//å¾ªç¯èµå¼ å¨å·²æçè¡¨æ ¼èµå¼
			var j = 0;
			for (var i = (NowNum - 1); i < option.data.length; i++) {
			option.data[i]["HProcName"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["HProcNumber"] = WorkCente[j]["å·¥åºä»£ç "];
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["HCenterName"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			option.data[i]["HCenterNumber"] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			j++;
			}

			//å¨ä¸æ¹æ·»å æ°çè¡¨æ ¼æ°æ®
			for (var i = 0; i < num; i++) {
			option.data.push({
			"HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length + 1 + i, "HProcID": WorkCente[j]["HProcID"], "HProcNumber": WorkCente[j]["å·¥åºä»£ç "], "HProcName": WorkCente[j]["å·¥åºåç§°"], "HWorkRemark": "",
			"HCenterID": WorkCente[j]["HCenterID"], "HCenterNumber": WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "], "HCenterName": WorkCente[j]["å·¥ä½ä¸å¿åç§°"],
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": $("#HQty").val(), "HRemark": ""
			})
			j++;
			}
			} else {
			//å¾ªç¯èµå¼ å¨å·²æçè¡¨æ ¼èµå¼
			var j = 0;
			for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
			option.data[i]["HProcName"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["HProcNumber"] = WorkCente[j]["å·¥åºä»£ç "];
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["HCenterName"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			option.data[i]["HCenterNumber"] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			j++;
			}
			}

			table.render(option);
			//obj.update({
			// HProcName: checkStatus.data[0].å·¥åº
			// , HProcID: checkStatus.data[0].HItemID
			// , HProcNumber: checkStatus.data[0].å·¥åºä»£ç
			//});

			layer.close(layer.index);
			}
			@@ -494,7 +574,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å å·¥ä¸å¿åè¡¨',
			title: 'å·¥ä¸å¿åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			@@ -864,12 +944,13 @@
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¾åºåä¸è½ä¸ºç©º!");
			return false;
			}
			} else {
			if (option.data[i]["HCenterID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			return false;
			}
			}
			//else {
			// if (option.data[i]["HCenterID"] == "0") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			// return false;
			// }
			//}

			if (parseInt(option.data[i].HQty) > parseInt($("#HQty").val())) {
			var indexRow = i + 1;