yxj
2023-06-13 dc2a029b1566138924d93502af9b45582d4e6a1e
新增换托调拨单缓存列表模块
4个文件已修改
1个文件已添加
421 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBillList_HuanTuo_PDA.html 263 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -196,6 +196,7 @@
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú¹ÜÀí/Éú²ú×éÍе¥/Sc_PackUnionBill_PDA.html
@@ -452,7 +452,7 @@
                            }
                            else {
                                playSound();
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                document.getElementById("cmdLoadData").disabled = false;  //按钮变为可编辑状态
                            }
                            layer.closeAll("loading");  //关闭加载层
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/µ÷²¦»»ÍÐ/Kf_MoveStockBillList_HuanTuo_PDA.html
New file
@@ -0,0 +1,263 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>换托调拨单缓存列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-tab" lay-filter="tab-Kf_MoveStockBillList_HuanTuo_PDA">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">缓存列表</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item  layui-show">
                                <div class="layui-row">
                                    <div class="layui-col-xs12">
                                        <table class="layui-hide" id="Temp-table" lay-filter="Temp-table"></table>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layui-row">
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">编辑</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">删除</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">新增</button>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
    layui.config({
        base: '../../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
        , admin = layui.admin
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
        var HBillType = '1207'
        var HMaker = sessionStorage["HUserName"]
        var HStockOrgID = sessionStorage["OrganizationID"]
        var option = [];
        //#region åˆå§‹åŒ–界面
        set_ClearBill();
        function set_ClearBill() {
            element.tabChange('tab-Kf_MoveStockBillList_HuanTuo_PDA', '1');
            //初始化表格
            set_InitGrid();
            //读取单据列表
            DisBillEntryList();
        }
        //#region åˆå§‹åŒ–表格方法
        function set_InitGrid() {
            option = {
                elem: '#Temp-table'
                , height: 'full-50'
                //, page: true
                , cellMinWidth: 90
                , limit: 50
                //, limits: [50, 500, 5000, 20000]
            };
        }
        //#endregion
        //#endregion
        //#region ç¼“存列表界面    æŽ§ä»¶äº‹ä»¶
        //#region ç¼–辑功能控件
        form.on('submit(cmdModify)', function () {
            var checkStatus = table.checkStatus('Temp-table')
                , data = checkStatus.data;
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '换托调拨单'
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../../WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
                , resize: false
                , cancel: function () {
                    $(".layui-btn").removeClass("layui-btn-disabled");
                }
            })
        });
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdDelete)', function () {
            var checkStatus = table.checkStatus('Temp-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                layer.confirm("确认要删除吗,删除后将不可恢复!", { title: "删除确认" }, function (index) {
                    var sInterID = data[0].HInterID;
                    $.ajax(
                        {
                            type: "GET",
                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
                            async: true,
                            data: { "HInterID": sInterID, "HBillType": HBillType },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) {
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        DisBillEntryList(); //显示表体明细
                                        //// å¾—到frame索引
                                        //var index = layer.getFrameIndex(window.name);
                                        ////关闭当前frame
                                        //layer.close(index);
                                        ////修改成功后刷新界面
                                        //window.location.reload();
                                    });
                                }
                                else {
                                    layer.msg(data.Message, { icon: 2 });
                                }
                            },
                            error: function (err) {
                                layer.msg('错误' + err, {
                                    icon: 5,
                                    time: 20000
                                }, function () {
                                });
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行记录,进行删除!');
            }
        });
        //#endregion
        //#region åˆ·æ–°åŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdRefresh)', function () {
            DisBillEntryList();
        });
        function DisBillEntryList() {
            var ajaxLoad = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + '/WEBSController/GetPonderationBillMain_TempList_HuanTuo_Json',
                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                success: function (data1) {
                    var col = [];
                    if (data1.count == 1) {
                        var data = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //判断是否是纯英文
                        var patrn = new RegExp("[\u4E00-\u9FA5]+");
                        col.push({ type: 'radio' });
                        for (var i = 0; i < data.length; i++) {
                            if (!patrn.test(data[i].name)) {
                                col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                            }
                            else {
                                switch (data[i].Type) {
                                    case 'DateTime':
                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
                                }
                            }
                        }
                        option.cols = [col];
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("刷新缓存列表信息,接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion
        //#region é€€å‡ºåŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdCancel)', function () {
            layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                parent.location.href = "../../../../views/index_Mobile.html"
            });
        })
        //#endregion
        //#region æ–°å¢žåŠŸèƒ½æŽ§ä»¶
        form.on('submit(cmdAdd)', function () {
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '换托调拨单'
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../../WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html?HInterID_Temp=0', 'yes']
                , resize: false
                , cancel: function () {
                    $(".layui-btn").removeClass("layui-btn-disabled");
                }
            })
        });
        //#endregion
        //#endregion
    });
    </script>
