2021-03-10统一更新

zgq

2021-03-10 1382e7f901677dce9db97ba25d9095668c1cb67f

2021-03-10统一更新

 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>02/24/2021 20:38:29</publishTime>
      <publishTime>03/10/2021 18:20:18</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>02/24/2021 20:38:29</publishTime>
      <publishTime>03/10/2021 18:20:18</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
@@ -535,7 +535,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="layuiadmin/modules/common.js">
      <publishTime>01/14/2021 10:06:24</publishTime>
      <publishTime>03/10/2021 19:08:20</publishTime>
    </File>
    <File Include="layuiadmin/modules/console.js">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -583,7 +583,7 @@
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>02/21/2021 23:22:54</publishTime>
      <publishTime>03/10/2021 19:45:42</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -943,7 +943,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/home/console.html">
      <publishTime>02/24/2021 23:28:50</publishTime>
      <publishTime>03/10/2021 18:27:44</publishTime>
    </File>
    <File Include="views/home/homepage1.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -955,7 +955,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>02/24/2021 22:41:59</publishTime>
      <publishTime>03/10/2021 18:24:32</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1054,7 +1054,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/user/login.html">
      <publishTime>02/18/2021 16:27:56</publishTime>
      <publishTime>03/05/2021 16:14:11</publishTime>
    </File>
    <File Include="views/user/reg.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1075,13 +1075,13 @@
      <publishTime>11/26/2020 17:27:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForBill.html">
      <publishTime>02/24/2021 17:31:17</publishTime>
      <publishTime>03/09/2021 17:00:01</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForBillList.html">
      <publishTime>02/26/2021 21:06:26</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html">
      <publishTime>02/25/2021 14:27:14</publishTime>
      <publishTime>03/09/2021 21:11:23</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForReturnBillList.html">
      <publishTime>02/23/2021 11:59:48</publishTime>
@@ -1092,6 +1092,9 @@
    <File Include="views/仓存管理/仓库调拨/Cc_WaitingLookingFor.html">
      <publishTime>02/25/2021 14:28:42</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_LookingForBillList.html">
      <publishTime>03/10/2021 17:15:37</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>02/25/2021 16:14:07</publishTime>
    </File>
@@ -1100,6 +1103,9 @@
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_UpMoveStockBill.html">
      <publishTime>02/05/2021 16:57:13</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_WaitingLookingFor.html">
      <publishTime>02/25/2021 14:28:42</publishTime>
    </File>
    <File Include="views/仓库调拨/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1126,7 +1132,7 @@
      <publishTime>01/14/2021 14:48:04</publishTime>
    </File>
    <File Include="views/工序汇报/MES_StationInBillList.html">
      <publishTime>01/26/2021 13:03:12</publishTime>
      <publishTime>03/03/2021 15:36:52</publishTime>
    </File>
    <File Include="views/工序汇报/MES_StationInBill_PDA.html">
      <publishTime>01/26/2021 00:32:20</publishTime>
@@ -1148,6 +1154,24 @@
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>01/21/2021 15:28:28</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBill.html">
      <publishTime>03/10/2021 18:01:22</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBillList.html">
      <publishTime>03/10/2021 18:10:26</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBill_PDA.html">
      <publishTime>03/10/2021 18:57:30</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBill.html">
      <publishTime>03/10/2021 18:01:22</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBillList.html">
      <publishTime>03/10/2021 18:08:53</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBill_PDA.html">
      <publishTime>03/10/2021 18:59:25</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html">
      <publishTime>01/22/2021 16:21:03</publishTime>
@@ -1201,7 +1225,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>02/26/2021 21:06:20</publishTime>
      <publishTime>03/10/2021 17:51:39</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1225,7 +1249,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_Fast.html">
      <publishTime>02/26/2021 19:01:53</publishTime>
      <publishTime>03/10/2021 19:28:30</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1255,7 +1279,7 @@
      <publishTime>03/04/2020 11:43:34</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_Fast.html">
      <publishTime>02/20/2021 14:48:15</publishTime>
      <publishTime>03/10/2021 19:28:55</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1270,7 +1294,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_Fast.html">
      <publishTime>02/20/2021 14:48:02</publishTime>
      <publishTime>03/10/2021 19:29:17</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>

 WebTM/WebTM.csproj

@@ -414,26 +414,25 @@
    <Content Include="views\user\user\userform.html" />
    <Content Include="views\user\说明.txt" />
    <Content Include="views\不良汇报\Xs_SeOrderPickUp.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_WaitingLookingFor.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForReturnBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForReturnBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_LookingForBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_UpMoveStockBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\公共页面\Kf_BarCodeEditDlg.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.html" />
    <Content Include="views\工序汇报\MES_StationInBill_PDA.html" />
    <Content Include="views\工序汇报\MES_StationInBill.html" />
    <Content Include="views\工序汇报\MES_StationInBillList.html" />
    <Content Include="views\工序汇报\MES_StationOutBill_PDA.html" />
    <Content Include="views\工序汇报\MES_StationOutBill.html" />
    <Content Include="views\工序汇报\MES_StationOutBillList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillList.html" />
    <Content Include="views\组装单\Sc_AssemblyBill_Fast.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationInBill.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationInBillList.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationOutBill.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationOutBillList.html" />
    <Content Include="views\车间管理\工序汇报\MES_StationOutBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Qk_OutProcessList.html" />

 WebTM/layuiadmin/modules/common.js

