智云MES-UI前端
parent: 1265e1cd | 补丁 | 提交 | show whitespace
yusijie
18 小时以前 a5e8fb4e50f285538ad6800d5abdb66ea367db00 
添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
5个文件已修改
6309 ■■■■■ 已修改文件
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK.html 6118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBindingList.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK.html


Diff too large




 WebTM/views/³µ¼ä¹ÜÀí/¹Ø¼ü¼þ°ó¶¨/Sc_KeyElementBindingList.html


@@ -8,7 +8,6 @@


    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">


    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">


    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">


    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">


    <script src="../../../layuiadmin/layui/layui.js"></script>


    <script src="../../../layuiadmin/Scripts/json2.js"></script>


    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>


@@ -16,6 +15,7 @@


    <script src="../../../layuiadmin/PubCustom.js"></script>


    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>


    <script src="../../../layuiadmin/PageTitle.js"></script>


    <!--<script src="../../../../layuiadmin/modules/soulTable.js"></script>-->


</head>


<body>


    <div class="layui-fluid">


@@ -164,7 +164,6 @@


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>


                                 <a class="layui-btn layui-btn-sm" lay-event="clearFilter">清除所有标题筛选条件</a>


                            </div>


                        </script>


                    </form>


@@ -177,7 +176,6 @@


            base: '../../../layuiadmin/' //静态资源所在路径


        }).extend({


            index: 'lib/index', //主入口模块


            soulTable: '../ext/soulTable'


        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {


            //#region å…¬ç”¨å˜é‡


            var $ = layui.$


@@ -360,16 +358,6 @@


            });


            //#endregion




            //#region æ¸…除所有筛选条件并重载表格


            table.on('toolbar(mainTable)', function (obj) {


                if (obj.event === 'clearFilter') {


                    // æ¸…除所有筛选条件并重载表格


                    // å‚æ•°: tableId


                    soulTable.clearFilter('mainTable')


                }


            });


            //#endregion




            //#region é‡ç½®æŒ‰é’®


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


                set_ClearQuery();


@@ -412,9 +400,6 @@


                    //, cellMinWidth: 90


                    , limit: 500


                    , limits: [50, 500, 5000, 20000]


                    , done: function () {


                        soulTable.render(this)


                    }


                };


            }


            //#endregion


@@ -447,13 +432,10 @@


                                else if ($.inArray(data[i].name, totalArray) > -1) {


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });


                                } else if (data[i].name == '单据号') {


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', filter: true});


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });


                                }


                                else if (data[i].name == '配件条码') {


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '配件条码', filter: true });


                                }


                                else if (data[i].name == '日期') {


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' }, sort: true, width: 200 });


                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '配件条码' });


                                }


                                else {


                                    switch (data[i].Type) {


@@ -462,7 +444,7 @@


                                            col.push({ field: data[i].id, 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:120 });


                                            break;


                                        default:


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, filter: true });


                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });


                                    }


                                }


                            }




 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html


@@ -53,6 +53,18 @@


                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZX" id="HBarcode_ZX" onfocus="this.select();">


                                    </div>


                                </div>


                                <div class="layui-inline">


                                    <label class="layui-form-label">开始日期</label>


                                    <div class="layui-input-block">


                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:110px;">


                                    </div>


                                </div>


                                <div class="layui-inline">


                                    <label class="layui-form-label">结束日期</label>


                                    <div class="layui-input-block">


                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:110px;">


                                    </div>


                                </div>




                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">


                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>


@@ -340,6 +352,8 @@




            //#region åˆå§‹åŒ–界面


            function set_ClearBill() {


                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));


                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


                //初始化表格


                set_InitGrid();


                //查询


@@ -453,6 +467,8 @@


                var HBarcode_SN = $("#HBarcode_SN").val();  //SN号


                var HBarcode_ZB = $("#HBarcode_ZB").val();  //栈板码


                var HBarcode_ZX = $("#HBarcode_ZX").val();  //中箱码


                var HDate = $("#HBeginDate").val();//开始日期


                var HDate1 = $("#HEndDate").val();//结束日期




                //任意字段过滤


                var ColName = $("#ColName").val();//复选框


@@ -536,11 +552,15 @@


                }


                if (HBarcode_ZB) {


                    sWhere += "and  æ ˆæ¿ç  like '%" + HBarcode_ZB + "%'";




                }


                if (HBarcode_ZX) {


                    sWhere += "and  ä¸­ç®±ç  like '%" + HBarcode_ZX + "%'";




                }


                if (HDate) {


                    sWhere += " and CONVERT(varchar(100),生产日期, 23) >= '" + HDate + "'";


                }


                if (HDate1) {


                    sWhere += " and CONVERT(varchar(100),生产日期, 23) <= '" + HDate1 + "'";


                }




                get_Display(sWhere);


@@ -554,6 +574,8 @@


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


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


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


                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));


                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


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


                $("#ColName").val("0");


                $("#Comparator").val("0");




 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_checkSN.html


@@ -2,7 +2,7 @@


<html>


<head>


    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />


    <title>工序单品过站平台(彩盒SN校验)</title>


    <title>工序单品过站平台(SN校验)</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">


@@ -25,7 +25,7 @@


            <div class="layui-card-body" style="padding: 1px;">


                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">


                    <div style="padding: 10px;">


                        <h1 style="text-align: center; padding: 10px 0;"><b>彩盒SN校验过站平台</b></h1>


                        <h1 style="text-align: center; padding: 10px 0;"><b>SN校验过站平台</b></h1>


                    </div>


                    <div class="layui-tab" style="width: 100%; float: left; background-color:white;">


                        <div class="layui-row">


