yangle
2022-07-31 68130e50856edb2a19b03c489a9b0ecfd884624a
瑞琪 工艺路线基础资料  工艺名称
工序流转卡 单据 打印
1个文件已添加
5个文件已修改
609 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_RoutingBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/瑞与祺江苏打印模板.grf 596 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -22,7 +22,7 @@
    //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;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    //public string sServer;
WebTM/WebTM.csproj
@@ -215,6 +215,7 @@
    <Content Include="views\grf\花型条码.grf" />
    <Content Include="views\grf\工序流转.grf" />
    <Content Include="views\grf\cabinet-CG.grf" />
    <Content Include="views\grf\瑞与祺江苏打印模板.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,14 +1,14 @@

function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_RoutingBillList.html
@@ -83,6 +83,7 @@
                    { type: 'radio' }
                    , { field: 'hmainid', title: '工艺路线ID', hide: true }
                    , { field: '单据号', title: '单据号' }
                    , { field: '工艺名称', title: '工艺路线名称' }
                    , { field: '物料代码', title: '物料代码' }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '规格型号', title: '规格型号' }
WebTM/views/grf/ÈðÓëì÷½­ËÕ´òÓ¡Ä£°å.grf
New file
@@ -0,0 +1,596 @@
Object Report
    Version='6.0.0.6'
    Title='你的报表标题'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=105000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Height=29.7
        LeftMargin=0.4
        TopMargin=0.5
        RightMargin=0.5
        BottomMargin=0.5
    End
    Object DetailGrid
        CenterView=T
        AppendBlankRow=T
        Object Border
            Object Pen
                Width=1.5
            End
        End
        Object Recordset
            Items Field
                Item
                    Name='计划开工日期'
                    Type=DateTime
                    Format='yyyy/MM/dd'
                End
                Item
                    Name='计划完工日期'
                    Type=DateTime
                    Format='yyyy/MM/dd'
                End
                Item
                    Name='批号'
                End
                Item
                    Name='产品名称'
                End
                Item
                    Name='产品代码'
                End
                Item
                    Name='模具编号'
                End
                Item
                    Name='PO'
                End
                Item
                    Name='流水号'
                    Type=Integer
                End
                Item
                    Name='工序名称'
                End
                Item
                    Name='流转卡编号'
                End
                Item
                    Name='喂料批号'
                End
                Item
                    Name='流转卡数量'
                End
                Item
                    Name='产品规格'
                End
                Item
                    Name='子件名称'
                End
                Item
                    Name='销售订单号'
                End
                Item
                    Name='生产订单号'
                End
                Item
                    Name='包装要求'
                End
                Item
                    Name='包装要求编码'
                End
                Item
                    Name='日期'
                End
                Item
                    Name='工序代码'
                End
                Item
                    Name='包装标识编码'
                End
                Item
                    Name='任务单号'
                End
                Item
                    Name='包装标识'
                End
                Item
                    Name='单据号'
                End
                Item
                    Name='子件规格'
                End
            End
        End
        Items Column
            Item
                Name='工序号'
                Width=1.34938
            End
            Item
                Name='物料名称'
                Width=1.53458
            End
            Item
                Name='Column1'
                Width=3.06917
            End
            Item
                Name='规格型号'
                Width=1.61396
            End
            Item
                Name='收料仓库'
                Width=1.79917
            End
            Item
                Name='批号'
                Width=1.53458
            End
            Item
                Name='备注'
                Width=1.5875
            End
            Item
                Name='Column2'
                Width=1.61396
            End
            Item
                Name='Column3'
                Width=1.66688
            End
            Item
                Name='Column4'
                Width=1.98438
            End
            Item
                Name='Column5'
                Width=1.69333
            End
        End
        Object ColumnContent
            Height=1.40229
            RowsPerPage=16
            Items ColumnContentCell
                Item
                    Column='工序号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    DataField='流水号'
                End
                Item
                    Column='物料名称'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    FreeCell=T
                    Items Control
                        Item
                            Type=FieldBox
                            Name='FieldBox10'
                            Dock=Fill
                            DataField='工序代码'
                        End
                    End
                End
                Item
                    Column='Column1'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    WordWrap=T
                    ShrinkFontToFit=T
                    DataField='工序名称'
                End
                Item
                    Column='规格型号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Column='收料仓库'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Column='批号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Column='备注'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Column='Column2'
                End
                Item
                    Column='Column3'
                End
                Item
                    Column='Column4'
                End
                Item
                    Column='Column5'
                End
            End
        End
        Object ColumnTitle
            Height=1.00542
            RepeatStyle=OnPage
            Items ColumnTitleCell
                Item
                    GroupTitle=F
                    Column='工序号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='工序号'
                End
                Item
                    GroupTitle=F
                    Column='物料名称'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='工序代码'
                End
                Item
                    GroupTitle=F
                    Column='Column1'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='工序'
                End
                Item
                    GroupTitle=F
                    Column='规格型号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='日期'
                End
                Item
                    GroupTitle=F
                    Column='收料仓库'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='操作工'
                End
                Item
                    GroupTitle=F
                    Column='批号'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='领料'
                End
                Item
                    GroupTitle=F
                    Column='备注'
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='合格'
                End
                Item
                    GroupTitle=F
                    Column='Column2'
                    TextAlign=MiddleCenter
                    Text='返修'
                End
                Item
                    GroupTitle=F
                    Column='Column3'
                    TextAlign=MiddleCenter
                    Text='报废'
                End
                Item
                    GroupTitle=F
                    Column='Column4'
                    TextAlign=MiddleCenter
                    Text='检验'
                End
                Item
                    GroupTitle=F
                    Column='Column5'
                    TextAlign=MiddleCenter
                    Text='备注'
                End
            End
        End
    End
    Items Parameter
        Item
            Name='Parameter1'
        End
        Item
            Name='Parameter2'
        End
    End
    Items ReportHeader
        Item
            Name='ReportHeader1'
            Height=4.39208
            Items Control
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.185208
                    Top=0.238125
                    Object Border
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=9
                    Items FreeGridColumn
                        Item[1]
                            Width=2.06375
                        End
                        Item[2]
                            Width=2.01083
                        End
                        Item[3]
                            Width=1.82563
                        End
                        Item[6]
                            Width=1.66688
                        End
                        Item[7]
                            Width=1.24354
                        End
                        Item[8]
                            Width=1.24354
                        End
                    End
                    Items FreeGridRow
                        Item[1]
                            Height=1.69333
                        End
                    End
                    Items FreeGridCell
                        Item[1,1]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=Barcode
                                    Name='Barcode1'
                                    Left=5.21229
                                    Width=3.175
                                    Height=1.5875
                                    BarcodeType=QRCode
                                    CaptionPosition=None
                                    Text='[#单据号#]'
                                End
                                Item
                                    Type=FieldBox
                                    Name='FieldBox1'
                                    Left=13.9965
                                    Top=0.211667
                                    Width=4.39208
                                    Height=1.19063
                                    ShrinkFontToFit=T
                                    DataField='单据号'
                                End
                                Item
                                    Type=StaticBox
                                    Name='StaticBox1'
                                    Left=0.211667
                                    Top=0.211667
                                    Width=4.39208
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    Text='瑞与祺热交换器科技(江苏)\r\n工艺流转卡'
                                End
                                Item
                                    Type=StaticBox
                                    Name='StaticBox2'
                                    Left=12.991
                                    Top=0.211667
                                    Width=0.820208
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
                                        Size=142500,0
                                        Bold=T
                                        Charset=134
                                    End
                                    Text='ID'
                                End
                            End
                            ColSpan=9
                        End
                        Item[2,1]
                            Text='物料名称:'
                        End
                        Item[2,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox2'
                                    Dock=Fill
                                    DataField='产品名称'
                                End
                            End
                            ColSpan=3
                        End
                        Item[2,5]
                            Text='物料代码:'
                        End
                        Item[2,6]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox3'
                                    Dock=Fill
                                    DataField='产品代码'
                                End
                            End
                            ColSpan=4
                        End
                        Item[3,1]
                            Text='规格型号:'
                        End
                        Item[3,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox4'
                                    Dock=Fill
                                    DataField='子件规格'
                                End
                            End
                            ColSpan=4
                        End
                        Item[3,6]
                            Text='下达日期'
                        End
                        Item[3,7]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox9'
                                    Dock=Fill
                                    DataField='日期'
                                End
                            End
                            ColSpan=3
                        End
                        Item[4,1]
                            Text='销售订单号:'
                        End
                        Item[4,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox5'
                                    Dock=Fill
                                    DataField='销售订单号'
                                End
                            End
                            ColSpan=3
                        End
                        Item[4,5]
                            Text='生产订单号'
                        End
                        Item[4,6]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox6'
                                    Dock=Fill
                                    DataField='任务单号'
                                End
                            End
                            ColSpan=4
                        End
                        Item[5,1]
                            Text='包装要求'
                        End
                        Item[5,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox7'
                                    Dock=Fill
                                    DataField='包装标识'
                                End
                            End
                            ColSpan=4
                        End
                        Item[5,6]
                            Text='包装要求编码'
                            ColSpan=2
                        End
                        Item[5,8]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox8'
                                    Dock=Fill
                                    DataField='包装标识编码'
                                End
                            End
                            ColSpan=2
                        End
                    End
                End
            End
            RepeatOnPage=T
        End
    End
End
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -1101,7 +1101,8 @@
            //打印
            form.on('submit(btn_print)', function () {//产品
                var hinterid = $("#HinterID").val();
                var hinterid = $("#HInterID").val();
                hinterid = parseInt(hinterid) + 1;
                layer.open({
                    type: 2
                    , area: ['50%', '50%']
@@ -1805,7 +1806,7 @@
                                async: true,
                                data: { "sWhere": "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.data != null) {
                                    if (result.data.length != 0) {
                                        var hbillno = result.data[0].单据号
                                        getRoutingBill(hbillno);
                                    }