From a7f249aba00079f45a5ae2ea04f6d324825b3e87 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 14:39:31 +0800
Subject: [PATCH] 染厂项目模块开发；（子工艺路线 功能 、工序子流转卡 功能； HBillSubType varchar(50) --单据子类型（SUB） HMainProcID int //工序 ） 主工艺 路线列表 过滤 HBillSubType<>'SUB' 主工序流转卡列表 过滤 <>'SUB' 子工艺路线列表 ='SUB' PDA 增加 指引卡开工单（模块名：Sc_StationInSubBill 单据类型 ：379002）；（沿用 工序进站接收单 表结构， Hbillsubtype 为 SUB， 可以考虑用同一个 模块， 标题根据菜单来变） PDA 增加 指引卡完工单（模块名：Sc_StationOutSubBill 单据类型 ：379102）；（沿用 工序出站汇报单 表结构， Hbillsubtype 为 SUB， 可以考虑用同一个 模块， 标题根据菜单来变）
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 46 +++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 62 ++++++++++++--
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 62 +++++++++++++++
WebTM/views/index.html | 3
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 10 ++
5 files changed, 166 insertions(+), 17 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e67e69b..c93ee76 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -301,6 +301,7 @@
<a>宸ヨ壓璺嚎</a>
<dl class="layui-nav-child">
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillSubList.html">宸ヨ壓瀛愯矾绾跨淮鎶�</a></dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">宸ヨ壓璺嚎鏌ヨ</a></dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList_His.html">宸ヨ壓璺嚎鍘嗗彶璁板綍</a></dd>
@@ -458,7 +459,7 @@
<dd>
<a>宸ュ簭娴佽浆</a>
<dl class="layui-nav-child">
- <!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>-->
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 47aaec6..34cdf5e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -263,18 +263,28 @@
<input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏆傛斁鍖�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HTemporaryAreaName" id="HTemporaryAreaName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" value="0" name="HTemporaryAreaID" id="HTemporaryAreaID">
+ </div>
+ </div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ユ椂</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁惧娓呭崟</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">宸ユ椂</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁惧娓呭崟</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs4 layui-inline">
@@ -766,6 +776,8 @@
"HSourceName": data.HSourceName,
"HQCCheckID": data.HQCCheckID,
"HQCCheckName": data.HQCCheckName,
+ "HTemporaryAreaID": data.HTemporaryAreaID,
+ "HTemporaryAreaName": data.HTemporaryAreaName,
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
"HEmpID2": data.HEmpID2,
@@ -1460,6 +1472,34 @@
})
});
+ //鏆傛斁鍖�
+ form.on('submit(BtnHTemporaryAreaName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏆傛斁鍖哄垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
+ $("#HTemporaryAreaName").val(checkStatus.data[0].鏆傛斁鍖哄悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+
+
//閫夋嫨鐢熶骇璧勬簮寮圭獥
form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
layer.open({
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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
index 633801c..196e7ed 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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
@@ -434,6 +434,12 @@
txtHBarCode_KeyDown(HBarCode);
txtHProcNo_KeyDown(HBarCode, sProcNo);
}
+ } else if (params[params[0]] == "kgd") {
+ var OperationType = 5;
+
+ } else if (params[params[0]] == "jzd") {
+ var OperationType = 1;
+
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
@@ -443,7 +449,7 @@
}
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1 || OperationType == 2) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -548,7 +554,7 @@
return;
}
//console.log(data.field);
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
//var oMain = data.field;
var HUserName = sessionStorage["HUserName"];
var index = layer.load();
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index aacd2f9..e7d8096 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -223,6 +223,14 @@
</td>
</tr>
<tr>
+ <th>鏆傛斁鍖�</th>
+ <td class="bz_td">
+ <input type="text" name="HTemporaryAreaName" class="layui-input" id="HTemporaryAreaName" placeholder="閫夋嫨鏆傛斁鍖�" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HTemporaryAreaID" id="HTemporaryAreaID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
<th>娴佽浆鍗″彿</th>
<td class="bz_td">
<input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -452,7 +460,13 @@
txtHProcNo_KeyDown(HBarCode, sProcNo);
get_DisplayTech(HBillNo);
}
- } else {
+ } else if (params[params[0]] == "kgd") {
+ var OperationType = 5;
+
+ } else if (params[params[0]] == "jzd") {
+ var OperationType = 1;
+
+ } else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -578,6 +592,8 @@
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
"HEmpName_second": data.HEmpName,
+ "HTemporaryAreaID": data.HTemporaryAreaID,
+ "HTemporaryAreaName": data.HTemporaryAreaName,
"HEmpID2": data.HEmpID2,
"HEmpName2": data.HEmpName2,
"HEmpID3": data.HEmpID3,
@@ -1331,7 +1347,7 @@
}
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";"+OperationType;
var index = layer.load();
$.ajax({
type: "POST",
@@ -1552,6 +1568,32 @@
})
});
+ //鏆傛斁鍖�
+ form.on('submit(BtnHTemporaryAreaName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏆傛斁鍖哄垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
+ $("#HTemporaryAreaName").val(checkStatus.data[0].鏆傛斁鍖哄悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
//閫夋嫨鐢熶骇璧勬簮寮圭獥
form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
layer.open({
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/MES_StationOutBill_PDA_QiaoYi.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/MES_StationOutBill_PDA_QiaoYi.html"
index ef6764c..68011bc 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/MES_StationOutBill_PDA_QiaoYi.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/MES_StationOutBill_PDA_QiaoYi.html"
@@ -173,7 +173,7 @@
<input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
</td>
</tr>
- <tr>
+ <tr>
<th>姹囨�诲彂甯冩暟閲�</th>
<td class="bz_td">
<input type="text" name="Hzfbsl" class="layui-input" id="Hzfbsl" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
@@ -185,6 +185,14 @@
<input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
<input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鏆傛斁鍖�</th>
+ <td class="bz_td">
+ <input type="text" name="HTemporaryAreaName" class="layui-input" id="HTemporaryAreaName" placeholder="閫夋嫨鏆傛斁鍖�" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HTemporaryAreaID" id="HTemporaryAreaID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
@@ -605,6 +613,8 @@
"HSourceName": data.HSourceName,
"HQCCheckID": data.HQCCheckID,
"HQCCheckName": data.HQCCheckName,
+ "HTemporaryAreaID": data.HTemporaryAreaID,
+ "HTemporaryAreaName": data.HTemporaryAreaName,
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
"HEmpName_second": data.HEmpName,
@@ -1564,6 +1574,56 @@
})
});
+ //鏆傛斁鍖�
+ form.on('submit(BtnHTemporaryAreaName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏆傛斁鍖哄垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
+ $("#HTemporaryAreaName").val(checkStatus.data[0].鏆傛斁鍖哄悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+ //鏆傛斁鍖�
+ form.on('submit(BtnHTemporaryAreaName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏆傛斁鍖哄垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
+ $("#HTemporaryAreaName").val(checkStatus.data[0].鏆傛斁鍖哄悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
//閫夋嫨鐢熶骇璧勬簮寮圭獥
form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
layer.open({
--
Gitblit v1.9.1