From da5dc3b551eaad070f5ec836dfe669237ed86526 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 27 十一月 2025 13:54:49 +0800
Subject: [PATCH] 添康添加配件车间抓取订单排产；出厂检验单、工序、来料检验单、质检方案、首件检验单、明细行检验方法字段设置超长度自动隐藏
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 14 ++++++++++++--
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 4 +++-
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4 +++-
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 7 +++++--
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 4 ++--
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 11 ++++++++---
7 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a1995cc..40d8f11 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index 09f1d20..58e2260 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -1409,10 +1409,15 @@
if ($("#HMergeDept").val() == "鏄�") {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
- } else {
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
+ }else {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ }
+
+ if ($("#HWorkShopID").val() == "15035828") {
+ //鏍规嵁鎺掍骇鏍囪鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹紙閰嶄欢杞﹂棿锛�
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '閰嶄欢璁㈠崟' and HLockOrder != 1 )";
}
$.ajax({
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 4b909c4..8c5144e 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"
@@ -2434,7 +2434,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
@@ -3237,12 +3237,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f0fbfc9..db46f49 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -2752,7 +2752,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
@@ -3962,12 +3962,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 6eb1dc1..e790808 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -293,6 +293,13 @@
</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="HQty" id="HQty"
+ style="background-color:#efefef4d;" readonly value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -2558,7 +2565,7 @@
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+ var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
@@ -3149,7 +3156,7 @@
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: "HQualityStdID" },
, { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: "HInspectMethodID" },
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: "HInspectMethodID", style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'},
, { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: "HInspectBasisID" },
@@ -4317,12 +4324,14 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -4934,6 +4943,7 @@
$("#HMainSourceEntryID").val(res.data[0].HEntryID)
$("#HQCSchemeName").val(res.data[0].妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(res.data[0].妫�楠屾柟妗圛D);
+ $("#HQty").val(res.data[0].瀹炴敹鏁伴噺);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
}
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_Add_CheckProject.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_Add_CheckProject.html"
index acd95d8..58bb2a3 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_Add_CheckProject.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_Add_CheckProject.html"
@@ -319,7 +319,7 @@
<select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
<option value="1" selected="selected">=</option>
<option value="2">></option>
- <option value="3=">>=</option>
+ <option value="3">>=</option>
<option value="4"><</option>
<option value="5"><=</option>
<option value="6"><></option>
@@ -1157,7 +1157,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
, { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentName' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
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 b4ff437..1f7d3af 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"
@@ -40,6 +40,7 @@
margin-left: -15px;
margin-right: -15px;
}
+
</style>
</head>
<body>
@@ -2801,7 +2802,7 @@
, { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
, { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
, { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
- , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
, { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
, { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
@@ -3993,14 +3994,16 @@
$("#HSampleUnRightQty2").val(UnRightQty);
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
- if (UnRightQty > HAcceptQty) {
+ if (UnRightQty > HAcceptQty) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
$("#HInspectResultToSee").val('涓嶅悎鏍�');
$("#HInspectResultToSee2").val('涓嶅悎鏍�');
$("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
$("#HInspectResultToSee").val('鍚堟牸');
$("#HInspectResultToSee2").val('鍚堟牸');
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
--
Gitblit v1.9.1