zzr99
2022-02-24 b79e5c14b9db371b0b0cd5f7bcc28019a638314b
nothing
1个文件已添加
4个文件已修改
2534 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2125 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/grf/物料条码.grf 402 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldProdInStockBill.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -183,6 +183,7 @@
    <Content Include="views\grf\设备档案.grf" />
    <Content Include="views\grf\器具档案.grf" />
    <Content Include="views\grf\销售退货单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\物料条码.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/ÎïÁÏÌõÂë.grf
New file
@@ -0,0 +1,402 @@
Object Report
    Version='6.0.0.6'
    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='料号'
                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=Currency
                    Format='0.#########;;#'
                End
                Item
                    Name='毛重'
                    Type=Currency
                    Format='0.#########;;#'
                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='批号2'
                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
                            Items FreeGridColumn
                                Item[1]
                                    Width=1.56104
                                End
                                Item[2]
                                    Width=1.85208
                                End
                                Item[3]
                                    Width=1.16417
                                End
                                Item[4]
                                    Width=1.69333
                                End
                                Item[5]
                                    Width=1.00542
                                End
                                Item[6]
                                    Width=2.11667
                                End
                            End
                            Items FreeGridRow
                                Item[1]
                                    Height=0.820208
                                End
                                Item[2]
                                    Height=0.79375
                                End
                                Item[3]
                                    Height=0.79375
                                End
                                Item[4]
                                    Height=0.820208
                                End
                                Item[5]
                                    Height=0.740833
                                End
                            End
                            Items FreeGridCell
                                Item[1,1]
                                    Object Font
                                        Name='宋体'
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='工单号'
                                End
                                Item[1,2]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    ShrinkFontToFit=T
                                    Text='[#生产工单号#]'
                                    ColSpan=2
                                End
                                Item[1,4]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='供应商'
                                End
                                Item[1,5]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='[#供应商#]'
                                    ColSpan=2
                                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='物料编码'
                                End
                                Item[3,2]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='[#物料代码#]'
                                    ColSpan=5
                                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='[#数量#]'
                                End
                                Item[4,3]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='单位'
                                    DataName='单位'
                                End
                                Item[4,4]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='[#计量单位#]'
                                End
                                Item[4,5]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='批号'
                                End
                                Item[4,6]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='[#批号#]'
                                End
                                Item[5,1]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='打印人员'
                                    DataName='打印人员'
                                End
                                Item[5,2]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='[#制作人#]'
                                    ColSpan=2
                                End
                                Item[5,4]
                                    Object Font
                                        Name='宋体'
                                        Size=105000,0
                                        Weight=400
                                        Charset=134
                                    End
                                    Text='打印日期'
                                    DataName='打印日期'
                                End
                                Item[5,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/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldProdInStockBill.aspx
@@ -15,7 +15,7 @@
        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select åº“存组织, å¾€æ¥å•位,单据号,收料仓库,日期,物料代码,物料名称,规格型号,计量单位,实收数量,表体备注,制单人,制单日期,审核人 from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by åº“存组织,往来单位,单据号,收料仓库,日期,物料代码,物料名称,规格型号,计量单位,实收数量,表体备注,制单人,制单日期,审核人 order by å•据号");
        SqlXMLReportData.GenOneRecordset(this, "select åº“存组织, å¾€æ¥å•位,单据号,收料仓库,日期,物料代码,物料名称,规格型号,计量单位,sum(实收数量) å®žæ”¶æ•°é‡,表体备注,制单人,制单日期,审核人 from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by åº“存组织,往来单位,单据号,收料仓库,日期,物料代码,物料名称,规格型号,计量单位,表体备注,制单人,制单日期,审核人 order by å•据号");
    }
</script>
</head>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -245,7 +245,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                , resize: false
                            })
                        }
@@ -264,7 +264,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                , resize: false
                            })
                        }