@@ -31,7 +31,10 @@
        
        //清空本地记录的 token，并跳转到登入页
        admin.exit(function(){
          location.href = 'user/login.html';
            //location.href = 'user/login.html';
            layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                location.href = 'user/login.html';
            });
        });
      }
    });

 WebTM/views/home/console.html

@@ -82,29 +82,35 @@
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../仓存管理/仓库调拨/Cc_WaitingLookingFor.html" target="main_self_frame">
                                  <a href="../车间管理/工序汇报/MES_StationInBill_PDA.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-find-fill"></i>
                                      <cite>待发区找货</cite>
                                      <cite>工序进站接收单</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../车间管理/工序汇报/MES_StationOutBill_PDA.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-find-fill"></i>
                                      <cite>工序出站汇报单</cite>
                                  </a>
                              </li>
                              <!--<li class="layui-col-xs3">
                <a lay-href="验收入库/其他入库/Kf_OtherInBill_Fast.html">
                    <i class="layui-icon layui-icon-survey"></i>
                    <cite>其他入库</cite>
                </a>
            </li>
            <li class="layui-col-xs3">
                <a lay-href="领料发货/其他出库/Kf_OtherOutBill_Fast.html">
                    <i class="layui-icon layui-icon-user"></i>
                    <cite>其他出库</cite>
                </a>
            </li>
            <li class="layui-col-xs3">
              <a lay-href="set/system/website.html">
                <i class="layui-icon layui-icon-set"></i>
                <cite>设置</cite>
              </a>
            </li>-->
        <a lay-href="验收入库/其他入库/Kf_OtherInBill_Fast.html">
            <i class="layui-icon layui-icon-survey"></i>
            <cite>其他入库</cite>
        </a>
    </li>
    <li class="layui-col-xs3">
        <a lay-href="领料发货/其他出库/Kf_OtherOutBill_Fast.html">
            <i class="layui-icon layui-icon-user"></i>
            <cite>其他出库</cite>
        </a>
    </li>
    <li class="layui-col-xs3">
      <a lay-href="set/system/website.html">
        <i class="layui-icon layui-icon-set"></i>
        <cite>设置</cite>
      </a>
    </li>-->
                          </ul>
                          <!--<ul class="layui-row layui-col-space10">-->
                          <!--<li class="layui-col-xs3">
@@ -348,14 +354,14 @@
  </div>
        </div>

  <script src="../../layuiadmin/layui/layui.js?t=1"></script>  
  <script>
  <!--<script src="../../layuiadmin/layui/layui.js?t=1"></script>-->  
  <!--<script>
  layui.config({
    base: '../../layuiadmin/' //静态资源所在路径
  }).extend({
    index: 'lib/index' //主入口模块
  }).use(['index', 'console']);
  </script>
  </script>-->
</body>
</html>


 WebTM/views/index.html

@@ -4,7 +4,7 @@
<html>
<head>
    <meta charset="utf-8">
    <title>智云LMES管理系统</title>
    <title>LMES管理系统</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -100,7 +100,7 @@
      <div class="layui-side layui-side-menu">
        <div class="layui-side-scroll">
          <div class="layui-logo" lay-href="home/console.html">
              <span>智云LMES管理系统</span>
              <span>LMES管理系统</span>
          </div>
          
          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -114,9 +114,9 @@
                              <!--<dd><a href="仓存管理/仓库调拨/Kf_UpMoveStockBill.html" target="main_self_frame">上架调拨单</a></dd>-->
                              <dd><a href="仓存管理/仓库调拨/Cc_LookingForBill.html" target="main_self_frame">下架找货单</a></dd>
                              <dd><a href="仓存管理/仓库调拨/Cc_LookingForReturnBill.html" target="main_self_frame">上架归还单</a></dd>
                              <dd><a lay-href="仓存管理/仓库调拨/Cc_LookingForBillList.html" target="main_self_frame">下架找货单列表</a></dd>
                              <dd><a lay-href="仓存管理/仓库调拨/Cc_LookingForReturnBillList.html" target="main_self_frame">上架归还单列表</a></dd>
                              <dd><a href="仓存管理/仓库调拨/Cc_WaitingLookingFor.html" target="main_self_frame">待发区找货</a></dd>
                              <dd><a lay-href="仓存管理/仓库调拨/Kf_LookingForBillList.html" target="main_self_frame">找货单列表</a></dd>
                              <!--<dd><a lay-href="仓存管理/仓库调拨/Cc_LookingForReturnBillList.html" target="main_self_frame">上架归还单列表</a></dd>
                              <dd><a href="仓存管理/仓库调拨/Kf_WaitingLookingFor.html" target="main_self_frame">待发区找货</a></dd>-->
                          </dl>
                      </dd>
                  </dl>
@@ -157,8 +157,15 @@
                          <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="车间管理/报表分析/Sc_ProductionProcessDetailsReport.html">生产工序明细表</a></dd>-->
                              <dd><a lay-href="车间管理/报表分析/Qk_OutProcessList.html">墙咔工资统计报表</a></dd>
                          </dl>
                      </dd>
                      <dd class="layui-nav-itemed">
                          <a>工序汇报</a>
                          <dl class="layui-nav-child append" id="append">
                              <dd><a lay-href="车间管理/工序汇报/MES_StationInBillList.html">工序进站接收单列表</a></dd>
                              <dd><a lay-href="车间管理/工序汇报/MES_StationOutBillList.html">工序出站汇报单列表</a></dd>
                          </dl>
                      </dd>
                  </dl>
