From 75b716f13e8c32a12a66945eafad1a738dea2dd2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 14 六月 2024 10:52:22 +0800
Subject: [PATCH] 防错验证增加工序选着,启动点检修改报工台跳转无数据,磨具点检记录单修改有时候保存报错问题
---
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBill.html | 59 +++++++++++++++++++++++++++--
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html | 12 ++++--
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 20 ++++++---
WebTM/views/IpadIndex.html | 5 +-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 14 +++---
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 2
8 files changed, 89 insertions(+), 27 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index dccac29..5322ce0 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1127,7 +1127,7 @@
"HMaterID": HMaterID,
"HProcID": HProcID,
"HSourceID": HSourceID1,
- "SCOrder": HICMOBillNo
+ "SCOrder": HSourceBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1156,7 +1156,8 @@
var data = [];
data.push({
"HMaterID": HMaterID,
- "SCOrder": HICMOBillNo
+ "HProcID": HProcID,
+ "SCOrder": HSourceBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 9f4a49f..9b21987 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -411,7 +411,7 @@
, "HRemark": data.澶囨敞
, "HUSEORGID": data.HUSEORGID
, "HMacAddr": data.mac鍦板潃
- , "HEmpID": data.HEmpID
+ , "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
, "HEmpName": data.璐熻矗浜�
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index c686dfa..1c1105d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -68,7 +68,7 @@
<label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -86,7 +86,7 @@
<label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -108,7 +108,7 @@
<label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -897,15 +897,15 @@
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
//, "HPlanNo": data.鐐规璁″垝缂栧彿
- , "HPlanInterID": data.HPlanInterID
+ , "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
, "HPlanNo": data.鐐规璁″垝鍐呯爜
- , "HMouldID": data.HMouldID
+ , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
, "HMouldDotCheckRuleName": data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
- , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+ , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
, "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
, "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
, "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
- , "HShiftsID": data.HShiftsID //
+ , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
, "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
});
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 451f5c1..caeed44 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -309,7 +309,7 @@
var HMaterID = ""; //鐗╂枡
var HSourceID = ""; //鐢熶骇璧勬簮
var HProcID = ""; //宸ュ簭
- var SCOrder = "";//鐢熶骇璁㈠崟鍙�
+ var SCOrder = "";//宸ュ簭娴佽浆鍗″彿
var edit = function (data) {
HMaterID = data[0].HMaterID;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index d79dbfc..9ca519b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -140,6 +140,12 @@
<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鎬昏鍥惧彿</label>
<div class="layui-input-inline">
@@ -462,12 +468,12 @@
</button>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">椤圭洰缂栧彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">濮斿鍔犲伐鍗曚綅</label>
@@ -1479,7 +1485,7 @@
$('#HSNCtrl' + (i + 1)).attr("checked", true);
}
}
-
+
form.render('select');
form.render('checkbox');
@@ -2274,7 +2280,7 @@
, "HName": data.璁㈠崟绛夌骇
- , "HSplitNo": data.鎷嗗垎鍙�
+ , "HSplitNo": data.鎷嗗垎鍙� == undefined ? 0 : data.鎷嗗垎鍙�
, "HRemark2": data.鐧藉澂瑕佹眰
, "HRemark3": data.搴曢儴澶囨敞
, "HEmpID": data.HEmpID
@@ -2282,8 +2288,8 @@
, "HCusID": data.HCusID
, "HCusNames": data.瀹㈡埛
, "HColorRemark": data.鏌撹壊瑕佹眰
- , "HSplitSumQty": data.鎷嗗垎鎬婚噺
- , "HSplitColorQty": data.鍒嗙几鍙�
+ , "HSplitSumQty": data.鎷嗗垎鎬婚噺 == undefined ? 0 : data.鎷嗗垎鍙�
+ , "HSplitColorQty": data.鍒嗙几鍙� == undefined ? 0 : data.鎷嗗垎鍙�
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
@@ -2300,7 +2306,7 @@
, "HWorkShopID": data.HWorkShopID
, "textBox2": data.浠诲姟鍗曞彿
, "HWorkBillSortNo": data.鏃ヨ鍒掑伐鍗曞彿
- , "HSupName": data.濮斿鍔犲伐鍗曚綅
+ , "HSupName": data.濮斿鍔犲伐鍗曚綅 == undefined ? 0 : data.鎷嗗垎鍙�
, "HSupID": data.HSupID
, "HMaterName": data.瀛愪欢鍚嶇О
, "HMaterID": data.HMaterID
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
index 0bcd0b8..91a52f1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
@@ -40,7 +40,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
@@ -62,7 +62,18 @@
</div>
</div>
</div>
-
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" 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-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
@@ -288,6 +299,14 @@
});
//#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
@@ -494,6 +513,33 @@
}
//#endregion
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -627,7 +673,8 @@
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterName": tableMain[0]["鐗╂枡鍚嶇О"]
-
+ , "HProcID": tableMain[0]["HProcID"]
+ , "HProcName": tableMain[0]["宸ュ簭鍚嶇О"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
, "HMaker": tableMain[0]["鍒跺崟浜�"]
@@ -742,7 +789,11 @@
$("#HMaterID").val(obj.HItemID);
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
}
-
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
//闃查敊瑁呯疆
function GetPreventErrMouldValue(obj) {
OptionData = obj;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
index 183c639..c27cb7b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
@@ -253,11 +253,15 @@
<script>
var HMaterID = ""; //鐗╂枡
- var SCOrder = "";//鐢熸垚璁㈠崟鍙�
+ var HProcID = ""; //宸ュ簭
+ var SCOrder = "";//宸ュ簭娴佽浆鍗″彿
+
var edit = function (data) {
HMaterID = data[0].HMaterID;
+ HProcID = data[0].HProcID;
SCOrder = data[0].SCOrder;
}
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -351,7 +355,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
//鑾峰彇鎶ュ伐鍙拌烦杞暟鎹�
- RoadBillEdit(HMaterID, SCOrder);
+ RoadBillEdit(HMaterID, HProcID, SCOrder);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
@@ -928,14 +932,14 @@
//#endregion
//#region 鎶ュ伐骞冲彴璺宠浆璧嬪��
- function RoadBillEdit(HMaterID, SCOrder)//鍔犺浇琛ㄥご
+ function RoadBillEdit(HMaterID, HProcID, SCOrder)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/锘縌c_PreventErrMouldCheckBillList",
type: "GET",
async: false,
data: {
- "HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
+ "HMaterID": HMaterID, "HProcID": HProcID,"SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data;
var tableSub = result.data;
--
Gitblit v1.9.1