wtt
2025-12-08 a05d359214bafb59005aecef2b7ab39e3951a8d1
添康添加职员标签,上架单优化
6个文件已修改
2个文件已添加
254 ■■■■■ 已修改文件
WebTM/Vlog/webapi20251204.txt 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/职员标签.grf 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Vlog/webapi20251204.txt
New file
@@ -0,0 +1,35 @@
2025/12/4 9:49:39 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222439)
2025/12/4 9:49:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 9:49:42 ReportDataSet:1
2025/12/4 11:01:51 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
2025/12/4 11:01:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 11:01:51 ReportDataSet:1
2025/12/4 11:30:23 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
2025/12/4 11:30:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 11:30:23 ReportDataSet:1
2025/12/4 11:30:34 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(102119)
2025/12/4 11:30:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 11:30:34 ReportDataSet:1
2025/12/4 14:59:33 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
2025/12/4 14:59:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 14:59:33 ReportDataSet:1
2025/12/4 15:00:26 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
2025/12/4 15:00:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2025/12/4 15:00:26 ReportDataSet:1
WebTM/WebTM.csproj.user
@@ -2,8 +2,8 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
WebTM/views/WMSɨÂëÄ£¿é/ÕÒ»õÉϼܵ¥/Kf_MaterialUpperBill_PDA.html
@@ -103,7 +103,7 @@
                                            </div>
                                            <div class="layui-col-xs9">
                                                <div class="layui-col-xs10">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" readonly>
                                                </div>
                                                <!--<div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
@@ -342,7 +342,7 @@
                table.render(LowerListOption);
                //光标默认在条码位置上
                var pFocus = $("#HSourceBillNo");
                var pFocus = $("#HBarCode");
                pFocus.select();
                pFocus.focus();     //获取光标
            }
@@ -929,7 +929,11 @@
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
                                if (sBarCode.startsWith("GXLX")) {
                                    $("#HMainSourceBillNo").val(sBarCode);
                                    $("#HSourceBillNo").val(sBarCode);
                                }
                                if (HSourceFlag != true) {
                                    HSourceFlag = true;
                                }
WebTM/views/grf/Ö°Ô±±êÇ©.grf
New file
@@ -0,0 +1,151 @@
Object Report
    Version='6.8.2.2'
    Title='你的报表标题'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=105000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.7
        Height=6
        LeftMargin=0.1
        TopMargin=0
        RightMargin=0.1
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        Object Border
            Object Pen
                Width=1.5
            End
        End
        Object Recordset
            Items Field
                Item
                    Name='职员名称'
                End
                Item
                    Name='职员代码'
                End
                    End
    End
    Items Column
        Item
            Name='标签宽度'
            Width=9.7
            FixedWidth=T
        End
    End
Object ColumnContent
    Height=5.3975
    Items ColumnContentCell
        Item
            Column='标签宽度'
            FreeCell=T
            Items Control
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.396875
                    Top=0.211667
                    Object Border
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=2
                    RowCount=2
                    Items FreeGridColumn
                        Item[1]
                            Width=3.99521
                            FixedWidth=T
                        End
                        Item[2]
                            Width=4.6
                            FixedWidth=T
                        End
                                    End
                Items FreeGridRow
                    Item[1]
                        Height=2.5
                    End
                    Item[2]
                        Height=2.5
                    End
                            End
            Items FreeGridCell
                Item[1,1]
                    Object Font
                        Name='宋体'
                        Size=142500,0
                        Bold=T
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='[#职员代码#]'
                End
                Item[1,2]
                    FreeCell=T
                    Items Control
                        Item
                            Type=Barcode
                            Name='Barcode1'
                            Left=0.211667
                            Top=0.211667
                            Width=4.18042
                            Height=4.78896
                            BarcodeType=QRCode
                            CaptionPosition=None
                            Text='[#条码编号#]'
                        End
                                    End
                RowSpan=2
            End
            Item[2,1]
                Object Font
                    Name='宋体'
                    Size=142500,0
                    Bold=T
                    Charset=134
                End
                TextAlign=MiddleCenter
                Text='[#职员名称#]'
            End
            End
End
End
End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='标签宽度'
            TextAlign=MiddleCenter
            PaddingLeft=0
            PaddingRight=0
            PaddingTop=0
            PaddingBottom=0
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0.211667
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -2764,8 +2764,56 @@
                        //setTableByHMater(obj, data);
                    }
                })
                //工作中心下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="工作中心代码"] .layui-table-edit',
                    searchKey: '工作中心代码,工作中心名称',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        var data = '';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_WorkCenter/list',
                            type: "GET",
                            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                            async: false,
                            success: function (data1) {
                                if (data1.count == 1) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败!', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'HItemID', title: 'HItemID', hide: true },
                            { field: '工作中心代码', title: '工作中心代码' },
                            { field: '工作中心名称', title: '工作中心名称' },
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        obj.update({
                            "工作中心": data.data[0]["工作中心名称"]
                            , "HCenterID": data.data[0]["HItemID"]
                            , "工作中心代码": data.data[0]["工作中心代码"]
                        })
                        table.render(option);
                        //setTableByHMater(obj, data);
                    }
                })
            }
            //编辑 é¡µé¢èµ‹å€¼
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_KeyElement.html
@@ -91,7 +91,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">工序流转卡</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                            </div>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html
@@ -207,7 +207,7 @@
                                            <tr>
                                                <th>操作员</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="操作员代码" autocomplete="off" class="layui-input" style="border-radius: 50px;">
                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="操作员代码" autocomplete="off" class="layui-input" style="border-radius: 50px;" onclick="this.select()">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">确定</button>
                                                </td>
                                                <td class="bz_td">