From 4fc3d2d917b4fd9ce151ce205e3d252e3dc64c5f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 七月 2024 17:05:07 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 284 ++++++++++++++++++++++++++++++++++++++++------
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 63 ++++++---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 5
6 files changed, 290 insertions(+), 67 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 13d60e4..72354ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -752,6 +752,7 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
, { field: 'HWidth', title: '闂ㄥ箙', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
+ , { field: '鐗规畩璁㈠崟', title: '鐗规畩璁㈠崟', sort: true, width: 150 }
, { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true, totalRow: true }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', totalRow: true, sort: true, totalRow: true }
, { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', totalRow: true, sort: true, totalRow: true }
@@ -2666,8 +2667,8 @@
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29,365];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�","杩戜竴骞�"];
var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
for (var i = 0; i < valueList.length; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 0922c29..280790e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -271,7 +271,7 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json",
+ url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json_Main",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 8f66079..278e638 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -97,8 +97,6 @@
<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="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly>
- <input type="hidden" class="layui-input" name="HControlUpperLimit" id="HControlUpperLimit">
- <input type="hidden" class="layui-input" name="HControlLowerLimit" id="HControlLowerLimit">
</div>
</div>
</div>
@@ -134,15 +132,21 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">Std.Dev</label>
+ <label class="layui-form-label" style="width: 85px;">鎺у埗涓婇檺</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HStdDev" name="HStdDev" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HControlUpperLimit_X" id="HControlUpperLimit_X">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left: 48px;">
+ <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="HControlLowerLimit_X" id="HControlLowerLimit_X">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">Sigma</label>
+ <label class="layui-form-label" style="width: 85px;">X涓績绾�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HSigma" name="HSigma" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCenterline_X" id="HCenterline_X">
</div>
</div>
<div class="layui-inline">
@@ -151,36 +155,30 @@
<input type="text" class="layui-input" name="HPPK" id="HPPK" style="background-color:#efefef4d;" readonly>
</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="HPP" id="HPP" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">C a</label>
+ <label class="layui-form-label" style="width: 85px;">鎺у埗涓婇檺</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HCA" name="HCA" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HControlUpperLimit_S" id="HControlUpperLimit_S">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left: 48px;">
+ <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="HControlLowerLimit_S" id="HControlLowerLimit_S">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">S涓績绾�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCenterline_S" id="HCenterline_S">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">C P K</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" id="HCPK" name="HCPK" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">C P</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCP" id="HCP" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">Grade</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HGrade" id="HGrade" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -421,6 +419,8 @@
optionS[0] = data1.data[limit + 2];
table.render(option);
set_Line();
+ set_PPK();
+ set_CPK();
}
} else {
@@ -432,6 +432,197 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+
+ //PPK璁＄畻 x
+ function set_PPK() {
+ var x_AVG =0;
+ var x_SUM = 0;
+ var x_PPK = 0;
+ var numCount = 0
+ var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];
+
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
+ x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
+ }
+ }
+ x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
+ x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
+ $("#HCenterline_X").val(x_AVG);
+
+ for (var i = 1; i < option.cols[0].length; i++) {
+ for (var j = 0; j < option.data.length - 3; j++) {
+ numCount += 1;
+ x_SUM = calc(x_SUM, parseFloat(((parseFloat(option.data[j][option.cols[0][i].field]) - x_AVG) ** 2).toFixed(6)), "+")
+
+ }
+ }
+
+ x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
+
+ var limit = $("#limit").val();
+ if (parseInt(limit) >= 9) {
+ $("#HCenterline_S").val(x_PPK.toFixed(4));
+ }
+
+
+ //涓婇檺
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ $("#HPPK").val(HUpLimit.toFixed(4));
+ }
+ //涓嬮檺
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ $("#HPPK").val(HDownLimit.toFixed(4));
+ } else {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
+ $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ }
+ }
+
+ //CPK璁＄畻 s
+ function set_CPK() {
+ var x_AVG = 0;
+ var s_AVG = 0;
+ var s_CPK = 0;
+ var d2 = [1.128, 1.693, 2.059, 2.326, 2.534, 2.704, 2.847, 3.078, 3.173, 3.258, 3.336, 3.407, 3.472, 3.532, 3.588, 3.640, 3.689, 3.735, 3.778, 3.819, 3.858, 3.895, 3.931];
+
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
+ s_AVG = calc(s_AVG, parseFloat(optionS[0][option.cols[0][j].field]), "+");
+ }
+ }
+ s_AVG = calc(s_AVG, (option.cols[0].length - 1), "/")
+ s_AVG = $("#HCenterline_S").val() == "" || "0" ? s_AVG : parseFloat($("#HCenterline_S").val());
+ $("#HCenterline_S").val(s_AVG);
+
+ var limit = $("#limit").val();
+ if (parseInt(limit) < 9) {
+ $("#HCenterline_S").val(s_AVG.toFixed(4));
+ }
+
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
+ x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
+ }
+ }
+ x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
+ x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
+ $("#HCenterline_X").val(x_AVG);
+
+ s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
+
+ //涓婇檺
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()),"+"), s_AVG, "-"), (3 * s_CPK), "/");
+ $("#HCPK").val(HUpLimit.toFixed(4));
+ }
+ //涓嬮檺
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ $("#HCPK").val(HDownLimit.toFixed(4));
+ } else {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ if (s_CPK == 0) {
+ $("#HCPK").val(0);
+ } else {
+ $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ }
+
+ }
+ }
+
+ function calc(num1, num2, calcStr) {
+ var str1, // 杞崲涓哄瓧绗︿覆鐨勬暟瀛�
+ str2,
+ ws1 = 0,// ws1锛寃s2 鐢ㄦ潵瀛樺偍浼犲叆鐨刵um鐨勫皬鏁扮偣鍚庣殑鏁板瓧鐨勪綅鏁�
+ ws2 = 0,// 璧嬮粯璁ゅ�硷紝瑙ｅ喅褰撴暣鏁板拰灏忔暟杩愮畻鏃跺�嶆暟璁＄畻閿欒瀵艰嚧鐨勭粨鏋滆宸�
+ bigger,// bigger鍜宻maller鐢ㄤ簬鍔狅紝鍑忥紝闄ゆ硶鎵惧嚭灏忕殑閭ｄ釜鏁板瓧锛岀粰鍚庨潰琛�0锛岃В鍐充綅鏁颁笉瀵逛粠鑰岄�犳垚鐨勮绠楅敊璇殑闂锛涗箻娉曢渶瑕佸皢缁撴灉闄や袱涓暟瀛楃殑鍊嶆暟涔嬪拰
+ smaller,// 渚嬪锛氬姞鍑忛櫎娉曚腑1.001 + 2.03 锛屽鏋滀笉缁�2.03杩涜琛�0锛屾渶鍚庝細鍙樻垚1001+203锛屾暟瀛楅敊浣嶅鑷寸粨鏋滈敊璇紱涔樻硶涓�1.12*1.1浼氭斁澶т负112*11锛屾墍浠ョ粨鏋滈渶瑕侀櫎浠�1000鎵嶄細鏄纭殑缁撴灉锛�112*11/1000=1.232
+ zeroCount, // 闇�瑕佽ˉ鍏�0鐨勪釜鏁�
+ isExistDot1, // 浼犲叆鐨勬暟瀛楁槸鍚﹀瓨鍦ㄥ皬鏁扮偣
+ isExistDot2,
+ sum,
+ beishu = 1;
+ // 灏嗘暟瀛楄浆鎹负瀛楃涓�
+ str1 = num1.toString();
+ str2 = num2.toString();
+ // 鏄惁瀛樺湪灏忔暟鐐癸紙鍒ゆ柇闇�瑕佽绠楃殑鏁板瓧鏄笉鏄寘鍚皬鏁帮級
+ isExistDot1 = str1.indexOf('.') != -1 ? true : false;
+ isExistDot2 = str2.indexOf('.') != -1 ? true : false;
+ // 鍙栧皬鏁扮偣鍚庨潰鐨勪綅鏁�
+ if (isExistDot1) {
+ ws1 = str1.split('.')[1].length;
+ }
+
+ if (isExistDot2) {
+ ws2 = str2.split('.')[1].length;
+ }
+ // 濡倃s1 鍜� ws2 鏃犻粯璁ゅ�硷紝濡傛灉num1 鎴� num2 涓嶆槸灏忔暟鐨勮瘽鍒� ws1 鎴� ws2 鐨勫�煎皢涓� undefined
+ // bigger 鍜� smaller 鐨勫�间細鍜岄鏈熶笉绗�
+ bigger = ws1 > ws2 ? ws1 : ws2;
+ smaller = ws1 < ws2 ? ws1 : ws2;
+
+ switch (calcStr) {
+ // 鍔犲噺娉曟壘鍑哄皬鐨勯偅涓暟瀛楋紝缁欏悗闈㈣ˉ0锛岃В鍐充綅鏁颁笉瀵逛粠鑰岄�犳垚鐨勮绠楅敊璇殑闂
+ // 渚嬪锛�1.001 + 2.03 锛屽鏋滀笉缁�2.03杩涜琛�0锛屾渶鍚庝細鍙樻垚1001+203锛屾暟瀛楅敊浣嶅鑷寸粨鏋滈敊璇�
+ case "+":
+ case "-":
+ case "/":
+ zeroCount = bigger - smaller;
+ for (var i = 0; i < zeroCount; i++) {
+ if (ws1 == smaller) {
+ str1 += "0";
+ }
+ else {
+ str2 += "0";
+ }
+ }
+ break;
+ case "*":
+ // 涔樻硶闇�瑕佸皢缁撴灉闄や袱涓暟瀛楃殑鍊嶆暟涔嬪拰
+ bigger = bigger + smaller;
+ break;
+ default:
+ return "鏆備笉鏀寔鐨勮绠楃被鍨嬶紝鐜板凡鏀寔鐨勬湁鍔犳硶銆佸噺娉曘�佷箻娉曘�侀櫎娉�";
+ break;
+ }
+
+ // 鍘婚櫎鏁板瓧涓殑灏忔暟鐐�
+ str1 = str1.replace('.', '');
+ str2 = str2.replace('.', '');
+
+ // 璁＄畻鍊嶆暟锛屼緥濡傦細1.001灏忔暟鐐瑰悗鏈変笁浣嶏紝鍒欓渶瑕佷箻 1000 鍙樻垚 1001锛屽彉鎴愭暣鏁板悗绮惧害涓㈠け闂鍒欎笉浼氬瓨鍦�
+ for (var i = 0; i < bigger; i++) {
+ beishu *= 10; // 绛変环浜巄eishu = beishu * 10;
+ }
+ num1 = parseInt(str1);
+ num2 = parseInt(str2);
+ // 杩涜鏈�缁堣绠楀苟闄ょ浉搴斿�嶆暟
+ switch (calcStr) {
+ case "+":
+ sum = (num1 + num2) / beishu;
+ break;
+ case "-":
+ sum = (num1 - num2) / beishu;
+ break;
+ case "*":
+ sum = (num1 * num2) / beishu;
+ break;
+ case "/":
+ sum = num1 / num2;
+ /* 闄ゆ暟涓庤闄ゆ暟鍚屾椂鏀惧ぇ涓�瀹氬�嶆暟锛屼笉褰卞搷缁撴灉锛�
+ 鎵�浠ュ鏁板瓧杩涜鏀惧ぇ瀵瑰簲鍊嶆暟骞惰繘琛岃ˉ0鎿嶄綔鍚庝笉鐢ㄥ彟瀵瑰�嶆暟鍋氬鐞� */
+ break;
+ default:
+ return "鏆備笉鏀寔鐨勮绠楃被鍨嬶紝鐜板凡鏀寔鐨勬湁鍔犳硶銆佸噺娉曘�佷箻娉曘�侀櫎娉�";
+ }
+
+ return sum;
}
//鎶樼嚎鍥�
@@ -477,9 +668,9 @@
},
yAxis: {
type: 'value',
- min: parseFloat($("#HDownLimit").val()) != 0 ? (parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()) * 1.3) : 0, // 璁剧疆鏈�灏忓��
- max: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()) * 1.3, // 璁剧疆鏈�澶у��
- interval: (parseFloat($("#HUpLimit").val()) - parseFloat($("#HDownLimit").val()))/10, // 璁剧疆闂磋窛
+ min: parseFloat($("#HDownLimit").val()) != 0 ? calc((parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3), "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+ max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
+ interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
},
series: [
{
@@ -509,10 +700,14 @@
yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
},
{
- yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlUpperLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
},
{
- yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlLowerLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ }
+ ,
+ {
+ yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
}
]
},
@@ -564,14 +759,21 @@
}
},
itemStyle: { normal: { label: { show: true } } },
- //markLine: {
- // symbol: 'none',//鍘绘帀绠ご
- // data: [
- // { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
- // { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
- // { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
- // ]
- //},
+ markLine: {
+ symbol: 'none',//鍘绘帀绠ご
+ data: [
+ {
+ yAxis: parseFloat($("#HControlUpperLimit_S").val()) , lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ },
+ {
+ yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ }
+ ,
+ {
+ yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
+ }
+ ]
+ },
}
]
};
@@ -723,8 +925,8 @@
$("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
$("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
$("#HTargetVal").val(data1.data[0].鐩爣鍊�);
- $("#HControlUpperLimit").val(data1.data[0].鎺у埗涓婇檺);
- $("#HControlLowerLimit").val(data1.data[0].鎺у埗涓嬮檺);
+ //$("#HControlUpperLimit").val(data1.data[0].鎺у埗涓婇檺);
+ //$("#HControlLowerLimit").val(data1.data[0].鎺у埗涓嬮檺);
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index a088ba5..21b54b3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1572,6 +1572,7 @@
, "HShiftsName": data.鐝鍚嶇О
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
, "HBatchNo": data.鎵瑰彿
+ , "HLastResult": data.鍒ゅ畾缁撹 == "鍚堟牸" ? "true" : "false"
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 9612c77..76d646c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -1694,7 +1694,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺') {
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index f0663cd..c20d4df 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -61,9 +61,12 @@
<div class="layui-row" style="margin-bottom: 15px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">宸ュ簭:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input" name="HProcName" value="" lay-verify="HProcName" id="HProcName" style="width: 150px; background-color: #efefef4d; " readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <div class="layui-input-block" style="margin-left: 9px;">
+ <input type="text" class="layui-input" name="HProcName" value="" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcID" id="btnHProcID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -643,6 +646,33 @@
})
});
+ //宸ュ簭
+ form.on('submit(btnHProcID)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: "宸ュ簭鍒楄〃" //鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html", "yes"]
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+
//宸ヤ綔涓績
form.on('submit(btnHCenterID)', function () {
layer.open({
@@ -835,35 +865,24 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- //get_PanelDisplay(sWhere);
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
function get_Display(sWhere) {
+ sWhere = " and HInterID='" + HSourceInterID + "' and 婧愬崟瀛愬唴鐮�='" + HSourceEntryID + "'";
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_CurrentTicket/list',
+ url: GetWEBURL() + '/CheckBill/GetICMOBillStatusList',
type: "GET",
async: false,
- data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
- $("#HICMOBillNo").text(data.HSourceBillNo);//宸ュ崟鍙�
- $("#HICMOBillStatus").text('');//褰撳墠鐘舵��
- $("#HMaterNumber").text(data.HMaterNumber);//浜у搧浠ｇ爜
- $("#HMaterName").text(data.HMaterName);//浜у搧鍚嶇О
- $("#HMaterModel").text(data.HModel);//瑙勬牸鍨嬪彿
- $("#HPlanQty").text(data.HPlanQty);//璁″垝鏁伴噺
- $("#HReportQty").text(data.HRelationQty);//姹囨姤鎬绘暟
- $("#HPickMtrlStatus").text('');//棰嗘枡鐘舵��
- $("#HFCheckNum").text(data.棣栨娆℃暟);//棣栨娆℃暟
- $("#HPrCheckNum").text(data.杩囩▼妫�娆℃暟);//杩囩▼妫�娆℃暟
- $("#HPPCheckNum").text(data.宸℃娆℃暟);//宸℃娆℃暟
- HFinishRate = data.瀹屾垚鐜�;//瀹屾垚鐜�
- HQualifiedRate = data.鍚堟牸鐜�;//鍚堟牸鐜�
+ $("#HProcName").val(result.data[0]["宸ュ簭"]);
+ $("#HProcID").val(result.data[0]["HProcID"]);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -929,8 +948,8 @@
$("#HDeptID").val(data1.data[0]["HDeptID"]);
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
- $("#HProcName").val(data1.data[0]["宸ュ簭"]);
- $("#HProcID").val(data1.data[0]["HProcID"]);
+ //$("#HProcName").val(data1.data[0]["宸ュ簭"]);
+ //$("#HProcID").val(data1.data[0]["HProcID"]);
$("#HSourceID").val(data1.data[0]["HSourceID"]);
$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
--
Gitblit v1.9.1