yxj
2023-06-28 4b41140fd83816ca97c99b3ed652e0975dff4a88
PDA直接调拨扫码模块优化
5个文件已修改
3642 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2850 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 740 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>E:\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -52,8 +52,8 @@
                            <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="6" style="padding:1px;min-width: 35px;">汇总</li>
                            <!--<li lay-id="5" style="padding:1px;">库存信息</li>
                            <li lay-id="6" style="padding:1px;min-width: 35px;">汇总</li>-->
                        </ul>
                        <div class="layui-tab-content">
                            <!--选择源单-->
@@ -93,7 +93,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:60px;padding-left:0px;">FIFOWH</label><!--先进先出仓库-->
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">先进先出仓库</label><!--先进先出仓库-->
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
@@ -346,13 +346,13 @@
                                <table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
                            </div>
                            <!--库存信息-->
                            <div class="layui-tab-item">
                            <!--<div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                            </div>
                            </div>-->
                            <!--汇总-->
                            <div class="layui-tab-item">
                            <!--<div class="layui-tab-item">
                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                            </div>
                            </div>-->
                        </div>
                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
            <div class="layui-row">
@@ -410,7 +410,86 @@
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var HInterID = $('#HInterID').val()
            var HBillNo = $('#HBillNo').val()
            var HBillType = '1207'
            var HMaker = sessionStorage["HUserName"]
            var HSourceFlag = sessionStorage["SourceFlag"];
            var OperationType = 0;//操作类型
            var option = [];
            $("#HSourceBillNo").focus();
            var listOption = {
                elem: '#wl-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , limit: 3000
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HAuxPropName', title: '辅助属性', width: 150 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    //, { field: 'HBatchNo', title: '批次', width: 150, hide: true }
                    , { field: 'HPieceQty', title: '条码数量', width: 150, totalRow: true }
                    , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
                    , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
                    , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            var FIFOlistOption = {
                elem: '#FIFOlist-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , limit: 3000
                , totalRow: true
                , cols: [[
                    { field: 'HQty', title: '数量', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: '下架数量', width: 150, totalRow: true }
                    , { field: 'HWhName', title: '仓库', width: 150 }
                    , { field: 'HSPName', title: '仓位', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }
                    , { field: 'HAuxPropName', title: '辅助属性', width: 150 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            var listOption1 = {
                elem: '#mx-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            //表头初始化赋值(根据登录用户获取 é»˜è®¤ä»“库、部门、验收、保管、金蝶用户) new
            //$("#HSCWHID").val(sessionStorage["HWHID"]);
@@ -438,16 +517,14 @@
            $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
            $("#HStockInOrgName").val(sessionStorage["Organization"]);
            $("#HBillSubType").val(sessionStorage["HBillSubType"]);
            var HSourceFlag = sessionStorage["SourceFlag"];
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效,请重新登录!", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            //获取参数
            function getUrlVars() {
@@ -460,32 +537,58 @@
                }
                return vars;
            }
            //var params = getUrlVars();
            //var HInterID_Temp = params[params[0]]; //从参数中获取 å•据内码
            //var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•据内码
            var HSourceBillType = params[params[1]]; //用于判断源单类型
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var OperationType = params[params[0]];  //从缓存列表中返回数据类型  1新增  2从缓存列表中返回
            var HInterID_Temp = params[params[1]];  //从缓存列表中返回单据ID
            var HSourceBillType = params[params[2]]; //用于判断源单类型
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HBillNo").val("");
            if (HInterID != 0) {
                HSourceFlag = true;
            }
            //从缓存列表编辑功能跳转至单据模块
            else if (OperationType == 2) {
                RoadBillMain(HInterID_Temp);
                $("#HBarCode").select();
                $("#HBarCode").focus();     //获取光标
                //$('#QueDin2').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                //document.getElementById("QueDin2").disabled = true;   //按钮变为不可编辑状态
                //显示表体明细
                DisBillEntryList();
                HSourceFlag = true;
            }
            else {
                OperationType = 1;
                //获取最大单据ID、单据号
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '1207' },
                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HBillType": HBillType },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        if (d.count == 1) {
                            $("#HInterID").val(d.data[0].HInterID);
                            $("#HBillNo").val(d.data[0].HBillNo);
                            HInterID = $('#HInterID').val()
                            HBillNo = $('#HBillNo').val()
                        }
                        else {
                            layer.msg(d.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }
                });
                //获取单据子类型
                var HBillSubType = '';
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -502,43 +605,17 @@
                        layer.closeAll("loading");
                    }
                })
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid);
                RoadBillSub(linterid);
                HSourceFlag = false;
            }
            if (HSourceBillType == 1402) { //发货通知单
                $("#HBillType").val(1402);
            } else if (HSourceBillType == 1243) { //调拨申请单
                $("#HBillType").val(1243);
            } else if (HSourceBillType == 1214) { //生产发料通知单
                $("#HBillType").val(1214);
            } else if (HSourceBillType == 1604) { //委外用料清单
                $("#HBillType").val(1604);
            } else if (HSourceBillType == 1242) { //出库申请单
                $("#HBillType").val(1242);
            } else {
                $("#HBillType").val(-1);
            }
             //直接调拨  æ‰«è°ƒå‡ºä»“库--调入仓库--条码
            if ($("#HBillType").val() == -1) {
                element.tabChange('tab-MoveStockBill', '2');
                $("#HSCWHNAME").focus();//调出仓库
            }
            function RoadBillMain(linterid)//加载表头
            function RoadBillMain(HInterID_Temp)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetPonderationBill",
                    type: "GET",
                    data: { "HInterID": linterid },
                    url: GetWEBURL() + "/Web/GetPonderationBill",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": HInterID_Temp },
                    success: function (d) {
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
@@ -609,7 +686,7 @@
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled","true");
                        $("#HSourceBillNo").attr("disabled", "true");
                        //$("#HSourceBillNo").append.readonly = true;
                        HSourceFlag = true;
                        //$("#HWHID").val(d.data[0].HWhID);
@@ -624,8 +701,9 @@
                var HBillSubType = '';
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -642,7 +720,78 @@
            }
            function RoadBillSub(linterid)//加载表体
            ////判断是否新增
            //if (HInterID_Temp == null || HInterID_Temp == 0) {
            //    //获取最大单据号 new
            //    $("#HInterID").val("");
            //    $("#HBillNo").val("");
            //    $.ajax({
            //        url: GetWEBURL() + "/Web/GetMAXNumPDA",
            //        type: "GET",
            //        data: { "HBillType": '1207' },
            //        success: function (d) {
            //            //console.log(d.data);
            //            $("#HInterID").val(d.data[0].HInterID);
            //            $("#HBillNo").val(d.data[0].HBillNo);
            //        }
            //    });
            //    //获取单据子类型
            //    var HBillSubType = '';
            //    var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
            //    $.ajax({
            //        url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
            //        type: "GET",
            //        data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
            //        success: function (result) {
            //            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //                var data = result.data;
            //                for (var i = 0; i < data.length; i++) {
            //                    HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
            //                }
            //                $("#HBillSubType").append(HBillSubType);
            //                if (HSourceBillType == 1402) { //发货通知单
            //                    $("#HBillSubType").val("ZJDB02_SYS"); //单据类型默认为寄售
            //                }
            //                form.render('select');
            //            }
            //            layer.closeAll("loading");
            //        }
            //    })
            //}
            //else {//如果修改则走下面 new
            //    RoadBillMain(HInterID_Temp);
            //    RoadBillSub(HInterID_Temp);
            //}
            if (HSourceBillType == 1402) { //发货通知单
                $("#HBillType").val(1402);
            } else if (HSourceBillType == 1243) { //调拨申请单
                $("#HBillType").val(1243);
            } else if (HSourceBillType == 1214) { //生产发料通知单
                $("#HBillType").val(1214);
            } else if (HSourceBillType == 1604) { //委外用料清单
                $("#HBillType").val(1604);
            } else if (HSourceBillType == 1242) { //出库申请单
                $("#HBillType").val(1242);
            } else {
                $("#HBillType").val(-1);
            }
             //直接调拨  æ‰«è°ƒå‡ºä»“库--调入仓库--条码
            if ($("#HBillType").val() == -1) {
                element.tabChange('tab-MoveStockBill', '2');
                $("#HSCWHNAME").focus();//调出仓库
            }
            function RoadBillSub(HInterID_Temp)//加载表体
            {
                table.render({
                    elem: '#wl-table'
@@ -651,7 +800,7 @@
                    , page: true
                    , limit: 100
                    , defaultToolbar: []
                    , where: { HBillID: linterid, HBillType: '1207', sWhere: '' }
                    , where: { HBillID: HInterID_Temp, HBillType: '1207', sWhere: '' }
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HQty', title: '数量', width: 150 }
@@ -952,21 +1101,46 @@
            //编辑
            form.on('submit(cmdModify)', function () {//编辑
                var sSubStr = table.cache['wl-table'];
                //if (AllowLoadData(sSubStr) != false) {//非空验证
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '明细列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/公共页面/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
                var checkStatus = table.checkStatus('wl-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '明细列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../../views/公共页面/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //显示表体明细
                            DisBillEntryList();
                        }
                    })
                }
                else {
                    layer.msg('请先选择一行记录,进行编辑!');
                }
                //var sSubStr = table.cache['wl-table'];
                ////if (AllowLoadData(sSubStr) != false) {//非空验证
                //layer.open({
                //    type: 2
                //    , area: ['100%', '100%']
                //    , title: '明细列表'
                //    , shade: 0.6 //遮罩透明度
                //    , maxmin: true //允许全屏最小化
                //    , anim: 0 //0-6的动画形式,-1不开启
                //    , content: ['../../../views/公共页面/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
                //    , resize: false
                //    , cancel: function () {
                //        //$(".layui-btn").removeClass("layui-btn-disabled");
                //    }
                //})
                // }
            });
