yangle
2024-06-06 d6db3fa707f470fd8a6160c6daf6bcea75b8a6ce
上下模单优化
4个文件已修改
34 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,8 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔
    //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//帅威
    //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一测试
WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldLowerBillEdit_PDA.html
@@ -503,7 +503,7 @@
            //条形码回车方法
            function txtHBarCode_KeyDown(HBarCode) {
                HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
                //HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
                var sWhere = " and æ¡å½¢ç ='" + HBarCode +"' order by åˆ¶å•日期 desc"
                var index = layer.load();
                $.ajax({
WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit_PDA.html
@@ -522,6 +522,7 @@
                                //生产资源
                                case "BM":
                                case "SS":
                                case "10":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HSourceID": data.HItemID,
                                        "HSourceName": data.HName,
@@ -548,6 +549,12 @@
                                        "HMouldName": data.模具名称,
                                        "HMouldModel": data.模具型号,
                                        "HQty": 1,
                                    });
                                    break;
                                case "CMR":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HSourceID": data.HItemID,
                                        "HSourceName": data.HName,
                                    });
                                    break;
                            }
@@ -583,22 +590,8 @@
                            if (BillNoType5.length == 8) {
                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
                            }
                            if (isValidDate(BillNoType5)) {
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HProcExchBillNo": data.单据号,
                                    "HProcExchInterID": data.hmainid,
                                    "HProcExchEntryID": data.HEntryID,
                                    "HICMOBillNo": data.任务单号,
                                    "HICMOInterID": data.hicmointerid,
                                    "HICMOEntryID": data.HICMOEntryID
                                });
                            }
                            switch (BillNoType5) {
                                //流转卡
                                case "GXLX":
                                if (isValidDate(BillNoType5)) {
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchInterID": data.hmainid,
@@ -607,10 +600,8 @@
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOEntryID": data.HICMOEntryID
                                    });
                                    break;
                                }
                            }
                            $("#HBarCode").val("");
                            layer.close(index);
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html
@@ -150,7 +150,7 @@
</html>
<script>
    layui.config({
        base: '../../../../layuiadmin/' //静态资源所在路径
        base: '../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {