zgq
2021-01-26 ca334af0775c9e5df55dfc38b99e91bcbf9fa1b7
nothing
8个文件已修改
5个文件已添加
1797 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/user/login.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工序汇报/MES_StationInBillList.html 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工序汇报/MES_StationInBill_PDA.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工序汇报/MES_StationOutBillList.html 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工序汇报/MES_StationOutBill_PDA.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 340 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 365 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Qk_OutProcessList.html 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_ProductionProcessDetailsReport.html 239 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopReport.html 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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" />
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>
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");
WebTM/views/¹¤Ðò»ã±¨/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 @@
            //以上是layui模块
        });
    </script>
WebTM/views/¹¤Ðò»ã±¨/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"]);//生产班组
WebTM/views/¹¤Ðò»ã±¨/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 @@
            //以上是layui模块
        });
    </script>
WebTM/views/¹¤Ðò»ã±¨/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
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
New file
@@ -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 = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
New file
@@ -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; //是否被选中,true或者false
            });
            //查询按钮
            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 = "";//调用接口后清空sWhere缓存
            });
            //监听工具条删除事件
            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 });
                    }
                });
            });
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Qk_OutProcessList.html
New file
@@ -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 = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_ProductionProcessDetailsReport.html
New file
@@ -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 = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopReport.html
New file
@@ -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 = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>