From ca334af0775c9e5df55dfc38b99e91bcbf9fa1b7 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 26 一月 2021 10:56:10 +0800
Subject: [PATCH] nothing
---
WebTM/views/user/login.html | 2
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 39 +
WebTM/views/车间管理/报表分析/Sc_ProductionProcessDetailsReport.html | 239 +++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 365 ++++++++++++
WebTM/views/工序汇报/MES_StationInBill_PDA.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 340 +++++++++++
WebTM/views/工序汇报/MES_StationInBillList.html | 205 +++--
WebTM/views/工序汇报/MES_StationOutBill_PDA.html | 8
WebTM/views/工序汇报/MES_StationOutBillList.html | 93 ++-
WebTM/views/车间管理/报表分析/Qk_OutProcessList.html | 222 +++++++
WebTM/views/index.html | 20
WebTM/views/车间管理/报表分析/Sc_WorkShopReport.html | 253 ++++++++
WebTM/WebTM.csproj | 5
13 files changed, 1,667 insertions(+), 130 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 459f87f..9643ad2 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>01/21/2021 11:58:12</publishTime>
+ <publishTime>01/24/2021 11:27:32</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>01/21/2021 11:58:12</publishTime>
+ <publishTime>01/24/2021 11:27:32</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -580,7 +580,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>01/21/2021 11:35:01</publishTime>
+ <publishTime>01/24/2021 18:00:37</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -952,7 +952,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>01/21/2021 20:23:40</publishTime>
+ <publishTime>01/24/2021 11:50:07</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1051,7 +1051,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>01/21/2021 19:29:19</publishTime>
+ <publishTime>01/26/2021 00:29:42</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1084,19 +1084,19 @@
<publishTime>01/14/2021 14:48:04</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>01/21/2021 20:21:06</publishTime>
+ <publishTime>01/24/2021 22:22:53</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>01/21/2021 20:16:54</publishTime>
+ <publishTime>01/26/2021 00:32:20</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill.html">
<publishTime>01/19/2021 22:22:31</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>01/21/2021 20:21:21</publishTime>
+ <publishTime>01/24/2021 21:53:51</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
- <publishTime>01/21/2021 20:18:12</publishTime>
+ <publishTime>01/26/2021 00:33:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>01/21/2021 15:23:36</publishTime>
@@ -1107,6 +1107,27 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>01/21/2021 15:28:28</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
+ <publishTime>01/22/2021 16:21:03</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
+ <publishTime>01/22/2021 11:22:39</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
+ <publishTime>01/24/2021 13:23:03</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">
+ <publishTime>01/22/2021 16:38:54</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkProcReport.html">
+ <publishTime>01/22/2021 16:03:10</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport - 澶嶅埗%282%29.html">
+ <publishTime>01/22/2021 16:16:06</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">
+ <publishTime>01/22/2021 17:04:03</publishTime>
+ </File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5208101..04da1d9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -425,6 +425,11 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillList.html" />
<Content Include="views\缁勮鍗昞Sc_AssemblyBill_Fast.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductionProcessDetailsReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_Fast.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 12be0ee..f8920fd 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -125,6 +125,26 @@
</dd>
</dl>
</li>
+ <li data-name="set" class="layui-nav-item">
+ <a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠＄悊</cite></a>
+ <dl class="layui-nav-child">
+ <dd class="layui-nav-itemed">
+ <a>宸ュ簭娴佽浆鍗�</a>
+ <dl class="layui-nav-child">
+ <!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>-->
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗″垪琛�</a></dd>
+ </dl>
+ </dd>
+ <dd class="layui-nav-itemed">
+ <a>鎶ヨ〃鍒嗘瀽</a>
+ <dl class="layui-nav-child">
+ <!--<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">杞﹂棿杩涘害璺熻釜琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">鐢熶骇宸ュ簭鏄庣粏琛�</a></dd>-->
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">澧欏挃宸ヨ祫缁熻鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </li>
<li data-name="template" class="layui-nav-item">
<a href="javascript:;" lay-tips="楠屾敹鍏ュ簱" lay-direction="2">
<i class="layui-icon layui-icon-component"></i>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index a81c4d5..01d434e 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -109,6 +109,7 @@
sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
//sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
window.location.href = '../../views/index.html'
@@ -171,6 +172,7 @@
sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
//sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
index 37b5f39..8e87e07 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,11 @@
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
-
+ <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -25,28 +29,28 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <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>
+ <label class="layui-form-label">浠诲姟鍗�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <input type="text" class="layui-input" name="浠诲姟鍗�" id="浠诲姟鍗�">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <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>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</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">
@@ -54,21 +58,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ヤ綔涓績</label>
+ <label class="layui-form-label">宸ュ簭娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ <input type="text" class="layui-input" name="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">娴佽浆鍗″彿</label>
+ <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>
<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
+ <label class="layui-form-label">鐢熶骇鐝粍</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaker" id="HMaker">
+ <input type="text" class="layui-input" name="鐢熶骇鐝粍" id="鐢熶骇鐝粍">
</div>
</div>
</div>
@@ -79,21 +83,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鎿嶄綔鍛�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hname" id="hname">
+ <input type="text" class="layui-input" name="鎿嶄綔鍛�" id="鎿嶄綔鍛�">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label">瀹㈡埛淇℃伅</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ <input type="text" class="layui-input" name="瀹㈡埛淇℃伅" id="瀹㈡埛淇℃伅">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <label class="layui-form-label">鑱旂郴浜轰俊鎭�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ <input type="text" class="layui-input" name="鑱旂郴浜轰俊鎭�" id="鑱旂郴浜轰俊鎭�">
</div>
</div>
</div>
@@ -117,31 +121,32 @@
</div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ , height: 'full-50'
, page: true
, cols: [[
//{ field: 'HEmpID', title: 'HEmpID', sort: true, width: 110 }
@@ -149,31 +154,59 @@
//, { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165 }
//, { field: 'HProcID', title: 'HProcID', width: 175 }
//, { field: 'HSourceID', title: 'HSourceID', width: 170 }
- { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 120 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
- , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
- , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ {
+ field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.杩涚珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 140 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 145 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 145 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 90 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 90 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 90 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 90 }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 80 }
+ , { field: '瀹㈡埛淇℃伅', title: '瀹㈡埛淇℃伅', width: 250 }
+ , { field: '鑱旂郴浜轰俊鎭�', title: '鑱旂郴浜轰俊鎭�', width: 100 }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
//, { field: 'hmainid', title: 'hmainid', width: 160 }
//, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
//, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 80 }
//, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 80 }
//, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
-
]]
};
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ layer.msg(JSON.stringify(obj.data), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.close(index);
+ //鍚戞湇鍔＄鍙戦�佸垹闄ゆ寚浠�
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/api/newBill/getStationInBillList',
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -189,63 +222,63 @@
skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
});
}
- });
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- $("#WorkCenter").val("");//宸ヤ綔涓績
- $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
- $("#HMaker").val("");//鍒跺崟浜�
- $("#hname").val("");//浜у搧鍚嶇О
- $("#hnumber").val("");//浜у搧浠ｇ爜
- $("#hmodel").val("");//瑙勬牸鍨嬪彿
+ $("#杩涚珯鏃堕棿").val("");//杩涚珯鏃堕棿
+ $("#浠诲姟鍗�").val("");//浠诲姟鍗�
+ $("#鍗曟嵁鍙�").val("");//鍗曟嵁鍙�
+ $("#宸ュ簭娴佽浆鍗″彿").val("");//宸ュ簭娴佽浆鍗″彿
+ $("#浜у搧鍚嶇О").val("");//浜у搧鍚嶇О
+ $("#鐢熶骇鐝粍").val("");//鐢熶骇鐝粍
+ $("#鎿嶄綔鍛�").val("");//鎿嶄綔鍛�
+ $("#瀹㈡埛淇℃伅").val("");//瀹㈡埛淇℃伅
+ $("#鑱旂郴浜轰俊鎭�").val("");//鑱旂郴浜轰俊鎭�
$("#btnSearch").click();
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- var WorkCenter = $("#WorkCenter").val();//宸ヤ綔涓績
- var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
- var HMaker = $("#HMaker").val();//鍒跺崟浜�
- var hname = $("#hname").val();//浜у搧鍚嶇О
- var hnumber = $("#hnumber").val();//浜у搧浠ｇ爜
- var hmodel = $("#hmodel").val();//瑙勬牸鍨嬪彿
- if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ 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 (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ if (浠诲姟鍗�) {
+ sWhere += " and 浠诲姟鍗� like '%" + 浠诲姟鍗� + "%'";
}
- if (HOrderProcNO) {
- sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ if (鍗曟嵁鍙�) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + 鍗曟嵁鍙� + "%'";
}
- if (WorkCenter) {
- sWhere += " and 宸ヤ綔涓績 like '%" + WorkCenter + "%'";
+ if (宸ュ簭娴佽浆鍗″彿) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
}
- if (HProcExchBillNo) {
- sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ if (浜у搧鍚嶇О) {
+ sWhere += " and 浜у搧鍚嶇О like '%" + 浜у搧鍚嶇О + "%'";
}
- if (HMaker) {
- sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'";
+ if (鐢熶骇鐝粍) {
+ sWhere += " and 鐢熶骇鐝粍 like '%" + 鐢熶骇鐝粍 + "%'";
}
- if (hname) {
- sWhere += " and 浜у搧鍚嶇О like '%" + hname + "%'";
+ if (鎿嶄綔鍛�) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + 鎿嶄綔鍛� + "%'";
}
- if (hnumber) {
- sWhere += " and 浜у搧浠ｇ爜 like '%" + hnumber + "%'";
+ if (瀹㈡埛淇℃伅) {
+ sWhere += " and 瀹㈡埛淇℃伅 like '%" + 瀹㈡埛淇℃伅 + "%'";
}
- if (hmodel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + hmodel + "%'";
+ if (鑱旂郴浜轰俊鎭�) {
+ sWhere += " and 鑱旂郴浜轰俊鎭� like '%" + 鑱旂郴浜轰俊鎭� + "%'";
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/api/newBill/getStationInBillList',
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -275,7 +308,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
</script>
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
index 84188d9..a7d711e 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
@@ -75,7 +75,8 @@
<tr>
<th>宸ュ簭浠ｇ爜</th>
<td class="t1_input">
- <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -217,7 +218,8 @@
$("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
$("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
- $("#HProcID").val(sessionStorage["HProcName"]);
+ $("#HProcName").val(sessionStorage["HProcName"]);//宸ュ簭浠ｇ爜
+ $("#HProcID").val(sessionStorage["HProcID"]);//宸ュ簭ID
$("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
$("#HSourceID").val(sessionStorage["HSourceID"]);
$("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
index 69789d2..622da6d 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,10 @@
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
-
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -58,7 +61,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -79,45 +82,57 @@
</div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ , height: 'full-50'
, page: true
, cols: [[
- { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 120 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
- , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
- , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ {
+ field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.鍑虹珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 140 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 145 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 145 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 90 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 90 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 90 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 90 }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 80 }
+ , { field: '瀹㈡埛淇℃伅', title: '瀹㈡埛淇℃伅', width: 250 }
+ , { field: '鑱旂郴浜轰俊鎭�', title: '鑱旂郴浜轰俊鎭�', width: 100 }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
//,{ field: 'HEmpID', title: 'HEmpID', width: 110 }
//, { field: 'HGroupID', title: 'HGroupID', sort: true, width: 165 }
//, { field: 'HMaterID', title: 'HMaterID', width: 175 }
@@ -132,10 +147,28 @@
]]
};
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ layer.msg(JSON.stringify(obj.data), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.close(index);
+ //鍚戞湇鍔＄鍙戦�佸垹闄ゆ寚浠�
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
+ url: GetWEBURL() + '/api/newBill/getStationOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -151,7 +184,7 @@
skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
});
}
- });
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -207,7 +240,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
</script>
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
index f0c432d..8ccaa3f 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
@@ -75,7 +75,8 @@
<tr>
<th>宸ュ簭浠ｇ爜</th>
<td class="t1_input">
- <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -237,7 +238,8 @@
$("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
$("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
- $("#HProcID").val(sessionStorage["HProcName"]);
+ $("#HProcName").val(sessionStorage["HProcName"]);//宸ュ簭浠ｇ爜
+ $("#HProcID").val(sessionStorage["HProcID"]);//宸ュ簭ID
$("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
$("#HSourceID").val(sessionStorage["HSourceID"]);
$("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
@@ -251,7 +253,7 @@
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- data: { "HBillType": '3791' },
+ data: { "billType": '3791' },
success: function (d) {
$("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
$("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
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"
new file mode 100644
index 0000000..4753de1
--- /dev/null
+++ "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"
@@ -0,0 +1,340 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ簭娴佽浆鍗�</title><!--杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html-->
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 20px;height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="text-align: center;font-size: 24px;">
+ <span >宸ュ簭娴佽浆鍗�</span>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-MoveStockBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--琛ㄥご淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="t1_input">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�2</th>
+ <td class="t1_input">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-MoveStockBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鏄庣粏淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cols: [[
+ //{ field: 'HEmpID', title: 'HEmpID', sort: true, width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', width: 110 }
+ //, { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165 }
+ //, { field: 'HProcID', title: 'HProcID', width: 175 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 170 }
+ { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 120 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ , { field: '瀹㈡埛淇℃伅', title: '瀹㈡埛淇℃伅', width: 100 }
+ , { field: '鑱旂郴浜轰俊鎭�', title: '鑱旂郴浜轰俊鎭�', width: 100 }
+ //, { field: 'hmainid', title: 'hmainid', width: 160 }
+ //, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
+ //, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 80 }
+ //, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 80 }
+ //, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
+ ]]
+ };
+
+ table.render(option);
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationInBillList;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HDate").val("");//寮�濮嬫棩鏈�
+ $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
+ $("#WorkCenter").val("");//宸ヤ綔涓績
+ $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
+ $("#HMaker").val("");//鍒跺崟浜�
+ $("#hname").val("");//浜у搧鍚嶇О
+ $("#hnumber").val("");//浜у搧浠ｇ爜
+ $("#hmodel").val("");//瑙勬牸鍨嬪彿
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
+ var WorkCenter = $("#WorkCenter").val();//宸ヤ綔涓績
+ var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
+ var HMaker = $("#HMaker").val();//鍒跺崟浜�
+ var hname = $("#hname").val();//浜у搧鍚嶇О
+ var hnumber = $("#hnumber").val();//浜у搧浠ｇ爜
+ var hmodel = $("#hmodel").val();//瑙勬牸鍨嬪彿
+ if (HDate) {
+ sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ }
+ if (HOrderProcNO) {
+ sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 宸ヤ綔涓績 like '%" + WorkCenter + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (HMaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'";
+ }
+ if (hname) {
+ sWhere += " and 浜у搧鍚嶇О like '%" + hname + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + hnumber + "%'";
+ }
+ if (hmodel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + hmodel + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationInBillList;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
new file mode 100644
index 0000000..769f764
--- /dev/null
+++ "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_ProcessExchangeBillList.html"
@@ -0,0 +1,365 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ュ簭娴佽浆鍗″垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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" style="width:100px">
+ <select name="city" lay-verify="required" id="SHPrintQty">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�">鏈墦鍗�</option>
+ <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ </select>
+ </div>
+ </div>
+ <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate">
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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="HOrderProcNO" id="HOrderProcNO">
+ </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="SHname">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <style>
+ .layui-table-cell{
+ height:22px;
+ }
+ </style>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+ var wybj = false;
+
+ //涓昏〃鍒楄〃
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,page: true
+ , height: 256
+ , cellMinWidth: 90
+ , cols: [[
+ //{ field: 'hmainid', title: 'hmainid', width: 90 }
+ { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+ , { field: '绫诲瀷', title: '绫诲瀷' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort:true }
+ , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
+ //, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80 }
+ //, { field: 'HDeptID', title: 'HDeptID', width: 80 }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+ , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+ //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
+ , { field: '瀛愪欢浠ｇ爜', title: '瀛愪欢浠ｇ爜' }
+ , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
+ , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
+ , { field: '鎵瑰彿', title: '鎵瑰彿' }
+ , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
+ //, { field: 'HMaterID2', title: 'HMaterID2', width: 80 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ //, { field: 'HUnitID', title: 'HUnitID', width: 80 }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
+ , { field: '鍗曚綅', title: '鍗曚綅' }
+ , { field: '璁惧妯″叿浠ｇ爜', title: '璁惧妯″叿浠ｇ爜' }
+ , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
+ , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鎽樿', title: '鎽樿' }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ //, { field: 'HBillType', title: 'HBillType', width: 80 }
+ //, { field: 'hsubid', title: 'hsubid', width: 80 }
+ , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
+ ]]
+ ,text:"鏃犳暟鎹�!"
+ };
+
+ //浠庤〃鍒楄〃
+ var option2 = {
+ elem: '#mainTable2'
+ //, toolbar: '#toolbarDemo'
+ ,page: true
+ , height: 226
+ , cellMinWidth: 90
+ , cols: [[
+ //{ field: 'hsubid', title: 'hsubid' }
+ { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ //, { field: 'HProcID', title: 'HProcID' }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
+ , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ //, { field: 'hmainid', title: 'hmainid' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ //, { field: 'hicmointerid', title: 'hicmointerid' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ //, { field: 'HWorkShopID', title: 'HWorkShopID' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+ //, { field: 'HMaterID', title: 'HMaterID' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鎵瑰彿', title: '鎵瑰彿' }
+ //, { field: 'HUnitID', title: 'HUnitID' }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
+ , { field: '鍗曚綅', title: '鍗曚綅' }
+ , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鎽樿', title: '鎽樿' }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+ //, { field: 'HSupID', title: 'HSupID' }
+ , { field: '濮斿鍔犲伐鍗曚綅浠ｇ爜', title: '濮斿鍔犲伐鍗曚綅浠ｇ爜' }
+ , { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ //, { field: 'HBillType', title: 'HBillType' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺' }
+ , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺' }
+ , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺' }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+ , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
+ , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ , { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
+ , { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
+ , { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
+ , { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
+ , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
+ ]]
+ };
+ table.render(option);
+ table.render(option2);
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
+ wybj = false;//濮斿鏍囪
+ $("#HDate").val("");//寮�濮嬫棩鏈�
+ $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
+ $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+ $("#btnSearch").click();
+ });
+
+ form.on('checkbox(wybj)', function (data) {
+ wybj = data.elem.checked; //鏄惁琚�変腑锛宼rue鎴栬�協alse
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var SHPrintQty = $("#SHPrintQty").val();//鎵撳嵃鐘舵��
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
+ var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+ if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
+ if (SHPrintQty == "鍏ㄩ儴") {
+ sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
+ }
+ if (SHPrintQty == "宸叉墦鍗�") {
+ sWhere = " and 鎵撳嵃娆℃暟 > 0 ";
+ }
+ if (SHPrintQty == "鏈墦鍗�") {
+ sWhere = " and 鎵撳嵃娆℃暟 = 0 ";
+ }
+ }
+ if (wybj) {
+ sWhere += " and 濮斿鏍囪 = 'Y'";
+ }
+ if (HDate) {
+ sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ }
+ if (HOrderProcNO) {
+ sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ }
+ if (SHname) {
+ sWhere += " and 瀛愪欢鍚嶇О like '%" + SHname + "%' or 瀛愪欢瑙勬牸 like '%" + SHname + "%'"
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+ //鐩戝惉宸ュ叿鏉″垹闄や簨浠�
+ table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var HMainID = datas.hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+ type: "GET",
+ data: { "sWhere": HMainID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option2.data = data1.data;
+ table.render(option2);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ });
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Qk_OutProcessList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Qk_OutProcessList.html"
new file mode 100644
index 0000000..64e6987
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Qk_OutProcessList.html"
@@ -0,0 +1,222 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>澧欏挃宸ヨ祫缁熻鎶ヨ〃</title><!--杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html-->
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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="date" class="layui-input" id="HminDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎴鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HmaxDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HGroup" id="HGroup">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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="HProc" id="HProc">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囨姤浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HReporter" id="HReporter">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 100
+ , cols: [[
+ { field: '璧峰鏃堕棿', title: '璧峰鏃堕棿' }
+ , { field: '鎴嚦鏃堕棿', title: '鎴嚦鏃堕棿' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: '姹囨姤浜�', title: '姹囨姤浜�' }
+ , { field: '鍚堣姹囨姤鏁伴噺', title: '鍚堣姹囨姤鏁伴噺' }
+ , { field: '鍚堣宸ヨ祫', title: '鍚堣宸ヨ祫' }
+ ]]
+ };
+
+ var index = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Qk_OutProcessList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HminDate").val("");//寮�濮嬫椂闂�
+ $("#HmaxDate").val("");//鎴嚦鏃堕棿
+ $("#HGroup").val("");//鐝粍鍚嶇О
+ $("#HProc").val("");//宸ュ簭鍚嶇О
+ $("#HReporter").val("");//姹囨姤浜�
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var index = layer.load();
+ var HminDate = $("#HminDate").val();//寮�濮嬫椂闂�
+ var HmaxDate = $("#HmaxDate").val();//鎴嚦鏃堕棿
+ var HGroup = $("#HGroup").val();//鐝粍鍚嶇О
+ var HProc = $("#HProc").val();//宸ュ簭鍚嶇О
+ var HReporter = $("#HReporter").val();//姹囨姤浜�
+ if (HminDate) {
+ sWhere += " and 璧峰鏃堕棿 >= '" + HminDate + "'";
+ }
+ if (HmaxDate) {
+ sWhere += " and 鎴嚦鏃堕棿 <= '" + HmaxDate + "'";
+ }
+ if (HGroup) {
+ sWhere += " and 鐝粍鍚嶇О like '%" + HGroup + "%'";
+ }
+ if (HProc) {
+ sWhere += " and 宸ュ簭鍚嶇О like '%" + HProc + "%'";
+ }
+ if (HReporter) {
+ sWhere += " and 姹囨姤浜� like '%" + HReporter + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Qk_OutProcessList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProductionProcessDetailsReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProductionProcessDetailsReport.html"
new file mode 100644
index 0000000..7905a0f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProductionProcessDetailsReport.html"
@@ -0,0 +1,239 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇宸ュ簭鏄庣粏琛�</title><!--杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html-->
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <style>
+ /*璁剧疆鏌ヨ鏉′欢鏍囬杩囬暱鑰屽紩璧风殑鎹㈣*/
+ .layui-form-label {
+ padding: 9px 9px;
+ width: 85px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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="HOrderProcNO" id="HOrderProcNO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曟棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate">
+ </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">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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="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="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="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 100
+ , cols: [[
+ { field: '鍗曟嵁鍙�', title: '閿�鍞鍗曞彿' }
+ , { field: '鍗曟嵁绫诲瀷', title: '閿�鍞鍗曟棩鏈�',width:145 }
+ , { field: '宸ヨ壓鍚嶇О', title: '瀹㈡埛鍚嶇О' }
+ , { field: '鐗╂枡浠ｇ爜', title: '缁堢鑱旂郴浜�' }
+ , { field: '鐗╂枡鍚嶇О', title: '浜у搧缂栫爜' }
+ , { field: '瑙勬牸鍨嬪彿', title: '浜у搧鍚嶇О' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '鐗堝瀷' }
+ , { field: '璁￠噺鍗曚綅', title: '鏁伴噺' }
+ , { field: '榛樿宸ヨ壓', title: '宸ュ簭鍚嶇О' }
+ , { field: '琛ㄥご澶囨敞', title: '鐝粍鍚嶇О' }
+ , { field: '宸ュ簭鍙�', title: '涓婄嚎鏃堕棿' }
+ , { field: '濮斿鏍囪', title: '涓嬬嚎鏃堕棿' }
+ , { field: '宸ュ簭浠ｇ爜', title: '鍦烘櫙' }
+ , { field: '宸ュ簭', title: '鑺卞瀷' }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '鎴愬搧瀹�' }
+ , { field: '渚涘簲鍟�', title: '鎴愬搧楂�' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '鍔犲伐鍗曞彿' }
+ , { field: '宸ヤ綔涓績鍚嶇О', title: '鍔犲伐鏃堕棿' }
+ , { field: '鏃堕棿鍗曚綅', title: '鐢熶骇璁㈠崟鍗曞彿' }
+ ]]
+ };
+
+ table.render(option);
+ var index = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ //url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: "",
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var index = layer.load();
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ var hnumber = $("#hnumber").val();//鐗╂枡
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ //url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: "",
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.html"
new file mode 100644
index 0000000..6656700
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopReport.html"
@@ -0,0 +1,253 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>杞﹂棿杩涘害璺熻釜琛�</title><!--杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html-->
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <style>
+ /*璁剧疆鏌ヨ鏉′欢鏍囬杩囬暱鑰屽紩璧风殑鎹㈣*/
+ .layui-form-label {
+ padding: 9px 9px;
+ width: 85px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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="date" class="layui-input" id="HDate">
+ </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">
+ </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">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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="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="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="WorkCenter" id="WorkCenter">
+ </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="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ , cellMinWidth: 100
+ , cols: [[
+ { field: '鍗曟嵁鍙�', title: '璁㈠崟鏃ユ湡' }
+ , { field: '鍗曟嵁绫诲瀷', title: '璁㈠崟棰勮浜よ揣鏃堕棿',width:145 }
+ , { field: '宸ヨ壓鍚嶇О', title: '閿�鍞鍗曞彿' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐢熶骇璁㈠崟鍙�' }
+ , { field: '鐗╂枡鍚嶇О', title: '杞﹂棿娴佽浆鍗曞彿' }
+ , { field: '瑙勬牸鍨嬪彿', title: '鍦烘櫙' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '瀹㈡埛鍚嶇О' }
+ , { field: '璁￠噺鍗曚綅', title: '缁堢鑱旂郴浜�' }
+ , { field: '榛樿宸ヨ壓', title: '浜у搧鍚嶇О' }
+ , { field: '琛ㄥご澶囨敞', title: '鏁伴噺' }
+ , { field: '宸ュ簭鍙�', title: '鍗曚綅' }
+ , { field: '濮斿鏍囪', title: '瑁佸壀鐝粍鍚嶇О', width: 115 }
+ , { field: '宸ュ簭浠ｇ爜', title: '瑁佸壀姹囨姤鏃ユ湡', width: 115 }
+ , { field: '宸ュ簭', title: '澶嶅悎鐝粍鍚嶇О', width: 115 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '澶嶅悎姹囨姤鏃ユ湡', width: 115 }
+ , { field: '渚涘簲鍟�', title: '鍖呰鐝粍鍚嶇О', width: 115 }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '鍖呰姹囨姤鏃ユ湡', width: 115 }
+ , { field: '宸ヤ綔涓績鍚嶇О', title: '杈炬垚鎯呭喌' }
+ , { field: '鏃堕棿鍗曚綅', title: '鏁村崟鎽樿' }
+ , { field: '杩愯鏃堕棿', title: '棰嗘枡鐘舵��' }
+ , { field: '鍑嗗鏃堕棿', title: '杈炬垚鏃堕棿' }
+ ]]
+ };
+ table.render(option);
+ var index = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ //url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ table.reload(option);
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var index = layer.load();
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ var hnumber = $("#hnumber").val();//鐗╂枡
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ //url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1