修改找货单类型，1252为上架，1253为下架

zgq

2021-02-18 2d60ee2ce3c236d3c9a8f9a7fa2d6184e0e19721

修改找货单类型，1252为上架，1253为下架

 WebTM/Properties/PublishProfiles/webtm.pubxml.user

@@ -955,7 +955,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>02/09/2021 15:27:56</publishTime>
      <publishTime>02/18/2021 16:40:14</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>01/26/2021 00:29:42</publishTime>
      <publishTime>02/18/2021 16:27:56</publishTime>
    </File>
    <File Include="views/user/reg.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1075,10 +1075,10 @@
      <publishTime>11/26/2020 17:27:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForBill.html">
      <publishTime>02/09/2021 16:41:30</publishTime>
      <publishTime>02/18/2021 16:53:38</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html">
      <publishTime>02/09/2021 16:51:19</publishTime>
      <publishTime>02/18/2021 17:18:32</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_ReturnBill.html">
      <publishTime>02/05/2021 14:05:30</publishTime>

 WebTM/views/index.html

@@ -111,9 +111,9 @@
                          <a>仓库调拨</a>
                          <dl class="layui-nav-child">
                              <dd><a href="仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html" target="main_self_frame">调拨单</a></dd>
                              <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 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>
                          </dl>
                      </dd>
                  </dl>
@@ -357,6 +357,13 @@
          index: 'lib/index' //主入口模块
      }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
          var $ = layui.$;

          //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
          if (sessionStorage.login != "login") {
              layer.confirm("登录失效，请重新登录！", {
                  icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
              }, function () { window.location.href = "user/login.html"; });
          }
          //判断用户是移动端还是PC端
          var judgeMorPCflag = judgeMorPC();
          if (!judgeMorPCflag) {//移动端

 WebTM/views/user/login.html

@@ -110,6 +110,7 @@
                                sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
                                sessionStorage["HProcName"] = result.data[0].HProcName;
                                sessionStorage["HProcID"] = result.data[0].HProcID;
                                sessionStorage["login"] = "login";
                                //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");

                                window.location.href = '../../views/index.html'
@@ -173,6 +174,7 @@
                                sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
                                sessionStorage["HProcName"] = result.data[0].HProcName;
                                sessionStorage["HProcID"] = result.data[0].HProcID;
                                sessionStorage["login"] = "login";
                                
                                //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");


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

@@ -16,7 +16,7 @@
            <div class="layui-card-body" style="padding: 5px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>找货单</span>
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>下架找货单</span>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
@@ -155,6 +155,13 @@
                , form = layui.form
                , element = layui.element;

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "user/login.html"; });
            }

            //初始基本信息赋值
            $("#HWHID").val(sessionStorage["HWHID"]);
            $("#HWHName").val(sessionStorage["HWHName"]);
@@ -173,7 +180,7 @@
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '1252' },
                data: { "HBillType": '1253' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
@@ -194,7 +201,7 @@
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HStatus', title: '在库状态' }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库' }
                    , { field: 'HSPID', title: '仓位ID', hide: true }

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

@@ -16,11 +16,11 @@
            <div class="layui-card-body" style="padding: 5px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>归还单</span>
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>上架归还单</span>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                            <!--<div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:90px;padding-left:0px;">源单号</label>
                            </div>
                            <div class="layui-col-xs8">
@@ -31,28 +31,29 @@
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs3">
                            </div>-->
                            <!--<div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:90px;padding-left:0px;">单据号</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBillNo" id="HBillNo" autocomplete="off" class="layui-input">
                                <input type="text" name="HInterID" id="HInterID" autocomplete="off" class="layui-input">
                            </div>
                            </div>-->
                        </div>
                    </div>
                    <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
                        <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>
                            <li lay-id="1" style="padding:1px;">表头信息</li>
                            <li lay-id="2" style="padding:1px;">源单查货</li>
                            <li lay-id="2" style="padding:1px;" class="layui-this">实物上架</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--表头信息-->
                            <div class="layui-tab-item layui-show">
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:90px;padding-left:0px;">仓库</label>
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓库</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input">
@@ -66,7 +67,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:90px;padding-left:0px;">仓位</label>
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
@@ -80,7 +81,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:90px;padding-left:0px;">班组</label>
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">班组</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HGroup" id="HGroup" autocomplete="off" class="layui-input">
@@ -94,7 +95,7 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:90px;padding-left:0px;">生产资源</label>
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">生产资源</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HSource" id="HSource" autocomplete="off" class="layui-input">
@@ -108,18 +109,49 @@
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:90px;padding-left:0px;">制单人</label>
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">制单人</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HMaker" id="HMaker" autocomplete="off" class="layui-input">
                                            <input type="text" name="HMaker" id="HMaker" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" name="HMakerID" id="HMakerID" value="0" 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">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HBillNo" id="HBillNo" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--明细信息-->
                            <!--源单查货-->
                            <div class="layui-tab-item">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:45px;padding-left:0px;margin-bottom: 1%;">源单号</label>
                                    </div>
                                    <div class="layui-col-xs8">
                                        <input type="text" name="HSourceBillNo" id="HSourceBillNo" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <table class="layui-hide" id="bzd-table" lay-filter="bzd-table"></table>
                            </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>
                                <table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
                            </div>
                        </div>
                    </div>
