From 8b72cfe37b28964954fef7eb9cdec88f563932a1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 23 十月 2025 08:52:27 +0800
Subject: [PATCH] 首件检验单优化
---
WebTM/App_Data/MssqlReportData.cs | 2
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 103 +++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index e498c11..369336e 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -37,7 +37,7 @@
//public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鑸滄垚
//public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//杩﹀崡
//public const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娴疯瘹
- public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//灏忓崼
+ //public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//灏忓崼
//public string sServer;
//public string sDataBase;
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 f5bfdf0..07cd038 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"
@@ -2134,7 +2134,8 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
@@ -2168,10 +2169,59 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
+
+ //鎼哄甫鍑鸿川妫�鏂规
+ ReturnSampleScheme(data);
}
}
})
+ }
+
+ //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+ function ReturnSampleScheme(data) {
+ $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+ $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+ $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+ $("#HAQL").val(data[data.length - 1].AQL);
+ $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+ $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+ //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+ $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+ $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+ }
+
+ rowdata_Value = [];
+ for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+
+ IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
}
//鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
@@ -2198,7 +2248,8 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
@@ -2570,6 +2621,7 @@
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
@@ -2627,7 +2679,7 @@
elem: '#ValueTable'
//, toolbar: '#toolbarDemo_Value'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
+ , height: 'full-370'
, cellMinWidth: 150
, totalRow: true
, cols: [[ //琛ㄥご
@@ -2876,9 +2928,16 @@
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
- $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+ $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+ $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ }
+
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2903,7 +2962,7 @@
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
row_value.push({
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ "HSEQ": (i+1), "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
});
}
//鍒锋柊妫�楠屽�艰〃鏍�
@@ -3547,17 +3606,17 @@
HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
HInspectResultToSee: '', //妫�楠岀粨鏋�
HInspectResultToSee2: '', //妫�楠岀粨鏋�2
- HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
- HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ //HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ //HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnitName: option.data[nowindex].HUnit, //鍗曚綅
HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
- HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ //HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
- HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
- HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
- HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
- HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
- HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ //HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ //HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ //HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ //HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ //HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
}
//if (option.data[0].HSampleSchemeID == 0) {
@@ -3607,9 +3666,9 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
- $("#HUpLimit").val(maindata[nowindex].HUpLimit);
- $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal );
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit );
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit );
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3632,7 +3691,7 @@
$("#HInspectValB").val(maindata[nowindex].HInspectValB);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
$("#HTargetValB").val(maindata[nowindex].HTargetValB);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+ //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
$("#HUpLimit").val(maindata[nowindex].HUpLimit);
$("#HDownLimit").val(maindata[nowindex].HDownLimit);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3691,6 +3750,9 @@
}];
table.render(option_Value);
//layer.msg(result.code + result.Message, { icon: 5 });
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
}
}
})
@@ -4242,6 +4304,7 @@
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
$("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ //甯﹀嚭妫�楠岄」鐩�佹娊鏍锋柟妗�
get_CheckItem();
} else {
layer.msg(result.code + result.Message, { icon: 5 });
--
Gitblit v1.9.1