@@ -219,16 +226,6 @@
                      <dd class="layui-this"><a href="领料发货/其他出库/Kf_OtherOutBackBill_Fast.html" target="main_self_frame">其他出库(红字)</a></dd>
                      <!--<dd><a lay-href="组装单/Sc_AssemblyBill_Fast.html">组装单</a></dd>-->
                      <!-- <dd><a>受托领料</a></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-user"></i>
                      <cite>工序汇报</cite>
                  </a>
                  <dl class="layui-nav-child append" id="append">
                      <dd><a lay-href="工序汇报/MES_StationInBillList.html">工序进站接收单列表</a></dd>
                      <dd><a lay-href="工序汇报/MES_StationOutBillList.html">工序出站汇报单列表</a></dd>
                  </dl>
              </li>
              <li data-name="template" class="layui-nav-item">
@@ -370,10 +367,10 @@
          //判断用户是移动端还是PC端
          var judgeMorPCflag = judgeMorPC();
          if (!judgeMorPCflag) {//移动端
              var dd = '<dd><a href="工序汇报/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="工序汇报/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
              var dd = '<dd><a href="车间管理/工序汇报/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序汇报/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
              $("#append").prepend(dd);
          } else {//PC端
              var dd = '<dd><a lay-href="工序汇报/MES_StationInBill_PDA.html" target="main_self_frame">工序进站接收单</a ></dd > <dd><a lay-href="工序汇报/MES_StationOutBill_PDA.html" target="main_self_frame">工序出站汇报单</a></dd>';
              var dd = '<dd><a lay-href="车间管理/工序汇报/MES_StationInBill_PDA.html" target="main_self_frame">工序进站接收单</a ></dd > <dd><a lay-href="车间管理/工序汇报/MES_StationOutBill_PDA.html" target="main_self_frame">工序出站汇报单</a></dd>';
              $("#append").prepend(dd);
          }
      });
@@ -381,7 +378,7 @@
    document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
  </script>
  
  <script>
  <!--<script>
  var _hmt = _hmt || [];
  (function() {
    var hm = document.createElement("script");
@@ -389,7 +386,7 @@
    var s = document.getElementsByTagName("script")[0]; 
    s.parentNode.insertBefore(hm, s);
  })();
  </script>
  </script>-->
</body>
</html>


 WebTM/views/user/login.html

@@ -64,6 +64,18 @@
            , laydate = layui.laydate
            , util = layui.util;

            //获取数据库名
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetDataBases",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        sessionStorage["数据库"] = result.data[0].Name;
                    }
                    layer.closeAll("loading");
                }
            })

            //form.render();

            //提交

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Cc_LookingForBill.html

