1、上架归还单：先扫条码再扫货架，如果不匹配不允许提交。2、下架找货单：已下架的条码允许再次下架。

zgq

2021-02-22 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8

1、上架归还单：先扫条码再扫货架，如果不匹配不允许提交。2、下架找货单：已下架的条码允许再次下架。

 WebTM/Properties/PublishProfiles/webtm.pubxml.user

@@ -1075,16 +1075,16 @@
      <publishTime>11/26/2020 17:27:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForBill.html">
      <publishTime>02/21/2021 13:18:54</publishTime>
      <publishTime>02/22/2021 22:19:13</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html">
      <publishTime>02/20/2021 15:21:20</publishTime>
      <publishTime>02/22/2021 22:17:47</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Cc_ReturnBill.html">
      <publishTime>02/05/2021 14:05:30</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>02/21/2021 21:12:01</publishTime>
      <publishTime>02/22/2021 20:38:40</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>

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

@@ -217,11 +217,11 @@
                    , { field: 'HMaterModel', title: '规格型号' }
                    , { field: '即时库存', title: '即时库存' }
                    , { field: 'HBarCode', title: '条码编号', hide: true }
                    , { field: 'HInterID', title: '单据ID' }
                    , { field: 'HInterID', title: '单据ID', hide: true }
                    , { field: 'HBillNo', title: '单据号' }
                    , { field: 'HMakerID', title: '制单人ID' }
                    , { field: 'HMakerID', title: '制单人ID', hide: true }
                    , { field: 'HMaker', title: '制单人' }
                    , { field: 'HBillType', title: 'HBillType' }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                ]]
                , text: {
                    none: '暂无相关数据，请先扫描源单号！' //默认：无数据。注：该属性为 layui 2.2.5 å¼€å§‹æ–°å¢ž
@@ -319,10 +319,14 @@
                                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("该实物在裁切中，不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            } else {
                            }
                            //else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus != "" && sSubStr[i].HStatus != "在库")
                            //{
                            //    layer.close(index);
                            //    layer.msg("该实物在" + sSubStr[i].HSource+"裁切中，不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            //}
                            else
                            {
                                sSubStr[i].HIsStatus = "是";
                                sSubStr[i].HSourceID = $("#HSourceID").val();
                                sSubStr[i].HSource = $("#HSource").val();
@@ -452,15 +456,15 @@
                        async: true,
                        data: { "oMain": sSubStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.confirm(data.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    btn2: function () {
                                        //parent.layui.admin.events.closeThisTabs();关闭页签
                                        //window.close();//关闭页面，浏览器有效，PDA无效
                                        parent.location.href = "../../../views/index.html"
                                    }//关闭
                        success: function (result) {
                            if (result.count == 1) {
                                layer.confirm(result.Message, {
                                icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                btn2: function () {
                                    //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //window.close();//关闭页面，浏览器有效，PDA无效
                                    parent.location.href = "../../../views/index.html"
                                }//关闭
                                }, function () { window.location.reload(); });//新增
                            }
                            else {

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

@@ -53,34 +53,6 @@
                                <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:30px;padding-left:0px;">仓库</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
                                        </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:30px;padding-left:0px;">仓位</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
                                        </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:30px;padding-left:0px;">班组</label>
                                        </div>
                                        <div class="layui-col-xs6">
@@ -149,6 +121,34 @@
                                    </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">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓库</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input" readonly>
                                            <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>
                                        </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:30px;padding-left:0px;">仓位</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <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>
                                <table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
@@ -229,7 +229,7 @@
                , cellMinWidth: 90
                , cols: [[
                    { type: 'numbers', title: '序号' }
                    , { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HIsStatus', title: '是否扫码', hide: true }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HSPID', title: '仓位ID', hide: true }
                    , { field: 'HSPName', title: '仓位' }
@@ -249,11 +249,11 @@
                    , { field: 'HMaterModel', title: '规格型号' }
                    , { field: '即时库存', title: '即时库存' }
                    , { field: 'HBarCode', title: '条码编号', hide: true }
                    , { field: 'HInterID', title: '单据ID' }
                    , { field: 'HBillNo', title: '单据号' }
                    , { field: 'HMakerID', title: '制单人ID' }
                    , { field: 'HMaker', title: '制单人' }
                    , { field: 'HBillType', title: 'HBillType' }
                    , { 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 å¼€å§‹æ–°å¢ž
@@ -271,7 +271,7 @@
                    { type: 'numbers', title: '序号' }
                    //, { field: 'HIsStatus', title: '是否扫码' }
                    , { field: 'HSourceInterID', title: '源单ID', hide: true }
                    , { field: 'HSourceBillNo', title: '源单号', width: 110 }
                    , { field: 'HSourceBillNo', title: '源单号', hide: true }
                    , { field: 'HMTONo', title: '批号', width: 180 }
                    , { field: 'HStatus', title: '在库状态', width: 165 }
                    , { field: 'HWhID', title: '仓库ID', hide: true }
@@ -436,33 +436,37 @@
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                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("该实物在库，不允许扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                } else {
                                    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 });
                                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 });
                                    }
                                }

                            }
                            else {
                                option2.data = [];
@@ -553,26 +557,17 @@

            //提交
            form.on('submit(Saver)', function (data) {//提交
                //debugger;
                //var sMainStr = JSON.stringify(data.field);
                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);
                //    }
                //}
                var sSubStr = JSON.stringify(tableData);
                sSubStr = "{\"oSub\": " + sSubStr + "}";
                //sSubStr = JSON.stringify(sSubStr);
                //var json = "{\"oMain\":" + sMainStr + "},{\"oMain\":" + sSubStr + "}";
                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 index = layer.load();
                    $.ajax(
                    {
@@ -616,20 +611,30 @@
                }
            });


            //扫上架仓位
            $('#HSPName').on('keydown', function (event) {      //扫仓位
                var HBarCode = $('#HSPName').val()
                var HBarCode = $('#HSPName').val();
                if (event.keyCode == 13) {
                    //判断文本框是否有数据    new
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetSpName_Json",
                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HSPName").val(result.data[0].HName);
                                $("#HSPID").val(result.data[0].HItemID);
                                element.tabChange('tab-POStockInBill', '2');
                                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);
                                }
                            }
                            else {
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -733,9 +738,6 @@
                        }
                    }
                }
            }
            else {
                return true;
            }
        }
    </script>

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