@@ -1036,7 +1210,7 @@
                    {
                        type: "Get",
                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
                        async: true,
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HInterID": sInterID, "HBillType": HBillType },
                        dataType: "json",
                        success: function (data) {
@@ -1072,7 +1246,7 @@
                        {
                            type: "POST",
                            url: GetWEBURL() + "/MoveStockBill/set_SaveMoveStockBill_Json", //方法所在页面和方法名
                            async: true,
                            async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                            data: { "oMain": sMainStr },
                            dataType: "json",
                            success: function (data) {
@@ -1085,7 +1259,10 @@
                                            //window.close();//关闭页面,浏览器有效,PDA无效
                                            parent.location.href = "../../../views/index.html"
                                        }//关闭
                                    }, function () { window.location.reload(); });//新增
                                    }, function () {
                                        //window.location.reload();
                                        location.replace('Kf_MoveStockBill_Fast.html?OperationType=1&HInterID=0');
                                    });//新增
                                }
                                else {
                                    layer.close(index);
@@ -1136,8 +1313,9 @@
                var HFIFOWhID = $("#HFIFOWHID").val()
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -1178,35 +1356,38 @@
                                //扫源单成功后,光标显示到调出仓库上
                                $("#HSCWHNAME").focus();
                            } 
                            $.ajax({
                                url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                type: "GET",
                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        listOption.data = result.data.Materlist;
                                        table.render(listOption);
                                        FIFOlistOption.data = result.data.FIFOlist;
                                        table.render(FIFOlistOption);
                                        //console.log(result.data.list2);
                                        var count = 0;
                                        var count1 = 0;
                                        for (var i = 0; i < result.data.Materlist.length; i++) {
                                            count += result.data.Materlist[i].HQty;
                                            count1 += result.data.Materlist[i].HPieceQty;
                                        }
                                        $("#HSumQtys").val(count);
                                        $("#HBarCodeQtys").val(count1);
                                        //return;
                                    }
                                    else {
                                        layer.msg(result.Message);
                                    }
                                    layer.closeAll("loading");
                                }
                            });
                            //显示表体明细
                            DisBillEntryList();
                            //$.ajax({
                            //    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                            //    type: "GET",
                            //    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                            //    success: function (result) {
                            //        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //            listOption.data = result.data.Materlist;
                            //            table.render(listOption);
                            //            FIFOlistOption.data = result.data.FIFOlist;
                            //            table.render(FIFOlistOption);
                            //            //console.log(result.data.list2);
                            //            var count = 0;
                            //            var count1 = 0;
                            //            for (var i = 0; i < result.data.Materlist.length; i++) {
                            //                count += result.data.Materlist[i].HQty;
                            //                count1 += result.data.Materlist[i].HPieceQty;
                            //            }
                            //            $("#HSumQtys").val(count);
                            //            $("#HBarCodeQtys").val(count1);
                            //            //return;
                            //        }
                            //        else {
                            //            layer.msg(result.Message);
                            //        }
                            //        layer.closeAll("loading");
                            //    }
                            //});
                        }
                        else {
                            playSound();
@@ -1275,41 +1456,44 @@
                    }
                    $.ajax(
                        {
                            type: "Get",
                            type: "GET",
                            url: GetWEBURL() + "/ProductIn/Delete_Json",
                            async: true,
                            async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    $.ajax({
                                        url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                        type: "GET",
                                        data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                        success: function (result) {
                                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                listOption.data = result.data.Materlist;
                                                table.render(listOption);
                                                FIFOlistOption.data = result.data.FIFOlist;
                                                table.render(FIFOlistOption);
                                    //显示表体明细
                                    DisBillEntryList();
                                                //console.log(result.data.list2);
                                                var count = 0;
                                                var count1 = 0;
                                                for (var i = 0; i < result.data.Materlist.length; i++) {
                                                    count += result.data.Materlist[i].HQty;
                                                    count1 += result.data.Materlist[i].HPieceQty;
                                                }
                                                $("#HSumQtys").val(count);
                                                $("#HBarCodeQtys").val(count1);
                                                //return;
                                            }
                                            else {
                                                layer.msg(result.Message);
                                            }
                                            layer.closeAll("loading");
                                        }
                                    });
                                    //$.ajax({
                                    //    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                    //    type: "GET",
                                    //    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                    //    success: function (result) {
                                    //        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    //            listOption.data = result.data.Materlist;
                                    //            table.render(listOption);
                                    //            FIFOlistOption.data = result.data.FIFOlist;
                                    //            table.render(FIFOlistOption);
                                    //            //console.log(result.data.list2);
                                    //            var count = 0;
                                    //            var count1 = 0;
                                    //            for (var i = 0; i < result.data.Materlist.length; i++) {
                                    //                count += result.data.Materlist[i].HQty;
                                    //                count1 += result.data.Materlist[i].HPieceQty;
                                    //            }
                                    //            $("#HSumQtys").val(count);
                                    //            $("#HBarCodeQtys").val(count1);
                                    //            //return;
                                    //        }
                                    //        else {
                                    //            layer.msg(result.Message);
                                    //        }
                                    //        layer.closeAll("loading");
                                    //    }
                                    //});
                                    playSound1();
                                    //清空数量
                                    $("#HQty").val("");
@@ -1344,8 +1528,9 @@
                        $('#HQty').val("");
                    }
                    $.ajax({
                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": WhID, "HSPID": SPID, "HSCWHID": HSCWhID, "HSCSPID": HSCSPID, "HQty": sQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle },
                        success: function (result) {
                            if (result.count == 1) {
@@ -1488,34 +1673,38 @@
                                }
                                layer.load(3)
                                $.ajax({
                                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                    type: "GET",
                                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            listOption.data = result.data.Materlist;
                                            table.render(listOption);
                                            FIFOlistOption.data = result.data.FIFOlist;
                                            table.render(FIFOlistOption);
                                            //console.log(result.data.list2);
                                            var count = 0;
                                            var count1 = 0;
                                            for (var i = 0; i < result.data.Materlist.length; i++) {
                                                count += result.data.Materlist[i].HQty;
                                                count1 += result.data.Materlist[i].HPieceQty;
                                            }
                                            $("#HSumQtys").val(count);
                                            $("#HBarCodeQtys").val(count1);
                                            //return;
                                        }
                                        else {
                                            layer.msg(result.Message);
                                        }
                                        layer.closeAll("loading");
                                    }
                                });
                                //显示表体明细
                                DisBillEntryList();
                                //$.ajax({
                                //    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                //    type: "GET",
                                //    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                //    success: function (result) {
                                //        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                //            listOption.data = result.data.Materlist;
                                //            table.render(listOption);
                                //            FIFOlistOption.data = result.data.FIFOlist;
                                //            table.render(FIFOlistOption);
                                //            //console.log(result.data.list2);
                                //            var count = 0;
                                //            var count1 = 0;
                                //            for (var i = 0; i < result.data.Materlist.length; i++) {
                                //                count += result.data.Materlist[i].HQty;
                                //                count1 += result.data.Materlist[i].HPieceQty;
                                //            }
                                //            $("#HSumQtys").val(count);
                                //            $("#HBarCodeQtys").val(count1);
                                //            //return;
                                //        }
                                //        else {
                                //            layer.msg(result.Message);
                                //        }
                                //        layer.closeAll("loading");
                                //    }
                                //});
                                playSound1();
                                //清空数量
                                $("#HQty").val("");
@@ -1528,6 +1717,49 @@
                        }
                    });
                }
            }
            //#endregion
            //#region æ˜¾ç¤ºç‰©æ–™åˆ—表信息
            function DisBillEntryList() {
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var HBillType = '1207'
                var HStockOutOrgID = $("#HStockOutOrgID").val()//调出组织
                //刷新列表信息
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            listOption.data = result.data.Materlist;
                            table.render(listOption);
                            FIFOlistOption.data = result.data.FIFOlist;
                            table.render(FIFOlistOption);
                            //console.log(result.data.list2);
                            var count = 0;
                            var count1 = 0;
                            for (var i = 0; i < result.data.Materlist.length; i++) {
                                count += result.data.Materlist[i].HQty;
                                count1 += result.data.Materlist[i].HPieceQty;
                            }
                            $("#HSumQtys").val(count);
                            $("#HBarcodeQtys").val(count1);
                            //return;
                        }
                        else {
                            layer.msg(result.Message);
                        }
                        layer.closeAll("loading");
                    }
                });
            }
            //#endregion