@@ -214,10 +214,10 @@
                    , { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
                    , { field: 'HSPName', title: '仓位' }
                    , { field: 'HSPName', title: '仓位', hide: true }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库', width: 130 }
                    , { field: 'HWhName', title: '仓库', width: 130, hide: true }
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HGroupID', title: '班组ID', hide: true }
@@ -255,10 +255,10 @@
                    , { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
                    , { field: 'HSPName', title: '仓位' }
                    , { field: 'HSPName', title: '仓位', hide: true }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库', width: 130 }
                    , { field: 'HWhName', title: '仓库', width: 130, hide: true }
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HGroupID', title: '班组ID', hide: true }

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Cc_LookingForReturnBill.html

@@ -115,14 +115,6 @@
                            </div>
                            <!--实物上架-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">实物条码</label>
                                    </div>
                                    <div class="layui-col-xs8">
                                        <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
@@ -133,7 +125,7 @@
                                            <input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs1">
                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT" style="display:none;">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -149,6 +141,14 @@
                                        <div class="layui-col-xs1">
                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">实物条码</label>
                                    </div>
                                    <div class="layui-col-xs8">
                                        <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
@@ -276,13 +276,13 @@
                , cellMinWidth: 90
                , cols: [[
                    { type: 'numbers', title: '序号' }
                    //, { field: 'HIsStatus', title: '是否扫码', hide: true }
                    , { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HMTONo', title: '批号' }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
                    , { field: 'HSPName', title: '仓位' }
                    , { field: 'HSPName', title: '仓位', hide: true }
                    , { field: 'HStatus', title: '在库状态' }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库', width: 130 }
                    , { field: 'HWhName', title: '仓库', width: 130, hide: true }
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HGroupID', title: '班组ID', hide: true }
@@ -315,8 +315,8 @@
            option2.data = [];
            table.render(option2);

            //进入页面默认光标在源单号上
            $("#HBarCode").focus();
            //进入页面默认光标在仓位上
            $("#HSPName").focus();

            //扫源单（包装单条码）--弃用
            $('#HBarCode_Pack').on('keydown', function (event) {
@@ -435,59 +435,82 @@

            //扫实物条码
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val()
                var HBarCode = $('#HBarCode').val();
                if (event.keyCode == 13) {
                    var index = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var sSubStr = result.data;
                                for (var i = 0; i < sSubStr.length; i++) {
                                    if (sSubStr[i].HIsStatus == "是") {
                                        layer.close(index);
                                        $('#HBarCode').val("");
                                        layer.msg("该实物已扫码，请勿重复扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    } else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "在库") {
                                        layer.close(index);
                                        layer.msg("该实物在" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"，不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    } else {
                                        var data = result.data;
                                        option2.data = data;
                                        table.render(option2);
                                        sSubStr = table.cache['bzd-table2'];
                                        sSubStr[i].HIsStatus = "是";
                                        sSubStr[i].HSourceID = $("#HSourceID").val();
                                        sSubStr[i].HSource = $("#HSource").val();
                                        sSubStr[i].HGroupID = $("#HGroupID").val();
                                        sSubStr[i].HGroup = $("#HGroup").val();
                                        sSubStr[i].HInterID = $("#HInterID").val();
                                        sSubStr[i].HBillNo = $("#HBillNo").val();
                                        sSubStr[i].HMakerID = $("#HMakerID").val();
                                        sSubStr[i].HMaker = $("#HMaker").val();
                                        option2.data = table.cache["bzd-table2"];
                                        table.render(option2);
                                        layer.close(index);
                                        $('#HBarCode').val("");
                                        layer.msg("扫码成功！", { icon: 1, time: 1000 });
                    if ($("#HSPID").val() == 0) {
                        layer.msg("请先扫描仓位码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else
                    {
                        var index = layer.load();
                        $.ajax({
                            url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
                            type: "GET",
                            data: { "HBarCode": HBarCode },
                            success: function (result) {
                                if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    var sSubStr = result.data;
                                    var tableStr = table.cache['bzd-table2'];
                                    for (var i = 0; i < tableStr.length; i++) {
                                        if (tableStr[i].HBarCode == sSubStr[0].HBarCode) {
                                            layer.close(index);
                                            $('#HBarCode').val("");
                                            layer.msg("该实物已扫码，请勿重复扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                            return;
                                        }
                                    }
                                }
                                    var last = tableStr.length;
                                        //if (tableStr.length >0 && tableStr[i-1].HBarCode == sSubStr[0].HBarCode) {
                                        //    layer.close(index);
                                        //    $('#HBarCode').val("");
                                        //    layer.msg("该实物已扫码，请勿重复扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                        //}
                                        //else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "在库")
                                        //{
                                        //    layer.close(index);
                                        //    layer.msg("该实物在" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"，不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                        //}
                                        //else {
                                            //var data = result.data;
                                            option2.data.push(sSubStr[0]);
                                            table.render(option2);
                                            sSubStr = table.cache['bzd-table2'];
                                    sSubStr[last].HIsStatus = "是";
                                    sSubStr[last].HSourceID = $("#HSourceID").val();
                                    sSubStr[last].HSource = $("#HSource").val();
                                    sSubStr[last].HGroupID = $("#HGroupID").val();
                                    sSubStr[last].HGroup = $("#HGroup").val();
                                    sSubStr[last].HInterID = $("#HInterID").val();
                                    sSubStr[last].HBillNo = $("#HBillNo").val();
                                    sSubStr[last].HMakerID = $("#HMakerID").val();
                                    sSubStr[last].HMaker = $("#HMaker").val();
                                    sSubStr[last].HSPName = $("#HSPName").val();
                                    sSubStr[last].HSPID = $("#HSPID").val();
                                    sSubStr[last].HWHID = $("#HWHID").val();
                                    sSubStr[last].HWhName = $("#HWHName").val();
                                            option2.data = table.cache["bzd-table2"];
                                            table.render(option2);
                                            layer.close(index);
                                            $('#HBarCode').val("");
                                            layer.msg("扫码成功！", { icon: 1, time: 1000 });
                                        //}
                                    //}

                            }
                            else {
                                option2.data = [];
                                table.render(option2);
                                }
                                else {
                                    option2.data = [];
                                    table.render(option2);
                                    layer.close(index);
                                    layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                        });
                    }
                }
            });

@@ -571,16 +594,16 @@
                if (AllowLoadData(sSubStr, 'Saver') != false)//非空验证
                {
                    //判断上架库位是否与条码中库位一致
                    var tableData = table.cache['bzd-table2'];
                    if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
                        layer.msg("当前库位与实际不符！", { icon: 4, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    //var tableData = table.cache['bzd-table2'];
                    //if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
                    //    layer.msg("当前库位与实际不符！", { icon: 4, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    //    return;
                    //}
                    var index = layer.load();
                    $.ajax(
                    {
                        type: "POST",
                            url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
                        url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
                        //url:"http://localhost:12761/LookingFor/set_SaveLookingForReturnBill_Json",
                        async: true,
                        data: { "oMain": sSubStr },
@@ -630,19 +653,35 @@
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var tableData = table.cache['bzd-table2'];
                                if (tableData.length == 0) {
                                    layer.msg("请先扫实物条码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    return;
                                }
                                if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
                                    layer.msg("此库位与实际不符！", { icon: 4, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                } else {
                                    $("#HSPName").val(result.data[0].HName);
                                    $("#HSPID").val(result.data[0].HItemID);
                                    $("#HWHID").val(result.data[0].HWHID);
                                    $("#HWHName").val(result.data[0].HWhName);
                                }
                                //var tableData = table.cache['bzd-table2'];
                                //if (tableData.length == 0) {
                                //    layer.msg("请先扫实物条码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                //    return;
                                //}
                                //if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
                                //    layer.msg("此库位与实际不符！", { icon: 4, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                //} else {
                                $("#HSPName").val(result.data[0].HName);
                                $("#HSPID").val(result.data[0].HItemID);
                                $("#HWHID").val(result.data[0].HWHID);
                                $("#HWHName").val(result.data[0].HWhName);
                                //启用mes仓位，根据老仓库转换成新仓库
                                $.ajax({
                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
                                    type: "GET",
                                    data: { "HERPWHID": $("#HWHID").val() },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            $("#HWhID").val(result.data[0].HMESWHID);
                                            $("#HWHName").val(result.data[0].HMESWHNAME);
                                            $("#HBarCode").focus();
                                        }
                                        else {
                                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                        }
                                        layer.closeAll("loading");
                                    }
                                });
                            }
                            else {
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Cc_WaitingLookingFor.html

File was deleted

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_LookingForBillList.html

File was renamed from WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Cc_LookingForBillList.html
@@ -2,14 +2,18 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>下架找货单列表</title>
<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>
    
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
@@ -25,9 +29,10 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width:60px;padding-left:0px;">单据类型</label>
                                    <label class="layui-form-label">单据类型</label>
                                    <div class="layui-input-block">
                                        <select name="HBillType" id="HBillType">
                                            <option value="">所有</option>
                                            <option value="ZHXJ">下架找货单</option>
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
@@ -40,26 +45,19 @@
                                    </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="HSourceBillNo" id="HSourceBillNo">
                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                    </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="HCreateBy" id="HCreateBy">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -99,79 +97,54 @@
    <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 src="../../../layuiadmin/zgqCustom/zgqCustom.js"></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'], 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'";
                , 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 = "";

            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , height: 'full-50'
                , page: true
                ,cellMinWidth: 90
                , cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', width: 110 }
                    { field: '单据号', title: '单据号', sort: true, width: 165 }
                    , { field: '单据类型', title: '单据类型' }
                    , { field: '工艺名称', title: '工艺名称', width: 170 }
                    //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 215 }
                    , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                    , { field: '计量单位', title: '计量单位' }
                    , { field: '默认工艺', title: '默认工艺' }
                    , { field: '表头备注', title: '表头备注' }
                    //, { field: 'hsubid', title: 'hsubid', width: 80 }
                    , { field: '工序号', title: '工序号' }
                    , { field: '委外标记', title: '委外标记' }
                    //, { field: 'hprocid', title: 'hprocid', width: 105 }
                    , { field: '工序代码', title: '工序代码' }
                    , { field: '工序', title: '工序' }
                    //, { field: 'HSupID', title: 'HSupID', width: 105 }
                    , { field: '供应商代码', title: '供应商代码' }
                    , { field: '供应商', title: '供应商' }
                    //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                    , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                    , { field: '工作中心名称', title: '工作中心名称', width: 115 }
                    , { 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: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                    //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                    //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                    //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                    , { field: '加工单价', title: '加工单价' }
                    //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                    , { field: '下道流转工序', title: '下道流转工序'}
                    , { field: '流转工序', title: '流转工序' }
                    { field: 'HInterID', title: '单据ID', hide: true }
                    , { field: 'HBillNo', title: '单据号',width: 160 }
                    , { field: 'HStatus', title: '在库状态', width: 200 }
                    , { field: 'HGroupID', title: '班组ID', hide: true }
                    , { field: 'HGroup', title: '班组' }
                    , { field: 'HSourceID', title: '生产资源ID', hide: true }
                    , { field: 'HSource', title: '生产资源', width: 115 }
                    , { field: 'HCreateBy', title: '制单人' }
                    , {
                        field: 'HCreateDate', title: '制单时间', width: 110, templet: function (d) {
                            if (d.HCreateDate == null) {
                                return "";
                            }
                            return util.toDateString(d.HCreateDate, "yyyy-MM-dd");
                        }
                    }
                    , { field: 'HMaterID', title: '物料ID', hide: true }
                    , { field: 'HMaterNumber', title: '物料编码', width: 130 }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号' }
                    , { field: 'HBarCode', title: '条码', width: 175 }
                    , { field: 'HBarCodeType', title: '条码类型' }
                ]]
            };

@@ -179,9 +152,9 @@
            //进入页面显示的缓存列表
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
                url: GetWEBURL() + '/LookingFor/GetLookingForBillList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": sWhere, "HBillType": "" },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -195,48 +168,72 @@
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            }); 
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#WorkCenter").val("");//单据号
                $("#hnumber").val("");//物料
                $("#HOrderProcNO").val("");//单据类型
                $("#HBillType").val("");//单据类型
                $("#HBillNo").val("");//单据号
                $("#HSourceBillNo").val("");//源单号
                $("#HCreateBy").val("");//制单人
                $("#BenginHCreateDate").val("");//开始制单时间
                $("#EndHCreateDate").val("");//结束制单时间
                $("#btnSearch").click();
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();//物料
                var WorkCenter = $("#WorkCenter").val();//单据号
                if (HOrderProcNO) {
                    sWhere += " and å•æ®ç±»åž‹ like '%" + HOrderProcNO + "%'";
                var HBillType = $("#HBillType").val();//单据类型
                var HBillNo = $("#HBillNo").val();//单据号
                var HCreateBy = $("#HCreateBy").val();//制单人
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                }
                if (hnumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + hnumber + "%' or ç‰©æ–™åç§° like '%" + hnumber + "%'"
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                }
                if (WorkCenter) {
                    sWhere += " and å•æ®å· like '%" + WorkCenter + "%'";
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                }
                var index = layer.load(0);
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL1() + '/LEMS/MES_Gy_RoutingBillList_Json',
                    url: GetWEBURL1() + '/LookingFor/GetLookingForBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "HBillType": HBillType },
                    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缓存
                //调用接口后清空sWhere缓存
                sWhere = "";
                //$("#HBillType").val("");//单据类型
                //$("#HBillNo").val("");//单据号
                //$("#HSourceBillNo").val("");//源单号
                //$("#HCreateBy").val("");//制单人
                //$("#BenginHCreateDate").val("");//开始制单时间
                //$("#EndHCreateDate").val("");//结束制单时间
            });

            //监听行双击事件
            table.on('rowDouble(mainTable)', function (obj) {
                layer.alert("双击事件", { icon: 1 });
            });


@@ -251,7 +248,7 @@
            //以上是layui模块
        });

        



    </script>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationInBill.html

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationInBillList.html

File was renamed from WebTM/views/¹¤Ðò»ã±¨/MES_StationInBillList.html
@@ -6,13 +6,13 @@
    <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/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>
    <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>
@@ -127,7 +127,7 @@
    </script>
    <script>
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationInBill_PDA.html

File was renamed from WebTM/views/¹¤Ðò»ã±¨/MES_StationInBill_PDA.html
@@ -6,11 +6,11 @@
    <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" type="text/javascript"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <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" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <style>
        .layui-form-label {
            font-size: 14px;
@@ -182,8 +182,8 @@
        </div>
    </div>

    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>

        function getUrlVars() {
@@ -201,7 +201,7 @@
        var InterID = params[params[1]];

        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -363,7 +363,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -379,7 +379,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -395,7 +395,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -416,9 +416,16 @@
                        success: function (result) {
                            console.log(result);
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#sHWHID").val("");
                                layer.alert(result.msg + "单号为：" + $("#HBillNo").val(), { icon: 1 }, function () {
                                    window.location.reload();//刷新页面
                                //$("#sHWHID").val("");
                                //layer.alert(result.msg + "单号为：" + $("#HBillNo").val(), { icon: 1 }, function () {
                                //    window.location.reload();//刷新页面
                                //});
                                layer.confirm(result.msg + "单号为：" + $("#HBillNo").val(), {
                                    btn: ['出站', '新增'], skin: 'layui-layer-lan', title: "温馨提示", icon: 1
                                }, function () {
                                        parent.location.href = "../../../views/车间管理/工序汇报/MES_StationOutBill_PDA.html";
                                }, function () {
                                    window.location.reload();
                                });
                            }
                            else {
@@ -436,7 +443,7 @@
            //退出按钮
            form.on('submit(Close)', function (data) {//退出
                layer.confirm('您确定要关闭本页吗？', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../views/index.html";
                    parent.location.href = "../../../views/index.html";
                });
            });


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationOutBill.html

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationOutBillList.html

File was renamed from WebTM/views/¹¤Ðò»ã±¨/MES_StationOutBillList.html
@@ -6,12 +6,12 @@
    <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>
    <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>
@@ -88,7 +88,7 @@
    </script>
    <script>
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationOutBill_PDA.html

File was renamed from WebTM/views/¹¤Ðò»ã±¨/MES_StationOutBill_PDA.html
@@ -6,11 +6,11 @@
    <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" type="text/javascript"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <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" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <style>
        .layui-form-label {
            font-size: 14px;
@@ -202,8 +202,8 @@
        </div>
    </div>

    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>

        function getUrlVars() {
@@ -221,7 +221,7 @@
        var InterID = params[params[1]];

        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -393,7 +393,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -409,7 +409,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_GetProductionResourcesList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -425,7 +425,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -442,7 +442,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../Baseset/基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -466,8 +466,15 @@
                            console.log(result);
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#sHWHID").val("");
                                layer.alert(result.msg + "单号为：" + $("#HBillNo").val(), { icon: 1 }, function () {
                                    window.location.reload();//刷新页面
                                //layer.alert(result.msg + "单号为：" + $("#HBillNo").val(), { icon: 1 }, function () {
                                //    window.location.reload();//刷新页面
                                //});
                                layer.confirm(result.msg + "单号为：" + $("#HBillNo").val(), {
                                    btn: ['进站', '新增'], skin: 'layui-layer-lan', title: "温馨提示", icon: 1
                                }, function () {
                                    parent.location.href = "../../../views/车间管理/工序汇报/MES_StationInBill_PDA.html";
                                }, function () {
                                    window.location.reload();
                                });
                            }
                            else {
@@ -485,7 +492,7 @@
            //退出按钮
            form.on('submit(Close)', function (data) {//退出
                layer.confirm('您确定要关闭本页吗？', { icon: 3, title: '提示' }, function (index) {
                    parent.location.href = "../../views/index.html";
                    parent.location.href = "../../../views/index.html";
                });
            });


 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -35,9 +35,11 @@
                            <li lay-id="2" style="padding:1px;">单据信息</li>
                            <li lay-id="3" style="padding:1px;">物料清单</li>
                            <li lay-id="4" style="padding:1px;">明细清单</li>
                            <li lay-id="5" style="padding:1px;">日志</li>
                            <li lay-id="5" style="padding:1px;">源单找货</li>
                            <li lay-id="6" style="padding:1px;">日志</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--源单信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item">
                                    <div class="layui-row">
@@ -63,6 +65,7 @@
                                    </div>
                                </div>
                            </div>
                            <!--单据信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
@@ -174,17 +177,18 @@
                                    </div>
                                </div>
                            </div>
                            <!--物料清单-->
                            <div class="layui-tab-item">
                                <!--<div class="layui-form-item" style="padding:0px;margin:0px">
                            <div class="layui-row">
                                <div class="layui-col-xs4">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>-->
            <div class="layui-row">
                <div class="layui-col-xs4">
                    <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                </div>
                <div class="layui-col-xs8">
                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>-->
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
@@ -197,9 +201,15 @@
                                </div>
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--明细清单-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                            </div>
                            <!--源单找货-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="zh-table" lay-filter="zh-table"></table>
                            </div>
                            <!--日志-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                            </div>
@@ -247,6 +257,29 @@
            , table = layui.table
            , form = layui.form
            , element = layui.element;

            //源单找货列表
            var ZHOption = {
                elem: '#zh-table'
                //, toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , cols: [[
                    { field: '在库状态', title: '在库状态',width:180 }
                    , { field: '物料名称', title: '物料名称' }
                    , { field: '批次', title: '批次' }
                    , { field: '数量', title: '数量' }
                    , { field: '物料代码', title: '物料代码' }
                    , { field: '规格型号', title: '规格型号' }
                ]]
                , text: {
                    none: '暂无相关数据，请先扫描源单号！'
                }
            };
            //初始加载表格
            ZHOption.data = [];
            table.render(ZHOption);


            //表头初始化赋值（根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户） new
@@ -980,6 +1013,36 @@
             , done: function () {
             }
            });

            //扫源单查货
            $('#HSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HSourceBillNo').val();
                if (event.keyCode == 13) {
                    var index = layer.load(0);
                    $.ajax({
                        url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
                        type: "GET",
                        data: { "HbillNo": HSourceBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                ZHOption.data = result.data;
                                table.render(ZHOption);
                                layer.close(index);
                                element.tabChange('tab-SellOutBill', '5');
                            }
                            else {
                                layer.close(index);
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        }, error: function () {
                            layer.close(index);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
            });

        //以上为layui模块
        });
        function GetHWHValue(obj)  //返回仓库
        {

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -21,7 +21,17 @@
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">MES库位</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
                                <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
                                <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
@@ -84,8 +94,8 @@
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
@@ -378,6 +388,8 @@
        //}
        //
        //

        //选择仓库
        form.on('submit(HWHID-BT)', function () {//选择仓库
            layer.open({
                type: 2
@@ -393,6 +405,8 @@
                }
            })
        });

        //选择仓位
        form.on('submit(HSpID-BT)', function () {//选择仓位
            layer.open({
                type: 2
@@ -408,6 +422,8 @@
                }
            })
        });

        //选择保管
        form.on('submit(HKeeperID-BT)', function () {//选择保管
            layer.open({
                type: 2
@@ -423,6 +439,8 @@
                }
            })
        });

        //选择验收
        form.on('submit(HSecManagerID-BT)', function (data) {//选择验收
            var sMainStr = JSON.stringify(data.field);
            layer.open({
@@ -439,6 +457,8 @@
                }
            })
        });

        //选择部门
        form.on('submit(HDeptID-BT)', function () {//选择部门
            layer.open({
                type: 2
@@ -454,6 +474,8 @@
                }
            })
        });

        //编辑
        form.on('submit(cmdModify)', function () {//编辑
            var sSubStr = table.cache['wl-table'];
            //if (AllowLoadData(sSubStr) != false) {//非空验证
@@ -539,6 +561,14 @@
        //提交
        form.on('submit(Saver)', function (data) {//提交
            //debugger;
            if ($("#HExplanation").val() == "") {
                if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {
                    $("#HWHNAME").val("");
                    $("#HWHID").val("");
                    layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
            }
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = table.cache['wl-table'];
            //var sSourceType = $("#HBillType").val();
@@ -632,7 +662,7 @@
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
                    success: function (result) {
                        debugger;
                        //debugger;
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {
                                $("#HWHNAME").val(result.data.HWhName);
@@ -745,6 +775,8 @@
            //layer.closeAll("loading");
            //}
        });

        //扫源单
        $('#HSourceBillNo').on('keydown', function (event) {   //扫源单
            var HSourceBillNo = $('#HSourceBillNo').val()
            var sInterID = $("#HInterID").val()
@@ -802,6 +834,7 @@
            }
        });

        //扫仓位
        $('#HStockPlaceName').on('keydown', function (event) {      //扫仓位
            var HBarCode = $('#HStockPlaceName').val()
            if (event.keyCode == 13) {
@@ -828,6 +861,48 @@
                });
            }
        });

        //扫MES仓位
        $('#HMESSPName').on('keydown', function (event) {      //扫仓位
            var HBarCode = $('#HMESSPName').val();
            if (event.keyCode == 13) {
                //判断文本框是否有数据    new
                $.ajax({
                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
                    type: "GET",
                    data: { "HBarCode": HBarCode },
                    success: function (result) {
                        if (result.count == 1) {
                            $("#HMESSPID").val(result.data[0].HWHID);
                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
                            $.ajax({
                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
                                type: "GET",
                                data: { "HERPWHID": result.data[0].HWHID },
                                success: function (result) {
                                    if (result.count == 1) {
                                        $("#HWHID").val(result.data[0].HMESWHID);
                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);
                                        $("#HMESSPName").attr("readonly", "readonly");//MES仓位只读HExplanation
                                        $("#HMESSPName").css("background-color", "#efefef4d");
                                    }
                                    else {
                                        layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    }
                                    layer.closeAll("loading");
                                }
                            });
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        layer.closeAll("loading");
                    }
                });
            }
        });

        //刷新明细页签
        table.render({
            elem: '#mx-table'

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html

@@ -26,6 +26,16 @@
                    <div class="layui-form-item" style="padding:15px;margin:0px">

                        <div class="layui-row">

                            <div class="layui-col-xs3">

                                <label class="layui-form-label" style="width:60px;padding-left:0px;">MES库位</label>

                            </div>

                            <div class="layui-col-xs8">

                                <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">

                                <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">

                                <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">

                            </div>

                        </div>

                        <div class="layui-row">

                            <div class="layui-col-xs3">

                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>

                            </div>

                            <div class="layui-col-xs8">

@@ -87,7 +97,7 @@
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>

                                        </div>

                                        <div class="layui-col-xs6">

                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">

                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>

                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">

                                        </div>

                                        <div class="layui-col-xs3">

@@ -617,7 +627,14 @@


        //提交

        form.on('submit(Saver)', function (data) {//提交

            //debugger;

            if ($("#HExplanation").val() == "") {

                if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {

                    $("#HWHNAME").val("");

                    $("#HWHID").val("");

                    layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                    return;

                }

            }

            var sMainStr = JSON.stringify(data.field);

            var sSubStr = table.cache['wl-table'];

            var sSourceType = $("#HBillType").val();

@@ -934,6 +951,48 @@
         , done: function () {

         }

        });



        //扫MES仓位

        $('#HMESSPName').on('keydown', function (event) {      //扫仓位

            var HBarCode = $('#HMESSPName').val();

            if (event.keyCode == 13) {

                $.ajax({

                    url: GetWEBURL() + "/LookingFor/getSpName_Json",

                    type: "GET",

                    data: { "HBarCode": HBarCode },

                    success: function (result) {

                        if (result.count == 1) {

                            $("#HMESSPID").val(result.data[0].HWHID);

                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);

                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);

                            $.ajax({

                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",

                                type: "GET",

                                data: { "HERPWHID": result.data[0].HWHID },

                                success: function (result) {

                                    if (result.count == 1) {

                                        $("#HWHID").val(result.data[0].HMESWHID);

                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);

                                        $("#HMESSPName").attr("readonly", "readonly");//MES仓位只读HExplanation

                                        $("#HMESSPName").css("background-color", "#efefef4d");

                                    }

                                    else {

                                        layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                                    }

                                    layer.closeAll("loading");

                                }

                            });

                        }

                        else {

                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                        }

                        layer.closeAll("loading");

                    }

                });

            }

        });



    //以上为layui模块

    });



    function GetHWHValue(obj)  //返回调入仓库


 WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_Fast.html

@@ -21,6 +21,16 @@
                    <div class="layui-form-item" style="padding:15px;margin:0px">

                        <div class="layui-row">

                            <div class="layui-col-xs3">

                                <label class="layui-form-label" style="width:60px;padding-left:0px;">MES库位</label>

                            </div>

                            <div class="layui-col-xs8">

                                <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">

                                <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">

                                <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">

                            </div>

                        </div>

                        <div class="layui-row">

                            <div class="layui-col-xs3">

                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>

                            </div>

                            <div class="layui-col-xs8">

@@ -84,7 +94,7 @@
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>

                                        </div>

                                        <div class="layui-col-xs6">

                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">

                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>

                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">

                                        </div>

                                        <div class="layui-col-xs3">

@@ -499,7 +509,14 @@


            //提交按钮

            form.on('submit(Saver)', function (data) {

                //debugger;

                if ($("#HExplanation").val() == "") {

                    if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {

                        $("#HWHNAME").val("");

                        $("#HWHID").val("");

                        layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                        return;

                    }

                }

                var sMainStr = JSON.stringify(data.field);

                var sSubStr = table.cache['wl-table'];

                var sSourceType = $("#HBillType").val();

@@ -829,6 +846,48 @@
             , done: function () {

             }

            });



            //扫MES仓位

            $('#HMESSPName').on('keydown', function (event) {      //扫仓位

                var HBarCode = $('#HMESSPName').val();

                if (event.keyCode == 13) {

                    $.ajax({

                        url: GetWEBURL() + "/LookingFor/getSpName_Json",

                        type: "GET",

                        data: { "HBarCode": HBarCode },

                        success: function (result) {

                            if (result.count == 1) {

                                $("#HMESSPID").val(result.data[0].HWHID);

                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);

                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);

                                $.ajax({

                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",

                                    type: "GET",

                                    data: { "HERPWHID": result.data[0].HWHID },

                                    success: function (result) {

                                        if (result.count == 1) {

                                            $("#HWHID").val(result.data[0].HMESWHID);

                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);

                                            $("#HMESSPName").attr("readonly", "readonly");//MES仓位只读HExplanation

                                            $("#HMESSPName").css("background-color", "#efefef4d");

                                        }

                                        else {

                                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                                        }

                                        layer.closeAll("loading");

                                    }

                                });

                            }

                            else {

                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                            }

                            layer.closeAll("loading");

                        }

                    });

                }

            });



        //以上为layui模块

        });

        //清空表头

        //function f_ClearTitle() {