@@ -86,7 +86,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:30px;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="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
@@ -100,7 +100,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:30px;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="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
@@ -111,10 +111,10 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;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="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
@@ -125,10 +125,10 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;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="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
@@ -622,7 +622,7 @@
            var sSourceType = '-1'
            if (AllowLoadData(sSubStr, 'Saver') != false)//非空验证
            {
                layer.load(3);
                var index = layer.load(3);
                $.ajax(
                {
                    type: "POST",
@@ -642,10 +642,12 @@
                            }, function () { window.location.reload(); });//新增
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.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: "温馨提示" });
                    }
                });
@@ -685,14 +687,14 @@
                if (sQty != "") {
                    $('#HQty').val("");
                }
                //if ($("#HWHNAME").val() == '') {
                //    layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
                    layer.msg("调入仓库、仓位不能和调出仓库、仓位都相同!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                if ($("#HWHNAME").val() == '') {
                    layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
                //    layer.msg("调入仓库、仓位不能和调出仓库、仓位都相同!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                //if ($("#HSCWHNAME").val() == '') {
                //    layer.msg("调出仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
@@ -993,10 +995,10 @@
            layer.msg("调入仓库没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
            layer.msg("调入仓库、仓位不能和调出仓库、仓位都相同!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
        //    layer.msg("调入仓库、仓位不能和调出仓库、仓位都相同!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //    return false;
        //}
        if ($("#HBillNo").val() == '') {
            layer.msg("错误的单据号!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;