From e40eee31a528e0a8d0003d169d14faabb40d3c26 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 七月 2024 19:59:16 +0800
Subject: [PATCH] 上料防错列表增加过滤字段
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 209 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 174 insertions(+), 35 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 f1587a7..893ec51 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"
@@ -121,7 +121,14 @@
<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" style="width:485px" readonly>
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮傚父绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrMsgBackTypeName" id="HErrMsgBackTypeName" class="layui-input" value="" disabled>
+ <input type="hidden" name="HErrMsgBackTypeID" id="HErrMsgBackTypeID" lay-verify="HErrMsgBackTypeID" value="0">
</div>
</div>
</div>
@@ -376,12 +383,14 @@
var HICMOBillNo = ""; //宸ュ崟鍙�
var HSourceName = ""; //璁惧
var HType = ""; //寮傚父绫诲瀷
+ var HSourceBill = "";//宸ュ簭娴佽浆鍗�
var edit = function (data) {
HICMOBillNo = data[0].HICMOBillNo;
HSourceName = data[0].HSourceName;
HType = data[0].HType;
+ HSourceBill = data[0].HSourceBillNo;
}
var HBillType = ""; //鍗曟嵁绫诲瀷
var HMainSourceInterID = ""; //婧愬崟涓诲唴鐮�
@@ -390,8 +399,8 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
-
-
+
+
//var edit = function (data) {
// HBillType = data[0].HBillType;
@@ -438,6 +447,25 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '4502' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ }
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -450,14 +478,19 @@
}
else if (OperationType == 4) {
set_AddFNew();
+ var EquipNumber = "";
+ set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
+ set_ErrMsgBackType(); //鑾峰彇寮傚父绫诲瀷
+ set_UserSuperiors(); //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
+ set_EquipFile(); //鑾峰彇璁惧鐨勮澶囩紪鐮�
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
- var Person = sessionStorage["HUserName"];
+ var Person = sessionStorage["HUserName"];
//鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
- $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
- $("#HContext").val(HType);
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
+ $("#HContext").val(HType);//涓婚
}
else if (OperationType == 5) { //鏌ョ湅
- set_EditFromGrid();
+ set_EditFromGrid();
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
$('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
}
@@ -502,6 +535,131 @@
});
}
+ //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞俊鎭� 鐗╂枡 鏁伴噺
+ function set_Sc_ICMOBillStatus() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: {
+ "HSourceBill": HSourceBill
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HMaterNumber").val(LoadData[0].鐗╂枡浠ｇ爜); //浜у搧鍚嶇О
+ $("#HMaterName").val(LoadData[0].鐗╂枡鍚嶇О); //浜у搧鍚嶇О
+ $("#HMaterModel").val(LoadData[0].瑙勬牸鍨嬪彿); //浜у搧瑙勬牸
+ $("#HMainSourceBillNo").val(LoadData[0].娴佽浆鍗″彿); //婧愬崟鍗曞彿
+ $("#HMainSourceInterID").val(LoadData[0].娴佽浆鍗′富鍐呯爜); //婧愬崟涓诲唴鐮�
+ $("#HMainSourceEntryID").val(LoadData[0].娴佽浆鍗″瓙鍐呯爜); //婧愬崟瀛愬唴鐮�
+ $("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
+ $("#HQty").val(LoadData[0].璁″垝鏁伴噺); //璁″垝鏁伴噺
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 寮傚父绫诲瀷
+ function set_ErrMsgBackType() {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: {
+ "TypeName": HType
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HErrMsgBackTypeID").val(LoadData[0].HItemID); //浜у搧鍚嶇О
+ $("#HErrMsgBackTypeName ").val(LoadData[0].HName); //浜у搧鍚嶇О
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 褰撳墠鐧诲綍浜虹殑涓婄骇
+ function set_UserSuperiors() {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: {
+ "HName": sessionStorage["HUserName"]
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ if (LoadData[0].鑱屽姟 == "娉ㄥ缁勫憳" || LoadData[0].鑱屽姟 == "鍚庡鐞嗙粍鍛�") {
+ $("#HSendMan").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鍙戦�佷汉
+ $("#HReceiveMan ").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
+ } else {
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
+ }
+
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鎶ュ伐鍙拌烦杞� 鑾峰彇 璁惧缂栫爜
+ function set_EquipFile() {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: {
+ "HSourceName": HSourceName
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ EquipNumber=LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -509,8 +667,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"]); //鍒跺崟浜�
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
@@ -622,27 +779,7 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- }
-
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '4502' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(d.data[0].HInterID);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- }
+ }
//鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
@@ -1019,16 +1156,18 @@
});
});
-
+
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
- function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
+ function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
// 鎷兼帴瀛楃涓�
- var result = Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ + ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
+ + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber;
return result;
}
-
-
+
+
//浠ヤ笂涓簂ayui妯″潡
});
--
Gitblit v1.9.1