From 23060d1d71f4ecbc544d34cfc4a26e37da7ee047 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 16:13:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 188 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 160 insertions(+), 28 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 0471fdb..e6d286a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -930,12 +930,20 @@
if (HSouceBillType == 1401) {
// 閿�鍞鍗曚笅鎺�
LoadingInformation_SeOrder();
- GetCheckItemID();
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
}
else if (HSouceBillType == 1402) {
// 鍙戣揣閫氱煡鍗曚笅鎺�
LoadingInformation_SeOutStock();
- GetCheckItemID();
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
} else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
@@ -1283,7 +1291,7 @@
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
-
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -2938,7 +2946,70 @@
EchoValue();
}
}
+ //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
+ window.get_CheckItem1 = function () {
+ var HBatchQty = $("#HProcExchQty").val();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ async: false,
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ rowdata_Value = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ }
+ );
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
+ }
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= 5; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ //妫�楠岄」鐩�
+ option.data = rowdata;
+ table.render(option);
+ //妫�楠屽��
+ option_Value.data = rowdata_Value;
+ //console.log(JSON.stringify(option_Value.data));
+ table.render(option_Value);
+ //================================================
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ option_Check = result.data;
+
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ trindex = result.data.length - 1;
+ $("#HEntryID").val() - 1
+ }
+ }
+ })
+ }
//鍥炴樉妫�楠屽��
function EchoValue() {
var HInterID = $("#HInterID").val();
@@ -3862,28 +3933,84 @@
trindex = result.data.length - 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); //闅愯棌妫�娴嬪�煎瓧娈�
+ }
+
+
//#region [鑾峰彇婧愬崟瀵瑰簲鍗曟嵁淇℃伅]
// 閿�鍞鍗� 瀵瑰簲鍗曟嵁淇℃伅
function LoadingInformation_SeOrder() {
$.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_Push",
+ url: GetWEBURL() + "/QC_OutCompCheckBill/get_SeOrderBill_Tmp",
type: "GET",
- data: { HInterID: linterid, HSubID: HEntryID },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0]
-
- $("#HMaterID").val(data['HMaterID'])
- $("#HMaterName").val(data['鐗╂枡鍚嶇О'])
- $("#HMaterNumber").val(data['鐗╂枡浠ｇ爜'])
- $("#HMainSourceBillNo").val(data['鍗曟嵁鍙�'])
- $("#HMainSourceInterID").val(data['hmainid'])
- $("#HMainSourceEntryID").val(data['hsubid'])
+ data: {
+ HInterID: linterid,
+ HEntryID: HEntryID,
+ HBillType: 1401
+ },
+ success: function (res) {
+ if (res.count == 1) {
+ $("#HMaterID").val(res.data[0]['HMaterID'])
+ $("#HMaterName").val(res.data[0]['HMaterName'])
+ $("#HMaterNumber").val(res.data[0]['HMaterNumber'])
+ $("#HMainSourceBillNo").val(res.data[0]['HBillNo'])
+ $("#HMainSourceInterID").val(res.data[0].HInterID)
+ $("#HMainSourceEntryID").val(res.data[0].HEntryID)
+ $("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
}
}
})
@@ -3891,20 +4018,25 @@
function LoadingInformation_SeOutStock() {
$.ajax({
- url: GetWEBURL() + "/Xs_SeOutStockBill/cx",
+ url: GetWEBURL() + "/QC_OutCompCheckBill/get_SeOutStockBill_Tmp",
type: "GET",
- data: { HInterID: linterid },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- debugger
- var data = result.data[0]
-
- $("#HMaterID").val(data['HMaterID'])
- $("#HMaterName").val(data['鐗╂枡鍚嶇О'])
- $("#HMaterNumber").val(data['鐗╂枡浠ｇ爜'])
- $("#HMainSourceBillNo").val(data['鍗曟嵁鍙�'])
- $("#HMainSourceInterID").val(data['hmainid'])
- $("#HMainSourceEntryID").val(data['hsubid'])
+ data: {
+ HInterID: linterid,
+ HEntryID: HEntryID,
+ HBillType: 1402
+ },
+ success: function (res) {
+ if (res.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HMaterID").val(res.data[0]['HMaterID'])
+ $("#HMaterName").val(res.data[0]['HMaterName'])
+ $("#HMaterNumber").val(res.data[0]['HMaterNumber'])
+ $("#HMainSourceBillNo").val(res.data[0]['HBillNo'])
+ $("#HMainSourceInterID").val(res.data[0].HInterID)
+ $("#HMainSourceEntryID").val(res.data[0].HEntryID)
+ $("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
}
}
})
--
Gitblit v1.9.1