MES-WEB-LayUI.git

			@@ -432,7 +432,7 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 185px;">
			<input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº">
			<input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº" disabled="disabled">
			<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
			</div>
			</div>
			@@ -589,7 +589,7 @@
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			,"HSubStdEmpAvg_S": 0
			, "HSubStdEmpAvg_S": 0, "æ åå·¥ä»·": 0,"HYDCoefficient": 0
			}];
			var HModName = "Gy_RoutingBill";
			//#endregion
			@@ -617,8 +617,10 @@
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }//f7
			, { field: 'HTechnologyParameter', title: 'å·¥èºåæ°', edit: 'text' }
			, { field: 'HProcPrice', title: 'å·¥ä»·', edit: 'text' }
			, { field: 'æ åå·¥ä»·', title: 'æ åå·¥ä»·' }
			, { field: 'HYDCoefficient', title: 'çº¦å½ç³»æ°', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', edit: 'text', width: 110, event: "CheckHSupID" }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			@@ -753,7 +755,7 @@
			HBillSubType = 3301

			$("#HMaterID").val(params[params[3]]);//ç©æID

			$("#HName").val(getParams("HMaterNumber"));//å·¥èºè·¯çº¿åç§°
			$("#HMaterNumber").val(getParams("HMaterNumber"));//ç©æä»£ç
			$("#HMaterName").val(getParams("HMaterName"));//ç©æåç§°
			$("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//è§æ ¼åå·
			@@ -1209,7 +1211,7 @@
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			, "HSubStdEmpAvg_S": 0
			, "HSubStdEmpAvg_S": 0, "æ åå·¥ä»·": 0, "HYDCoefficient": 0
			};
			switch (obj.event) {
			case 'btn-AddLine':
			@@ -1398,6 +1400,14 @@
			//table.render(option)
			}
			break;
			case 'HWorkQty': //çº¦å½ç³»æ°
			if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
			obj.update({
			HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
			});
			}
			break;

			}
			})

			@@ -1832,9 +1842,9 @@
			var wait = layer.load();
			var HInterID = $("#HInterID").val();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
			url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
			type: "GET",
			data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "3301"},
			success: function (result) {
			if (result.count == 1) {
			//æ£æ¥æ¯å¦å·å¤å¯ç¨é»è®¤å·¥èºè·¯çº¿çæéï¼åå¨ï¼åå¼¹çªæé®
			@@ -1888,11 +1898,12 @@
			//åå®¡æ ¸
			function set_AbandonCheck() {
			layer.confirm("ç¡®è®¤è¦åå®¡æ ¸å?", function (index) {
			var HInterID = $("#HInterID").val();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
			url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
			type: "GET",
			data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			@@ -1912,11 +1923,12 @@
			//å³é
			function set_CloseBill() {
			layer.confirm("ç¡®è®¤è¦å³éå?", function (index) {
			var HInterID = $("#HInterID").val();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
			url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
			type: "GET",
			data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			@@ -1936,11 +1948,12 @@
			//åå³é
			function set_CancelCloseBill() {
			layer.confirm("ç¡®è®¤è¦åå³éå?", function (index) {
			var HInterID = $("#HInterID").val();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
			url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
			type: "GET",
			data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			@@ -2059,6 +2072,7 @@

			//#region å¤å¶
			function set_Copy() {
			$('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);
			//å¶åäºº
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#hmakers").val(sessionStorage["HUserName"]);
			@@ -2220,6 +2234,9 @@
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
			option.data[i]["å·¥æ®µ"] = checkStatus.data[j]["å·¥æ®µåç§°"];
			option.data[i]["æ åå·¥ä»·"] = checkStatus.data[j]["æ åå·¥ä»·"];


			j++;
			}

			@@ -2242,7 +2259,7 @@
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			, "HSubStdEmpAvg_S": 0
			, "HSubStdEmpAvg_S": 0, "æ åå·¥ä»·": 0, "HYDCoefficient": 0
			})
			j++;
			}
			@@ -2258,6 +2275,9 @@
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
			option.data[i]["å·¥æ®µ"] = checkStatus.data[j]["å·¥æ®µåç§°"];
			option.data[i]["æ åå·¥ä»·"] = checkStatus.data[j]["æ åå·¥ä»·"];
			option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["æ åå·¥ä»·"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
			option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["æ åå·¥ä»·"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["æ åå·¥ä»·"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//çº¦å½ç³»æ°=åºåå¼/å°æ¶äº§è½
			j++;
			}
			}
			@@ -2290,6 +2310,10 @@
			, "å·¥ä½ä¸å¿ä»£ç ": OptionData[0].å·¥ä½ä¸å¿ä»£ç
			, "HProcID_S": OptionData[0].HProcMulID
			, "å·¥æ®µ": OptionData[0].å·¥æ®µåç§°
			, "æ åå·¥ä»·": OptionData[0].æ åå·¥ä»·
			, "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].æ åå·¥ä»· / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
			, "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].æ åå·¥ä»· / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].æ åå·¥ä»· / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0

			})
			OptionData = [];
			}
			@@ -2608,7 +2632,7 @@
			$.ajax({
			url: GetWEBURL() + '/Gy_Process/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": 'ç¿æ¶æ¶'},
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			async: false,
			success: function (data1) {
			if (data1.count == 1) {
			@@ -2652,7 +2676,7 @@

			//æ¥è¯¢å·¥ä½ä¸å¿çæ°æ®
			var WorkCente = [];
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§° from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°,p.HStandardWages æ åå·¥ä»· 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", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -2687,6 +2711,9 @@
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
			option.data[i]["å·¥æ®µ"] = data.data[j]["å·¥æ®µåç§°"];
			option.data[i]["æ åå·¥ä»·"] = WorkCente[j]["æ åå·¥ä»·"];
			option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;

			j++;
			}

			@@ -2709,7 +2736,7 @@
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			, "HSubStdEmpAvg_S": 0
			, "HSubStdEmpAvg_S": 0, "æ åå·¥ä»·": 0, "HYDCoefficient": 0
			})
			j++;
			}
			@@ -2725,6 +2752,8 @@
			option.data[i]["å·¥ä½ä¸å¿ä»£ç "] = WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "];
			option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
			option.data[i]["å·¥æ®µ"] = data.data[j]["å·¥æ®µåç§°"];
			option.data[i]["æ åå·¥ä»·"] = WorkCente[j]["æ åå·¥ä»·"];
			option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
			j++;
			}
			}
			@@ -2829,7 +2858,7 @@
			, "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].è½¬åºæ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Proc": d.data[i].è½¬åºæ£éªæ¹æ¡
			, "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡
			, "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
			, "HSubStdEmpAvg_S": d.data[i].äººåäº§è½
			, "HSubStdEmpAvg_S": d.data[i].äººåäº§è½, "æ åå·¥ä»·": d.data[i].æ åå·¥ä»·, "HYDCoefficient": d.data[i].çº¦å½ç³»æ°
			}
			)
			}
			@@ -3019,7 +3048,7 @@
			//}

			//else {
			// if (option.data[i]["HCenterID"] == "0") {
			// if (option.data[i]["HCenterID"] == "0"&&option.data[i]["å·¥åºä»£ç "] != "9999") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			// return false;
			// }