@@ -1685,40 +1917,43 @@
                            {
                                type: "Get",
                                url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
                                async: true,
                                async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                                data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
                                dataType: "json",
                                success: function (data) {
                                    if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        //显示表体明细
                                        $.ajax({
                                            url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                            type: "GET",
                                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                            success: function (result) {
                                                if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                    listOption.data = result.data.Materlist;
                                                    table.render(listOption);
                                                    FIFOlistOption.data = result.data.FIFOlist;
                                                    table.render(FIFOlistOption);
                                        DisBillEntryList();
                                                    //console.log(result.data.list2);
                                                    var count = 0;
                                                    var count1 = 0;
                                                    for (var i = 0; i < result.data.Materlist.length; i++) {
                                                        count += result.data.Materlist[i].HQty;
                                                        count1 += result.data.Materlist[i].HPieceQty;
                                                    }
                                                    $("#HSumQtys").val(count);
                                                    $("#HBarCodeQtys").val(count1);
                                                    //return;
                                                }
                                                else {
                                                    layer.msg(result.Message);
                                                }
                                                layer.closeAll("loading");
                                            }
                                        });
                                        ////显示表体明细
                                        //$.ajax({
                                        //    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                                        //    type: "GET",
                                        //    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                                        //    success: function (result) {
                                        //        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        //            listOption.data = result.data.Materlist;
                                        //            table.render(listOption);
                                        //            FIFOlistOption.data = result.data.FIFOlist;
                                        //            table.render(FIFOlistOption);
                                        //            //console.log(result.data.list2);
                                        //            var count = 0;
                                        //            var count1 = 0;
                                        //            for (var i = 0; i < result.data.Materlist.length; i++) {
                                        //                count += result.data.Materlist[i].HQty;
                                        //                count1 += result.data.Materlist[i].HPieceQty;
                                        //            }
                                        //            $("#HSumQtys").val(count);
                                        //            $("#HBarCodeQtys").val(count1);
                                        //            //return;
                                        //        }
                                        //        else {
                                        //            layer.msg(result.Message);
                                        //        }
                                        //        layer.closeAll("loading");
                                        //    }
                                        //});
                                    }
                                    else {
                                        layer.msg(data.Message, { icon: 2 });
@@ -1745,7 +1980,7 @@
                elem: '#mx-table'
                // , url: GetWEBURL() + '/MoveStockBill/GetHBarCodeShowBillSub'
                //, toolbar: '#toolbarDemo'
                // , where: { sMsg: linterid, sMsg2: lentryid }
                // , where: { sMsg: HInterID_Temp, sMsg2: lentryid }
                , cols: [[
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                ]]
@@ -1799,77 +2034,6 @@
        });
        var listOption = {
            elem: '#wl-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , limit: 3000
            , totalRow: true
            , cols: [[
                { type: 'radio' }
            , { field: 'HQty', title: '数量', width: 150, totalRow: true }
            , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true}
            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
            , { field: 'HMaterName', title: '物料名称', width: 150 }
            , { field: 'HMaterModel', title: '规格型号', width: 150 }
            , { field: 'HAuxPropName', title: '辅助属性', width: 150 }
            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
            //, { field: 'HBatchNo', title: '批次', width: 150, hide: true }
                , { field: 'HPieceQty', title: '条码数量', width: 150, totalRow: true }
            , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
            , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
            , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
            , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
            , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        var FIFOlistOption = {
            elem: '#FIFOlist-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , limit: 3000
            , totalRow: true
            , cols: [[
                { field: 'HQty', title: '数量', width: 150, totalRow: true }
                , { field: 'HQtyMust', title: '下架数量', width: 150, totalRow: true }
                , { field: 'HWhName', title: '仓库', width: 150 }
                , { field: 'HSPName', title: '仓位', width: 150 }
                , { field: 'HMaterName', title: '物料名称', width: 150 }
                , { field: 'HMaterModel', title: '规格型号', width: 150 }
                , { field: 'HBatchNo', title: '批次', width: 150 }
                , { field: 'HAuxPropName', title: '辅助属性', width: 150 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        var listOption1 = {
            elem: '#mx-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , cols: [[
                { type: 'radio' }
                , { field: 'HQty', title: '数量', width: 150, totalRow: true }
                , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true }
                , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                , { field: 'HMaterName', title: '物料名称', width: 150 }
                , { field: 'HMaterModel', title: '规格型号', width: 150 }
                , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                , { field: 'HBatchNo', title: '批次', width: 150 }
                , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        //以上为layui模块
        
@@ -1986,27 +2150,27 @@
                layer.msg("没有物料明细记录!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (bnt == 'Saver') {
                if (!typeof (sSubStr) == "undefined") {
                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
                                layer.msg("数量不能大于应收数量!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return false;
                            }
                        }
                    }
                    //for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
                    //    if (parseFloat(sSubStr[i].HQty) == 0) {
                    //        layer.msg("外购入库记录未扫码!", { icon: 5 });
                    //        return false;
                    //    }
                    //}
                }
            }
            else {
                return true;
            }
            //if (bnt == 'Saver') {
            //    if (!typeof (sSubStr) == "undefined") {
            //        for (var i = 0; i <= sSubStr.length - 1; i++) {  //判断扫码数量不能大于应收数量
            //            if (parseFloat(sSubStr[i].HQtyMust) > 0) {
            //                if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
            //                    layer.msg("数量不能大于应收数量!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //                    return false;
            //                }
            //            }
            //        }
            //        //for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
            //        //    if (parseFloat(sSubStr[i].HQty) == 0) {
            //        //        layer.msg("外购入库记录未扫码!", { icon: 5 });
            //        //        return false;
            //        //    }
            //        //}
            //    }
            //}
            //else {
            //    return true;
            //}
        }
        
    </script>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html
@@ -161,26 +161,40 @@
        //编辑
        form.on('submit(cmdModify)', function () {
            var checkStatus = table.checkStatus('dj-table')
                     , data = checkStatus.data;
            //ajaxLabelData = data;
            //layer.alert(rows);
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '调拨单'
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
                , resize: false
                , cancel: function () {
                    $(".layui-btn").removeClass("layui-btn-disabled");
                , data = checkStatus.data;
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
                async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": sBillType },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '直接调拨单'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: ['../../仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID + '&HSourceBillType=' + data[0].HSourceBillType, 'yes']
                            , resize: false
                            , cancel: function () {
                                $(".layui-btn").removeClass("layui-btn-disabled");
                            }
                        })
                    }
                    else {
                        layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.msg("错误" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            })
            });
        });
        form.on('submit(cmdRefresh)', function () {//刷新
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -957,7 +957,7 @@
                    {
                        type: "Get",
                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
                        async: true,
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HInterID": sInterID, "HBillType": HBillType },
                        dataType: "json",
                        success: function (data) {