From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 6cf0643..bb59b78 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"
@@ -290,6 +290,10 @@
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
</form>
</div>
</div>
@@ -533,7 +537,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 = {
@@ -655,14 +659,18 @@
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPRDORGID": data.缁勭粐,
- "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HPRDORGID": 0,//data.缁勭粐,
+ "HPRDORGName": '',//data.缁勭粐鍚嶇О,
"HUnitID": data.HUnitID,
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -689,11 +697,17 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
case "MO00":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -713,11 +727,17 @@
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
- "HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
}
layer.close(index);
--
Gitblit v1.9.1