wtt
2026-03-10 d9300c28c05b62da5f52fede40e639e3faad8f53
防错调整
2个文件已添加
4个文件已修改
405 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Vlog/webapi20260309.txt 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/工位标签.grf 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/物料条码_药水.grf 318 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -20,7 +20,7 @@
    //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=ECS-B45B;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=hx_user;Password=lc@841022;";//兴达测试
    //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;";//YSJ测试
    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;";//YSJ测试
    //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=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔
    //public const string SqlConnStr = "Data Source=30.10.7.5;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔新数据库地址
@@ -38,7 +38,9 @@
    //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//迦南
    //public const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//海诚
    //public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//小卫
    public const string SqlConnStr = "Data Source=192.168.110.222; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//华舟
    //public const string SqlConnStr = "Data Source=192.168.110.222; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//华舟
    //public const string SqlConnStr = "Data Source=192.168.3.247,8005; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//华远
    //public string sServer;
    //public string sDataBase;
WebTM/Vlog/webapi20260309.txt
New file
@@ -0,0 +1,71 @@
2026/3/9 9:43:49 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
2026/3/9 9:43:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 9:43:51 ReportDataSet:1
2026/3/9 9:46:24 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
2026/3/9 9:46:24 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 9:46:24 ReportDataSet:1
2026/3/9 13:50:53 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(17)
2026/3/9 13:50:54 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 13:50:54 ReportDataSet:1
2026/3/9 13:51:18 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 13:51:18 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 13:51:18 ReportDataSet:1
2026/3/9 13:53:26 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 13:53:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 13:53:26 ReportDataSet:1
2026/3/9 14:24:49 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 14:24:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:24:49 ReportDataSet:1
2026/3/9 14:28:01 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 14:28:01 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:28:01 ReportDataSet:1
2026/3/9 14:29:39 æ‰“印sql:select * from h_v_IF_BarCodeBillList where hmainid in(127519) order by hmainid desc
2026/3/9 14:29:39 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:29:39 ReportDataSet:1
2026/3/9 14:42:55 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 14:42:55 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:42:55 ReportDataSet:1
2026/3/9 14:43:07 æ‰“印sql:select * from h_v_IF_BarCodeBillList where hmainid in(127519) order by hmainid desc
2026/3/9 14:43:08 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:43:08 ReportDataSet:1
2026/3/9 14:43:30 æ‰“印sql:select * from h_v_IF_BarCodeBillList where hmainid in(127565) order by hmainid desc
2026/3/9 14:43:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:43:30 ReportDataSet:1
2026/3/9 14:52:49 æ‰“印sql:select * from h_v_Gy_WorkStationList where HItemID in(12)
2026/3/9 14:52:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2026/3/9 14:52:49 ReportDataSet:1
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,8 +3,8 @@
    //var WEBURL = "http://192.168.16.80:8011/";        //办公室服务器
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //李林俊本地配置
WebTM/views/grf/¹¤Î»±êÇ©.grf
@@ -99,7 +99,7 @@
                            Height=4.78896
                            BarcodeType=QRCode
                            CaptionPosition=None
                            Text='[#条码编号#]'
                            Text='[#工位代码#]'
                        End
                                    End
                RowSpan=2
WebTM/views/grf/ÎïÁÏÌõÂë_Ò©Ë®.grf
New file
@@ -0,0 +1,318 @@
Object Report
    Version='6.8.9.5'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=135000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.75
        Height=6
        LeftMargin=0
        TopMargin=0
        RightMargin=0
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        ShowColLine=F
        ShowRowLine=F
        Object Border
            Styles=[]
        End
        Object Recordset
            Items Field
                Item
                    Name='生产工单号'
                    DBFieldName='源单单号'
                End
                Item
                    Name='物料代码'
                End
                Item
                    Name='物料名称'
                End
                Item
                    Name='规格型号'
                End
                Item
                    Name='数量'
                End
                Item
                    Name='条码编号'
                End
                Item
                    Name='销售订单号'
                End
                Item
                    Name='批号'
                End
                Item
                    Name='日期'
                    Type=DateTime
                    Format='yyyy/MM/dd'
                End
                Item
                    Name='制作人'
                End
                Item
                    Name='客户型号'
                End
                Item
                    Name='计量单位'
                End
                Item
                    Name='源单单号'
                End
                Item
                    Name='供应商'
                End
                    End
    End
    Items Column
        Item
            Name='Column3'
            Width=9.60438
        End
    End
Object ColumnContent
    Height=6.00604
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    Type=MemoBox
                    Name='凯贝奈特'
                    Left=0.79375
                    Top=0.211667
                    Width=5.3975
                    Height=1.37583
                    Object Font
                        Name='宋体'
                        Size=142500,0
                        Weight=400
                        Charset=134
                    End
                    ShrinkFontToFit=T
                    TextAlign=MiddleCenter
                    CharSpacing=4
                    Text='条码信息'
                End
                Item
                    Type=Barcode
                    Name='Barcode1'
                    Left=6.79979
                    Top=0.211667
                    Width=1.79917
                    Height=1.37583
                    BarcodeType=QRCode
                    CaptionPosition=None
                    Text='[#条码编号#]'
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.132292
                    Top=1.69333
                    Object Border
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=6
                    RowCount=4
                    Items FreeGridColumn
                        Item[1]
                            Width=1.56104
                        End
                        Item[2]
                            Width=1.85208
                        End
                        Item[3]
                            Width=0.767292
                        End
                        Item[4]
                            Width=1.905
                        End
                        Item[5]
                            Width=1.48167
                        End
                        Item[6]
                            Width=1.45521
                        End
                                    End
                Items FreeGridRow
                    Item[1]
                        Height=0.79375
                    End
                    Item[2]
                        Height=0.79375
                    End
                    Item[3]
                        Height=0.820208
                    End
                    Item[4]
                        Height=0.740833
                    End
                            End
            Items FreeGridCell
                Item[1,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料编码'
                End
                Item[1,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#物料代码#]'
                    ColSpan=5
                End
                Item[2,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料名称'
                End
                Item[2,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#物料名称#]'
                    ColSpan=5
                End
                Item[3,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='计量单位'
                    DataName='数量'
                End
                Item[3,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#计量单位#]'
                    ColSpan=2
                End
                Item[3,4]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='批号'
                End
                Item[3,5]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#批号#]'
                    ColSpan=2
                End
                Item[4,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='打印人员'
                    DataName='打印人员'
                End
                Item[4,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#制作人#]'
                    ColSpan=2
                End
                Item[4,4]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='打印日期'
                    DataName='打印日期'
                End
                Item[4,5]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#日期#]'
                    ColSpan=2
                End
                    End
    End
End
End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_WorkStationList.html
@@ -419,7 +419,9 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , page: true
                    , limits: [50, 500, 2000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', field: '序号', title: '序号', style: 'background-color: #f9f9f9;' }