</body>
</html>
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/µ÷²¦»»ÍÐ/Kf_MoveStockBill_HuanTuo_PDA.html
@@ -167,6 +167,8 @@
            var SourceFlag = sessionStorage["SourceFlag"];  //托条码已扫标志
            var OperationType = 0;//操作类型
            var params = get_UrlVars();
            var OperationType = params[params[0]];  //从缓存列表中返回数据类型  1新增  2从缓存列表中返回
            var HInterID_Temp = params[params[1]];  //从缓存列表中返回单据ID
            var option = [];
            //#endregion
@@ -210,38 +212,29 @@
            //#endregion
            //#region   ä»Žç¼“存列表中返回信息
            //function getBillTemp() {
            //    var vars = [], hash;
            //    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            //    for (var i = 0; i < hashes.length; i++) {
            //        hash = hashes[i].split('=');
            //        vars.push(hash[0]);
            //        vars[hash[0]] = hash[1];
            //    }
            //    return vars;
            //}
            //var params = getBillTemp();
            //var HInterID_Temp = params[params[0]];      //从缓存列表中返回单据ID
            //var HBillNo_Temp = params[params[1]];       //从缓存列表中返回单据号
            //var HBarCode_Pack_Temp = params[params[2]]; //从缓存列表中返回托条码
            //#endregion
            //判断是否新增
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 0;  //直接新增
            } else {
                var OperationType = 1;  //缓存中打开
            if (HInterID != 0) {
                SourceFlag = true;
            }
            if (OperationType == 0 && HInterID == 0) {
            //从缓存列表编辑功能跳转至单据模块
            else if (OperationType == 2) {
                RoadBillMain(HInterID_Temp);
                $("#HBarCode").select();
                $("#HBarCode").focus();     //获取光标
                $('#cmdHBarCode_Pack_In').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                //document.getElementById("cmdHBarCode_Pack_In").disabled = true;   //按钮变为不可编辑状态
                element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
                //显示表体明细
                DisBillEntryList();
                SourceFlag = true;
            }
            else {
                OperationType = 1;
                //获取最大单据ID、单据号
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HBillType": HBillType },
                    success: function (d) {
                        if (d.count == 1) {
@@ -257,70 +250,35 @@
                });
                SourceFlag = false;
            }
            else if (OperationType == 0 && HInterID != 0) {
                SourceFlag = true;
            }
            //从缓存列表编辑功能跳转至单据模块
            else if (HInterID == 0) {
                $("#HBarCode_Pack_In").val(params[params[0]]);
            //缓存列表中返回 é¡µé¢èµ‹å€¼
            function RoadBillMain(HInterID_Temp)
            {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKF_MoveStockBill_TempList_HuanTuo_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": HInterID_Temp, "HBillType": HBillType },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBarCode_Pack_In").val(d.data[0].HBarCode_Pack_In);
                $("#HBarCode_Pack_In").attr("readonly", "readonly");
                $("#HPackUnionInterID_In").val(params[params[0]]);
                $("#HWHName").val(params[params[0]]);
                $("#HWHID").val(params[params[0]]);
                $("#HSPName").val(params[params[0]]);
                $("#HSPID").val(params[params[0]]);
                $("#HBarCode").select();
                $("#HBarCode").focus();     //获取光标
                document.getElementById("cmdHBarCode_Pack_In").disabled = true;   //按钮变为不可编辑状态
                element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
                //显示表体明细
                DisBillEntryList();
                SourceFlag = true;
                        $("#HPackUnionInterID_In").val(d.data[0].HPackUnionInterID_In);
                        $("#HWHName").val(d.data[0].HWhName);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HSPName").val(d.data[0].HSPName);
                        $("#HSPID").val(d.data[0].HStockPlaceID);
                        //全局变量赋值
                        HInterID = $('#HInterID').val()
                        HBillNo = $('#HBillNo').val()
                        HBarCode_Pack_In = $('#HBarCode_Pack_In').val()         //调入托条码
                        HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //调入组托单内码
                        HWhID = $('#HWHID').val()   //调入仓库
                        HSPID = $('#HSPID').val()   //调入仓位
            }
            else {
                SourceFlag = true;
                })
            }
            //if (HInterID_Temp == null || HInterID_Temp == 0) {
            //    //获取最大单据ID、单据号
            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
            //        data: { "HBillType": HBillType },
            //        success: function (d) {
            //            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' });
            //            }
            //        }
            //    });
            //    SourceFlag = false;
            //}
            ////从缓存列表编辑功能跳转至单据模块
            //else {
            //    var HInterID_Temp = params[params[0]];      //从缓存列表中返回单据ID
            //    var HBillNo_Temp = params[params[1]];       //从缓存列表中返回单据号
            //    var HBarCode_Pack_Temp = params[params[2]]; //从缓存列表中返回托条码
            //    $('#HInterID').val(HInterID_Temp)
            //    $('#HBillNo').val(HBillNo_Temp)
            //    $('#HBarCode_Pack_In').val(HBarCode_Pack_Temp)
            //    $("#HBarCode_Pack_In").attr("readonly", "readonly");
            //    HInterID = $('#HInterID').val()
            //    HBillNo = $('#HBillNo').val()
            //    HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
            //    $("#HBarCode").focus();
            //    element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
            //    //显示表体明细
            //    DisBillEntryList();
            //    SourceFlag = true;
            //}
            //失败提示音
            function playSound() {
@@ -365,6 +323,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/Get_BarCodePack_In_MoveStockBill_HuanTuo_Json",
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack_In, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        if (result.count == 1) {
@@ -437,7 +396,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_MoveStockBill_HuanTuo_Json",
                        async: true,
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HInterID": HInterID, "HBarCode": sBarCode, "HBillType": HBillType },
                        dataType: "json",
                        success: function (data) {
@@ -481,9 +440,8 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/Get_BarCode_MoveStockBill_HuanTuo_Json",
                        data: {
                            "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID
                        },
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
@@ -514,6 +472,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetBillEntry_Temp_MoveStockBill_HuanTuo_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                    success: function (data1) {
                        var col = [];
@@ -580,14 +539,16 @@
                                        parent.location.href = "../../../../views/index_Mobile.html"
                                    }//关闭
                                }, function () {
                                    HInterID_Temp = 0;
                                    window.location.reload();   //刷新当前页面
                                    //HInterID = 0;
                                    //HInterID_Temp = 0;
                                    //window.location.reload();   //刷新当前页面
                                    location.replace('Kf_MoveStockBill_HuanTuo_PDA.html?OperationType=1&HInterID=0');
                                });//新增
                                layer.load(3);
                            }
                            else {
                                playSound();
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                document.getElementById("cmdLoadData").disabled = false;  //按钮变为可编辑状态
                            }
                            layer.closeAll("loading");  //关闭加载层
WebTM/views/index_Mobile.html
@@ -583,6 +583,12 @@
                              ç”Ÿäº§ç»„托单缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBillList_HuanTuo_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              æ¢æ‰˜è°ƒæ‹¨å•缓存列表
                          </a>
                      </dd>
                      <!--<dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />