From 3953959451482fb81dcd863670a53819efa587dc Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 31 三月 2021 20:27:29 +0800
Subject: [PATCH] 新增工序出站过滤
---
WebTM/views/车间管理/工序汇报/MES_StationOutBillList.html | 130 +++++++++++++++++++++++++++++++++----------
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 4
2 files changed, 101 insertions(+), 33 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 9a88ce4..5ab1a5f 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -583,7 +583,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>03/31/2021 13:02:09</publishTime>
+ <publishTime>03/31/2021 20:20:54</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1168,7 +1168,7 @@
<publishTime>03/10/2021 18:01:22</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>03/10/2021 18:08:53</publishTime>
+ <publishTime>03/31/2021 20:14:52</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
<publishTime>03/10/2021 18:59:25</publishTime>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
index ca505be..6e5699b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
@@ -24,37 +24,25 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑虹珯鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="date" class="layui-input" id="鍑虹珯鏃堕棿">
</div>
- </div>-->
- <!--<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
- </div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">浠诲姟鍗�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <input type="text" class="layui-input" name="浠诲姟鍗�" id="浠诲姟鍗�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">娴佽浆鍗″彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ <input type="text" class="layui-input" name="鍗曟嵁鍙�" id="鍗曟嵁鍙�">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -62,6 +50,56 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="浜у搧鍚嶇О" id="浜у搧鍚嶇О">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝粍</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鐢熶骇鐝粍" id="鐢熶骇鐝粍">
+ </div>
+ </div>
+ </div>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎿嶄綔鍛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鎿嶄綔鍛�" id="鎿嶄綔鍛�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="瀹㈡埛淇℃伅" id="瀹㈡埛淇℃伅">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱旂郴浜轰俊鎭�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鑱旂郴浜轰俊鎭�" id="鑱旂郴浜轰俊鎭�">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,25 +240,55 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- $("#WorkCenter").val("");//宸ヤ綔涓績
- $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
+ $("#鍑虹珯鏃堕棿").val("");//杩涚珯鏃堕棿
+ $("#浠诲姟鍗�").val("");//浠诲姟鍗�
+ $("#鍗曟嵁鍙�").val("");//鍗曟嵁鍙�
+ $("#宸ュ簭娴佽浆鍗″彿").val("");//宸ュ簭娴佽浆鍗″彿
+ $("#浜у搧鍚嶇О").val("");//浜у搧鍚嶇О
+ $("#鐢熶骇鐝粍").val("");//鐢熶骇鐝粍
+ $("#鎿嶄綔鍛�").val("");//鎿嶄綔鍛�
+ $("#瀹㈡埛淇℃伅").val("");//瀹㈡埛淇℃伅
+ $("#鑱旂郴浜轰俊鎭�").val("");//鑱旂郴浜轰俊鎭�
$("#btnSearch").click();
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- var WorkCenter = $("#WorkCenter").val();//宸ヤ綔涓績
- var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
- if (HOrderProcNO) {
- sWhere += " and 浠诲姟鍗� like '%" + HOrderProcNO + "%'";
+ var 鍑虹珯鏃堕棿 = $("#鍑虹珯鏃堕棿").val();//杩涚珯鏃堕棿
+ var 浠诲姟鍗� = $("#浠诲姟鍗�").val();//浠诲姟鍗�
+ var 鍗曟嵁鍙� = $("#鍗曟嵁鍙�").val();//鍗曟嵁鍙�
+ var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();//宸ュ簭娴佽浆鍗″彿
+ var 浜у搧鍚嶇О = $("#浜у搧鍚嶇О").val();//浜у搧鍚嶇О
+ var 鐢熶骇鐝粍 = $("#鐢熶骇鐝粍").val();//鐢熶骇鐝粍
+ var 鎿嶄綔鍛� = $("#鎿嶄綔鍛�").val();//鎿嶄綔鍛�
+ var 瀹㈡埛淇℃伅 = $("#瀹㈡埛淇℃伅").val();//瀹㈡埛淇℃伅
+ var 鑱旂郴浜轰俊鎭� = $("#鑱旂郴浜轰俊鎭�").val();//鑱旂郴浜轰俊鎭�
+ if (鍑虹珯鏃堕棿) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) = '" + 鍑虹珯鏃堕棿 + "'";
}
- if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ if (浠诲姟鍗�) {
+ sWhere += " and 浠诲姟鍗� like '%" + 浠诲姟鍗� + "%'";
}
- if (HProcExchBillNo) {
- sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ if (鍗曟嵁鍙�) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + 鍗曟嵁鍙� + "%'";
+ }
+ if (宸ュ簭娴佽浆鍗″彿) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
+ }
+ if (浜у搧鍚嶇О) {
+ sWhere += " and 浜у搧鍚嶇О like '%" + 浜у搧鍚嶇О + "%'";
+ }
+ if (鐢熶骇鐝粍) {
+ sWhere += " and 鐢熶骇鐝粍 like '%" + 鐢熶骇鐝粍 + "%'";
+ }
+ if (鎿嶄綔鍛�) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + 鎿嶄綔鍛� + "%'";
+ }
+ if (瀹㈡埛淇℃伅) {
+ sWhere += " and 瀹㈡埛淇℃伅 like '%" + 瀹㈡埛淇℃伅 + "%'";
+ }
+ if (鑱旂郴浜轰俊鎭�) {
+ sWhere += " and 鑱旂郴浜轰俊鎭� like '%" + 鑱旂郴浜轰俊鎭� + "%'";
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
--
Gitblit v1.9.1