From de7931bdf73d57ca79eeb0cd48ea3a0ea5453e0e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 09:45:21 +0800
Subject: [PATCH] 新增制程陷阱测试趋势图、PPM绩效趋势图报表模块
---
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 121 ++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 11 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 377ffac..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"
@@ -143,7 +143,14 @@
<th>娴佽浆鍗�</th>
<td class="bz_td">
<input type="text" name="HProcExchBillNo" class="layui-input set_height" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcExchHinteID" class="layui-input set_height" id="HProcExchHinteID">
+ <input type="hidden" name="HProcExchInterID" class="layui-input set_height" id="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" class="layui-input set_height" id="HProcExchEntryID" value="0">
+ </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>
@@ -289,6 +296,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>
@@ -478,7 +489,7 @@
//閫�鍑�--鍏ㄥ睆鐗�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
+ parent.location.href = "../../../views/index_Mobile.html";
});
})
@@ -532,14 +543,14 @@
$("#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 = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
+ , height: 'full-220'
, cellMinWidth: 150
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
@@ -614,21 +625,40 @@
}
function txtHBarCode_KeyDown(HBarCode) {
+ //妫�鏌ユ壂鎻忕殑鏉＄爜鏄惁涓虹函鏁板瓧锛屽鏋滄槸绾暟瀛楋紝鐩墠榛樿鍒ゆ柇涓� "宸ュ簭杩涚珯鎺ユ敹鍗曞彿"
+ var result = /^\d+$/.test(HBarCode)
+ if (result == true) {
+ HBarCode = HBarCode.slice(0, 0) + 'GXJZ' + HBarCode.slice(0)
+ }
+ //鎵爜绫诲瀷1
+ var barNo = HBarCode.substr(0, 3);
//鎵爜绫诲瀷2
var barNo2 = HBarCode.substr(0, 4);
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
+ url: GetWEBURL() + "/MES_ProcessBill_PDA/HBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchInterID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
+
+ switch (barNo) {
+ case "HCX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSourceID": data.HItemID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ });
+ break;
+ }
switch (barNo2) {
case "GXLX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.hsubid,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
"HICMOInterID": data.hicmointerid,
"HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
@@ -636,18 +666,87 @@
"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
+ "HProcID": data.HProcID,
+ "HQCSchemeID": data.妫�楠屾柟妗圛D == null ? 0 : data.妫�楠屾柟妗圛D,
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
+ //鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
+ get_CheckItem();
HProcExchBillNoFlag = true;
- var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HProcExchInterID = $('#HProcExchInterID').val();
var HInterID = data.hmainid;
break;
+ case "GXCZ":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿,
+ "HProcExchInterID": data.HProcExchInterID,
+ "HProcExchEntryID": data.HProcExchEntryID,
+ "HBatchNo": data.娴佽浆鍗℃壒娆″彿,
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗�,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HUnitID": data.HUnitID,
+ "HUnitName": data.璁￠噺鍗曚綅,
+ "HProcName": data.褰撳墠宸ュ簭,
+ "HProcID": data.HProcID,
+ "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="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": "",
+ "HProcExchInterID": 0,
+ "HProcExchEntryID": 0,
+ "HICMOInterID": data.hmainid,
+ "HICMOEntryID": data.hsubid,
+ "HICMOBillNo": data.鍗曟嵁鍙�,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HUnitID": data.hunitid,
+ "HUnitName": data.璁￠噺鍗曚綅,
+ "HProcName": data.褰撳墠宸ュ簭,
+ "HProcID": data.HProcID,
+ "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