From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 0a0ecab..04fb572 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -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, "鏍囧噯宸ヤ环": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0,"HYDCoefficient": 0
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -618,6 +618,7 @@
, { 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: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
@@ -754,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"));//瑙勬牸鍨嬪彿
@@ -1210,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, "鏍囧噯宸ヤ环": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1399,13 +1400,14 @@
//table.render(option)
}
break;
- case 'HProcPrice': //宸ヤ环
- if (data.HProcPrice != 0) {
+ case 'HWorkQty': //绾﹀綋绯绘暟
+ if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
obj.update({
- HWorkQty: (data.鏍囧噯宸ヤ环 / value).toFixed(2)
+ HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
});
}
break;
+
}
})
@@ -2257,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, "鏍囧噯宸ヤ环": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
})
j++;
}
@@ -2275,6 +2277,7 @@
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++;
}
}
@@ -2309,6 +2312,8 @@
, "宸ユ": 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 = [];
}
@@ -2707,6 +2712,7 @@
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++;
}
@@ -2730,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, "鏍囧噯宸ヤ环": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
})
j++;
}
@@ -2747,6 +2753,7 @@
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++;
}
}
@@ -2851,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].浜哄潎浜ц兘, "鏍囧噯宸ヤ环": d.data[i].鏍囧噯宸ヤ环
+ , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘, "鏍囧噯宸ヤ环": d.data[i].鏍囧噯宸ヤ环, "HYDCoefficient": d.data[i].绾﹀綋绯绘暟
}
)
}
@@ -3041,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;
// }
--
Gitblit v1.9.1