MES-WEB-LayUI.git

			@@ -486,7 +486,7 @@
			, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			, { field: 'HCenterID_SName', title: 'äº§çº¿ä¸å¿', edit: 'text', event: "CheckHCenterID_S" }//f7
			, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			//, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			, { field: 'HWorkQty_S', title: 'äº§çº¿äº§è½', edit: 'text' }
			, { field: 'HSubStdEmpQty_S', title: 'äº§çº¿äººæ°', edit: 'text' }
			, { field: 'HMouldNo', title: 'æ¨¡å·ç¼å·', edit: 'text' }
			@@ -497,11 +497,11 @@
			, { field: 'HMyWorkDays', title: 'çäº§å¨æ', edit: 'text' }
			, { field: 'HMyFixWorkDays', title: 'åºå®çäº§å¤©æ°', edit: 'text' }
			, { field: 'å·¥åº', title: 'å·¥åº', edit: 'text', event: "CheckHProcID" }//f7
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			// , { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ' }//ä¸å¡«
			, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			// , { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿', edit: 'text', event: "CheckHCenterID" }//f7
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			// , { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå', edit: 'text', width: 110, event: "CheckHSupID" }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			@@ -509,7 +509,7 @@
			, { field: 'HUnitTime', title: 'è¿è¡æ¶é´', edit: 'text' }
			, { field: 'HWorkQty', title: 'å å·¥æ°é', edit: 'text' }//é»è®¤
			, { field: 'HPassRate', title: 'è¯ç', edit: 'text' }//é»è®¤
			, { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', edit: 'text' }
			// , { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', edit: 'text' }
			, { field: 'HReadyTime', title: 'åå¤æ¶é´', edit: 'text' }
			, { field: 'HQueueTime', title: 'æéæ¶é´', edit: 'text' }
			, { field: 'HMoveTime', title: 'è½¬ç§»æ¶é´', edit: 'text' }
			@@ -533,11 +533,11 @@
			, { field: 'HPicNum', title: 'å¾çº¸ç¼å·', edit: 'text' }
			, { field: 'HProcCheckNote', title: 'æ¬å·¥åºç¡®è®¤è®°å½', edit: 'text' }
			, { field: 'HProcWorkNum', title: 'ç¨åºå·', edit: 'text' }
			, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
			//, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
			, { field: 'HBadWHName', title: 'ä¸è¯åä»', edit: 'text', event: "HBadWHID" }//f7
			, { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
			// , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
			, { field: 'HWasterWHName', title: 'æ¥åºåä»', edit: 'text', event: "HWasterWHID" }//f7
			, { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
			// , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
			, { field: 'HWHName', title: 'è¯åä»', edit: 'text', event: "HWHID" }//f7
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			@@ -1409,7 +1409,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1422,7 +1422,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HBadWHID": checkStatus.data[0].HItemID
			, "HBadWHName": checkStatus.data[0].HName
			, "HBadWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1440,7 +1440,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1453,7 +1453,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWHID": checkStatus.data[0].HItemID
			, "HWHName": checkStatus.data[0].HName
			, "HWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1471,7 +1471,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1484,7 +1484,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWasterWHID": checkStatus.data[0].HItemID
			, "HWasterWHName": checkStatus.data[0].HName
			, "HWasterWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1682,39 +1682,41 @@
			//}
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			//æµæ°´å·
			if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
			num.push(option.data[i]["HProcNo"]);
			} else {
			layer.msg("ç¬¬" + (i + 1) + "è¡,æµæ°´å·:" + option.data[i]["HProcNo"] + "éå¤!");
			return false;
			}
			//æµæ°´å·ä¸ä¸ºç©º
			if (option.data[i]["HProcNo"] == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æµæ°´å·ä¸è½ä¸ºç©º!");
			return false;
			}
			//ä»åºéå¤
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {

			if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åæ¥åºåä»éå¤!");
			if (option.data[i] != "") {
			//æµæ°´å·
			if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
			num.push(option.data[i]["HProcNo"]);
			} else {
			layer.msg("ç¬¬" + (i + 1) + "è¡,æµæ°´å·:" + option.data[i]["HProcNo"] + "éå¤!");
			return false;
			}
			}
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åè¯åä»éå¤!");
			//æµæ°´å·ä¸ä¸ºç©º
			if (option.data[i]["HProcNo"] == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æµæ°´å·ä¸è½ä¸ºç©º!");
			return false;
			}
			}
			if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æ¥åºåä»åè¯åä»éå¤!");
			return false;
			}
			}
			//ä»åºéå¤
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {

			if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åæ¥åºåä»éå¤!");
			return false;
			}
			}
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åè¯åä»éå¤!");
			return false;
			}
			}
			if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æ¥åºåä»åè¯åä»éå¤!");
			return false;
			}
			}
			}
			}

			return true;