@@ -155,6 +187,13 @@
                , form = layui.form
                , element = layui.element;

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "user/login.html"; });
            }

            //初始基本信息赋值
            $("#HWHID").val(sessionStorage["HWHID"]);
            $("#HWHName").val(sessionStorage["HWHName"]);
@@ -173,7 +212,7 @@
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '1253' },
                data: { "HBillType": '1252' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
@@ -194,7 +233,7 @@
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HStatus', title: '在库状态' }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库' }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
@@ -221,12 +260,56 @@
                }
            };

            //主表列表
            var option2 = {
                elem: '#bzd-table2'
                //, toolbar: '#toolbarDemo'
                //, page: true
                //, height: 256
                , cellMinWidth: 90
                , cols: [[
                    { type: 'numbers', title: '序号' }
                    //, { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
                    , { field: 'HWhName', title: '仓库' }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
                    , { field: 'HSPName', title: '仓位' }
                    , { field: 'HGroupID', title: '班组ID', hide: true }
                    , { field: 'HGroup', title: '班组' }
                    , { field: 'HSourceID', title: '生产资源ID', hide: true }
                    , { field: 'HSource', title: '生产资源', width: 115, templet: '#sexTpl' }
                    , { field: 'HQty', title: '数量' }
                    , { field: 'HMaterID', title: '物料ID', hide: true }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterNumber', title: '物料编码' }
                    , { field: 'HMaterModel', title: '规格型号' }
                    , { field: '即时库存', title: '即时库存' }
                    , { field: 'HBarCode', title: '条码编号', hide: true }
                    , { field: 'HInterID', title: '单据ID', hide: true }
                    , { field: 'HBillNo', title: '单据号', hide: true }
                    , { field: 'HMakerID', title: '制单人ID', hide: true }
                    , { field: 'HMaker', title: '制单人', hide: true }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                ]]
                , text: {
                    none: '暂无相关数据，请先扫描实物条码！' //默认：无数据。注：该属性为 layui 2.2.5 å¼€å§‹æ–°å¢ž
                }
            };

            //初始加载表格
            option.data = [];
            table.render(option);

            //初始加载表格
            option2.data = [];
            table.render(option2);

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

            //扫源单（包装单条码）--弃用
            $('#HBarCode_Pack').on('keydown', function (event) {
@@ -298,8 +381,8 @@
                }
            });

            //扫实物条码
            $('#HBarCode').on('keydown', function (event) {
            //扫实物条码--弃用
            $('#HBarCode_f').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val()
                if (event.keyCode == 13) {
                    var index = layer.load();
@@ -339,6 +422,51 @@
                    }


                }
            });

            //扫实物条码
            $('#HBarCode').on('keydown', function (event) {
                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 data = result.data;
                                option2.data = data;
                                table.render(option2);
                                var sSubStr = table.cache['bzd-table2'];
                                sSubStr[0].HSourceID = $("#HSourceID").val();
                                sSubStr[0].HSource = $("#HSource").val();
                                sSubStr[0].HGroupID = $("#HGroupID").val();
                                sSubStr[0].HGroup = $("#HGroup").val();
                                sSubStr[0].HInterID = $("#HInterID").val();
                                sSubStr[0].HBillNo = $("#HBillNo").val();
                                sSubStr[0].HMakerID = $("#HMakerID").val();
                                sSubStr[0].HMaker = $("#HMaker").val();
                                option2.data = table.cache["bzd-table2"];
                                table.render(option2);
                                layer.close(index);
                                $('#HBarCode').val("");
                                layer.close(index);
                                layer.msg("扫码成功！", { icon: 1, time: 1000 });
                            }
                            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("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                }
            });

@@ -418,18 +546,18 @@
            form.on('submit(Saver)', function (data) {//提交
                //debugger;
                //var sMainStr = JSON.stringify(data.field);
                var tableData = table.cache['bzd-table'];
                for (var i = 0; i < tableData.length; i++) {
                    if (tableData[i].HIsStatus == "是" ) {
                var tableData = table.cache['bzd-table2'];
                //for (var i = 0; i < tableData.length; i++) {
                //    if (tableData[i].HIsStatus == "是" ) {

                    } else {
                        //移除当前行
                        tableData.splice(i, 1);
                        i--;
                        option.data = tableData;
                        table.render(option);
                    }
                }
                //    } else {
                //        //移除当前行
                //        tableData.splice(i, 1);
                //        i--;
                //        option.data = tableData;
                //        table.render(option);
                //    }
                //}
                var sSubStr = JSON.stringify(tableData);
                sSubStr = "{\"oSub\": " + sSubStr + "}";
                //sSubStr = JSON.stringify(sSubStr);
@@ -573,10 +701,10 @@
        }

        function AllowLoadData(sSubStr, bnt) {  //非空验证
            if ($("#HSourceBillNo").val() == '') {
                layer.msg("请先扫源单!", { icon: 5 });
                return false;
            }
            //if ($("#HSourceBillNo").val() == '') {
            //    layer.msg("请先扫源单!", { icon: 5 });
            //    return false;
            //}
            if ($("#HWHNAME").val() == '') {
                layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;