From fa3ae99aff8d1727897455d2e53c98538208b177 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 26 八月 2024 17:37:25 +0800
Subject: [PATCH] 异常反馈单 :自动生产内容增加一个单据号, 设备启动点检,被下推的时候,子表为空就赋值0 修改制程绩效趋势图(合格率与一次合格率查询) 查询 现在人机料法环测全面追溯报表
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 254 insertions(+), 28 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 893ec51..132762d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -101,7 +101,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
</ul>
- <div class="layui-tab-content" style="height: 700px;">
+ <div class="layui-tab-content" style="height: 900px;">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
@@ -121,7 +121,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
@@ -184,31 +184,72 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">杞彂鑷�:</label>
+ <label class="layui-form-label">杞彂鑷�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐ｄ换浜�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <input type="text" name="HBadProcManName" id="HBadProcManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HBadProcMan" id="HBadProcMan" class="layui-input" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadProcManList" id="HBadProcManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>-->
- </div>
- <!--<div class="layui-form-item">
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�佺被鍨�:</label>
+ <label class="layui-form-label">QE璐ｄ换浜� :<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <select name="HSendType" lay-filter="HSendType" id="HSendType">
- <option value="0" selected="selected">鍏叡</option>
- <option value="1">涓汉</option>
- </select>
+ <input type="text" name="HQEManName" id="HQEManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HQEMan" id="HQEMan" class="layui-input" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQEManList" id="HQEManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
- </div>-->
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">闂鏉ユ簮:</label>
+ <div class="layui-input-inline">
+ <select name="HForm" lay-filter="HForm" id="HForm">
+ <option value="浜�" selected="selected">浜�</option>
+ <option value="鏈�">鏈�</option>
+ <option value="鏂�">鏂�</option>
+ <option value="娉�">娉�</option>
+ <option value="鐜�">鐜�</option>
+ <option value="娴�">娴�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙樺寲鐐�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HChangeNote" id="HChangeNote" class="layui-input" value="" autocomplete="off">
+ </div>
+ </div>
+ </div>
+
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璇︾粏绫诲:<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璇︾粏鍐呭:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
</div>
</div>
</div>
@@ -248,17 +289,23 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿:</label>
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
- <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
- <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷:</label>
+ <label class="layui-form-label">鐢熶骇鐝</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -294,6 +341,31 @@
<div class="layui-input-inline">
<input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
<input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">褰卞搷闈㈢▼搴�:</label>
+ <div class="layui-input-inline">
+ <select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
+ <option value="鍋滅嚎" selected="selected">鍋滅嚎</option>
+ <option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
+ <option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
+ <option value="鏃犳硶鍒ゆ柇">鏃犳硶鍒ゆ柇</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
+ <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
+ <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
</div>
</div>
</div>
@@ -455,6 +527,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
@@ -535,7 +608,7 @@
});
}
- //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
+ //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
//鑾峰彇鎶ュ伐鍙拌烦杞俊鎭� 鐗╂枡 鏁伴噺
function set_Sc_ICMOBillStatus() {
@@ -549,6 +622,7 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
+
var LoadData = data.data;
$("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
$("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
@@ -558,6 +632,8 @@
$("#HMainSourceEntryID").val(LoadData[0].娴佽浆鍗″瓙鍐呯爜); //婧愬崟瀛愬唴鐮�
$("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
$("#HQty").val(LoadData[0].璁″垝鏁伴噺); //璁″垝鏁伴噺
+ $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮id
+ $("#HSourceName").val(LoadData[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -618,7 +694,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
}
-
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -639,13 +715,13 @@
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: false,
data: {
- "HSourceName": HSourceName
+ "HSourceName": HSourceName
},
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
var LoadData = data.data;
- EquipNumber=LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
+ EquipNumber = LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -667,7 +743,7 @@
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
@@ -756,6 +832,17 @@
, "HHandleEmpName": data.HHandleEmpName
, "HMaterModel": data.HMaterModel
, "HQty": data.HQty
+ , "HForm": data.HForm
+ , "HChangeNote": data.HChangeNote
+ , "HNote": data.HNote
+ , "HBadProcMan": data.HBadProcMan
+ , "HBadProcManName": data.HBadProcManName
+ , "HQEMan": data.HQEMan
+ , "HQEManName": data.HQEManName
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.HSourceName
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.HShiftsName
, "HDescription": data.HDescription
, "HRemark": data.HRemark
, "HMaker": data.HMaker //鍒跺崟浜�
@@ -779,7 +866,7 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- }
+ }
//鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
@@ -1107,6 +1194,82 @@
});
});
+ //璐ｄ换浜哄脊绐�
+ form.on('submit(HBadProcManList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HBadProcMan").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //QE璐ｄ换浜哄脊绐�
+ form.on('submit(HQEManList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQEManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HQEMan").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//杞彂鑷�
form.on('submit(HReTransmitManList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1156,12 +1319,65 @@
});
});
+ //鐢熶骇鐝
+ form.on('submit(BtnHShiftsName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , resize: false
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
// 鎷兼帴瀛楃涓�
- var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ var result = '寮傚父鍙嶉鍗曞彿:' + $("#HBillNo").val()+',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
+ ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber;
return result;
@@ -1231,6 +1447,16 @@
$("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
}
+ function GetHManagerValue(obj) { //QE璐ｄ换浜�
+ $("#HQEManName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HQEMan").val(obj[0].HItemID);
+ }
+
+ function GetHSecManagerValue(obj) { //璐ｄ换浜�
+ $("#HBadProcManName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HBadProcMan").val(obj[0].HItemID);
+ }
+
function GetHDeptNameValue(obj) { //閮ㄩ棬
if (HDeptType == 1) {
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
--
Gitblit v1.9.1