From becdff314aa755f63e2d27ee2d9b161782eff722 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 21 十一月 2023 16:59:52 +0800
Subject: [PATCH] 用户列表优化 单品过站输入流转卡带出之前有保存的出站单 否则新增
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 34 ++++++--
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 144 ++++++++++++++++++++++++++++++++++++
WebTM/views/index.html | 3
WebTM/WebTM.csproj | 3
4 files changed, 175 insertions(+), 9 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 720228c..4940b4e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -324,12 +324,15 @@
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\BadQueryReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZTFB.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_ProcessItemBGA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_ProcessItemBGA_PJGH.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_ProcessItemStationPlatform.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\RetrospectiveQueryReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Sc_SourceLineRepairBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_ProcessExchangeBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ICMOBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index d80c364..215e9a5 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -600,7 +600,8 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA.html">宸ュ簭鍗曞搧杩斾慨鍙�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html">宸ュ簭鍗曞搧杩斾慨鍙�(閰嶄欢鏇存崲)</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Sc_SourceLineRepairBillList.html">杩斾慨璁板綍鍒楄〃</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">杩芥函鏌ヨ鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">鍚堟牸杩芥函鏌ヨ鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/BadQueryReport.html">涓嶈壇杩芥函鏌ヨ鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index bc0b58e..b59284a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -124,6 +124,18 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀵瑰簲鐝粍</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HGroupID" id="HGroupID" value="0" hidden>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHGroup" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -145,6 +157,18 @@
<input type="text" name="HSecManager" id="HSecManager" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HSecManagerID" id="HSecManagerID" value="0" hidden>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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">
+ <label class="layui-form-label">瀵瑰簲鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceName" id="HSourceName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceID" id="HSourceID" value="0" hidden>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHSource" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -211,6 +235,18 @@
<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HSupID" id="HSupID" value="0" hidden>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" 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">
+ <label class="layui-form-label">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <input type="text" name="HProcName" id="HProcName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HProcID" id="HProcID" value="0" hidden>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProc" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -367,6 +403,21 @@
//琛ㄥご淇℃伅 渚涘簲鍟嗗脊绐�
form.on('submit(HSupList)', function () {
Gy_Supplier();
+ });
+
+ //琛ㄥご淇℃伅 宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ btnHProc();
+ });
+
+ //琛ㄥご淇℃伅 鐝粍
+ form.on('submit(btnHGroup)', function () {
+ btnHGroup();
+ });
+
+ //琛ㄥご淇℃伅 鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
});
@@ -696,6 +747,93 @@
});
}
+ //宸ュ簭鍒楄〃
+ function btnHProc() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/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(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
+
+ //鐝粍鍒楄〃
+ function btnHGroup() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
+
+ //鐢熶骇璧勬簮鍒楄〃
+ function btnHSource() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ });
+ }
+
//缂栬緫鑾峰彇琛ㄥご淇℃伅
function set_EditFromGrid(linterid)
{
@@ -735,6 +873,12 @@
, "HCloudUserName": data.瀵瑰簲CLOUD璐﹀彿
, "HCloudUserPsd": data.HCloudUserPsd
, "HOrgID": data.HUSEORGID
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭
+ , "HGroupID": data.HGroupID
+ , "HGroupName": data.鐝粍
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮
});
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 7563096..036f608 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -457,7 +457,7 @@
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
$("#HBardCodeProcExchBillNo").focus();
- createBillNo();
+
get_Display();
get_CriticalPartsList();//鍏抽敭浠舵竻鍗� 涓嶈壇璁板綍 鍚堟牸璁板綍
@@ -465,14 +465,28 @@
// 鐢熸垚鍗曟嵁鍙�
function createBillNo() {
+ var sql = "select * from Sc_StationOutBillMain where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val()
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
async: false,
type: "GET",
- data: { "HBillType": '3791' },
- success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
+ data: { "sWhere": sql },
+ success: function (data) {
+ if (data.data.length > 0) {
+ $("#HInterID").val(data.data[0].HInterID);
+ $("#HBillNo").val(data.data[0].HBillNo);
+ } else {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ async: false,
+ type: "GET",
+ data: { "HBillType": '3791' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
}
});
}
@@ -814,6 +828,8 @@
$("#HPieceQty").val(data1.data[0]["HPieceQty"]);
$("#HICMOQty").val(data1.data[0]["HICMOQty"]);
+ createBillNo();
+
option.data = data1.data;
table.render(option)
}
@@ -838,6 +854,8 @@
$("#HProcNo").val(data1.data[0]["HProcNo"]);
$("#HPieceQty").val(data1.data[0]["HPieceQty"]);
$("#HICMOQty").val(data1.data[0]["HICMOQty"]);
+
+ createBillNo();
} else {
layer.close(index);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1093,9 +1111,9 @@
//涓嶈壇姹囨姤
function BadReport() {
- var HBarCode_P = $("#HBarCode_P").val();
+ var len = option3.data.length;
- if (HBarCode_P != "") {
+ if (len != 0) {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
--
Gitblit v1.9.1