@@ -37,7 +37,7 @@




                            <button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">退出</button>


                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">


                                <label class="layui-form-label" style="padding-left:0px" id="">彩盒SN码:</label>


                                <label class="layui-form-label" style="padding-left:0px" id="">SN码:</label>


                                <input type="text" class="layui-input" name="HBarCode_SN2" lay-verify="HBarCode_SN2" autocomplete="off" placeholder="请键入后回车" id="HBarCode_SN2" style="width: 500px;">


                            </div>






 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_SachetBarCodePrint.html


@@ -43,6 +43,8 @@


                            <div class="layui-input-block">


                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">预览打印</button>-->


                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">生成</button>


                                <button type="button" class="layui-btn" id="PausePrint" lay-submit="" lay-filter="PausePrint">暂停打印</button>


                                <button type="button" class="layui-btn" id="ContinuePrint" lay-submit="" lay-filter="ContinuePrint">继续打印</button>


                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">退出</button>


                            </div>


                        </div>


@@ -52,7 +54,6 @@


                                <div class="layui-tab-content">


                                    <div class="layui-tab-item layui-show">


                                        <div class="layui-form-item">




                                            <div class="layui-inline">


                                                <label class="layui-form-label">生产订单</label>


                                                <div class="layui-input-inline">


@@ -92,8 +93,14 @@


                                            <div class="layui-inline">


                                                <label class="layui-form-label">打印间隔(秒)</label>


                                                <div class="layui-input-inline">


                                                    <input class="layui-input" name="HTime" id="HTime" autocomplete="off" value="3">


                                                    


                                                    <input class="layui-input" name="HTime" id="HTime" autocomplete="off" value="3" onfocus="this.select();">


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">条码编号</label>


                                                <div class="layui-input-inline" style="width:600px;">


                                                    <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="请输入单个补打条码编号，不支持批量补打">


                                                    <button type="button" class="layui-btn" id="PrintBarCode" lay-submit="" lay-filter="PrintBarCode" style="float:left;">补打条码</button>


                                                </div>


                                            </div>


                                        </div>


@@ -156,6 +163,7 @@


            var sWhere = "";


            var HModName = "Cj_SachetBarCodePrint";


            var titleData = [];//不需要显示的字段 å¯æ‰©å±•


            var HWhetherToPrint = true; //是否打印


       


            //#endregion                       


         


@@ -282,6 +290,50 @@


                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//生成按钮禁用


                SaveBarCodeCreate();


            })         




            //暂停打印


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


                layer.confirm("是否确认暂停打印?", {


                    btn: ["确定", "取消"]


                    , btn1: function (index) {


                        layer.close(index);


                        HWhetherToPrint = false;


                    }


                })                


            })




            //继续打印


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


                if (Number($("#HTime").val()) < Number(3)) {


                    layer.msg("打印间隔不允许小于3秒！")


                    return;


                }




                layer.confirm("是否继续打印?", {


                    btn: ["确定", "取消"]


                    , btn1: function (index) {


                        layer.close(index);


                        HWhetherToPrint = true;




                        var HICMOInterID = $("#HICMOInterID").val();


                        var HICMOEntryID = $("#HICMOEntryID").val();


                        //调用打印方法


                        get_BatchPrint(HICMOInterID, HICMOEntryID);


                    }


                })                


            })




            //补打条码


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


                PrintBarCode();


            })




            //条码编号回车方法


            $('#HBarCode').on('keydown', function (event) {


                if (event.keyCode == 13) {


                    PrintBarCode();


                }


            });


          


            //退出


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


@@ -425,7 +477,7 @@


                                //};


                                webapp_ws_ajax_run(args);




                                if (rest.length <= num + 1) {


                                if (rest.length <= num + 1 || HWhetherToPrint == false) {


                                    num = 0;


                                    clearInterval(time);


                                } else {


@@ -464,6 +516,79 @@




            }




            //补打条码


            function PrintBarCode() {


                var HBarCode = $("#HBarCode").val();




                var sWhere = "select top 1 a.HItemID,HBarCode æ¡ç ç¼–号,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HBarCode = '" + HBarCode + "'";




                $.ajax({


                    type: "GET",


                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名


                    async: false,


                    data: { "sWhere": sWhere },


                    success: function (data) {


                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ




                            if (data.data.length != 0) {


                                if (data.data[0].SKU == "") {


                                    layer.msg("物料SKU未维护，请联系管理员确认！");


                                    return;


                                }




                                var dataPrint = [];


                                for (var i = 0; i < data.data.length; i++) {


                                    dataPrint.push(data.data[i])


                                }




                                var Customer = {


                                    "Table": dataPrint


                                }




                                var args = {


                                    type: "print",//打印模式


                                    //type: "preview",//预览模式


                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可


                                    report: urlAddRandomNo("../../grf/香囊标签JSON3.grf"),


                                    data: Customer


                                };




                                console.log("打印香囊条码：" + data.data[0].条码编号);


                                //var args = {


                                //    report: urlAddRandomNo("../../grf/cs10.grf"),


                                //    data: Customer


                                //};


                                webapp_ws_ajax_run(args);                               




                                var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + data.data[0].HItemID;


                                $.ajax({


                                    type: "GET",


                                    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //方法所在页面和方法名


                                    async: false,


                                    data: { "sWhere": sql },


                                    success: function (result) {


                                        //if (result.data.code != 1) {


                                        //    layer.alert("更新打印日期异常：" + result.data.Message);


                                        //}


                                    }


                                })




                            } else {


                                layer.msg("查无数据!");


                            }


                        }


                        else {


                            layer.msg(data.Message, { icon: 5 });


                        }


                        layer.closeAll("loading");


                    },


                    error: function (err) {


                        layer.msg("错误:" + err, { icon: 5 });


                    }


                })




            }




            /**


            * é¦™å›Šä¿¡æ¯è¿‡ç«™


            * @param HBarCode