From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
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/MES_ProcessCheckBill_PDA.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/MES_ProcessCheckBill_PDA.html"
index afd8877..efc8bf7 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/MES_ProcessCheckBill_PDA.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/MES_ProcessCheckBill_PDA.html"
@@ -148,6 +148,12 @@
</td>
</tr>
<tr>
+ <th>鎵规鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBatchNo" class="layui-input set_height" id="HBatchNo" placeholder="鎵规鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
<th>鐗╂枡浠ｇ爜</th>
<td class="bz_td">
<input type="text" name="HMaterNumber" class="layui-input set_height" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -537,7 +543,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
+ "HQCCheckItemID": 0, "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
}];
option = {
@@ -652,6 +658,7 @@
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HProcExchInterID": data.hmainid,
"HProcExchEntryID": data.hsubid,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
"HICMOInterID": data.hicmointerid,
"HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
@@ -665,7 +672,7 @@
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
@@ -684,6 +691,7 @@
"HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿,
"HProcExchInterID": data.HProcExchInterID,
"HProcExchEntryID": data.HProcExchEntryID,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
"HICMOInterID": data.HICMOInterID,
"HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗�,
@@ -697,7 +705,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": 0,
@@ -727,7 +735,7 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
"HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
--
Gitblit v1.9.1