Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yangle

2022-05-18 5e5bef3f5b55a7e052f0d271328b1d670b5f9384

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/WebTM.csproj

@@ -206,8 +206,8 @@
    <Content Include="views\grf\墙咔条码.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\生产单.grf" />
    <Content Include="views\grf\生产单.grf" />
    <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>
@@ -646,10 +646,8 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdMoveStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_BZPackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_HXPackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_PackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_WLPackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonList.html" />
@@ -1311,20 +1309,6 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_BZPackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_BZPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_HXPackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_HXPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_PackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1332,12 +1316,12 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_PackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_WLPackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_WLPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>

 WebTM/views/grf/°ü×°·½Ê½ÌõÂë.grf

@@ -1,5 +1,5 @@
Object Report
    Version='6.0.0.6'
    Version='6.8.2.5'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
@@ -33,7 +33,7 @@
                    Name='包装方式'
                End
                Item
                    Name='墙咔缝'
                    Name='墙咔A/U缝'
                End
                Item
                    Name='数量'
@@ -50,227 +50,227 @@
                Item
                    Name='收货方地址'
                End
            End
        End
        Items Column
            Item
                Name='Column3'
                Width=9.49854
            End
        End
        Object ColumnContent
            Height=10.0013
            RowsPerPage=1
            Items ColumnContentCell
                Item
                    Column='Column3'
                    FreeCell=T
                    CanGrow=T
                    Items Control
                        Item
                            Type=FieldBox
                            Name='FieldBox1'
                            Left=3
                            Top=2.5
                            Width=2.40771
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='联系人'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox2'
                            Left=3
                            Top=3.5
                            Width=6.00604
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='包装方式'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox3'
                            Left=3
                            Top=4.5
                            Width=3.20146
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='墙咔缝'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox4'
                            Left=3
                            Top=5.5
                            Width=2.61938
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='数量'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox5'
                            Left=3
                            Top=6.5
                            Width=3.01625
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='箱号'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox6'
                            Left=3
                            Top=7.5
                            Width=6.00604
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='外包备注'
                        End
                        Item
                            Type=Barcode
                            Name='Barcode1'
                            Left=6.19125
                            Top=5.00063
                            Width=2.25
                            Height=1.79917
                            BarcodeType=QRCode
                            CaptionPosition=None
                            Text='[#订单号#]'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox7'
                            Left=5.4
                            Top=2.5
                            Width=3.59833
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='收货方地址'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox8'
                            Left=3.01625
                            Top=8.14917
                            Width=6.00604
                            Height=1.03188
                            Object Font
                                Name='宋体'
                                Size=105000,0
                                Bold=T
                                Charset=134
                            End
                            WordWrap=T
                            TextAlign=TopLeft
                            DataField='收货方地址'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox9'
                            Left=3
                            Top=1.5
                            Width=6.00604
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='销售订单号'
                        End
                        Item
                            Type=MemoBox
                            Name='MemoBox1'
                            Left=0.79375
                            Top=1.5
                            Width=2.19604
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            Text='单据编号：'
                        End
                        Item
                            Type=MemoBox
                            Name='MemoBox2'
                            Left=0.926042
                            Top=8.06979
                            Width=2.19604
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=105000,0
                                Bold=T
                                Charset=134
                            End
                            Text='收货地址：'
                        End
                    End
                End
            End
    End
    Items Column
        Item
            Name='Column3'
            Width=9.49854
        End
        Object ColumnTitle
            Height=0
            Items ColumnTitleCell
    End
Object ColumnContent
    Height=10.0013
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    GroupTitle=F
                    Column='Column3'
                    Text='Column1'
                    Type=FieldBox
                    Name='FieldBox1'
                    Left=3
                    Top=2.5
                    Width=2.40771
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='联系人'
                End
            End
        End
                Item
                    Type=FieldBox
                    Name='FieldBox2'
                    Left=3
                    Top=3.5
                    Width=6.00604
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='包装方式'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox3'
                    Left=3
                    Top=4.5
                    Width=3.20146
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='墙咔A/U缝'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox4'
                    Left=3
                    Top=5.5
                    Width=2.61938
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='数量'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox5'
                    Left=3
                    Top=6.5
                    Width=3.01625
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='箱号'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox6'
                    Left=3
                    Top=7.5
                    Width=6.00604
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='外包备注'
                End
                Item
                    Type=Barcode
                    Name='Barcode1'
                    Left=6.19125
                    Top=5.00063
                    Width=2.25
                    Height=1.79917
                    BarcodeType=QRCode
                    CaptionPosition=None
                    Text='[#订单号#]'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox7'
                    Left=5.4
                    Top=2.5
                    Width=3.59833
                    Height=0.608542
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='收货方地址'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox8'
                    Left=3.01625
                    Top=8.14917
                    Width=6.00604
                    Height=1.03188
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    WordWrap=T
                    TextAlign=TopLeft
                    DataField='收货方地址'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox9'
                    Left=3
                    Top=1.5
                    Width=6.00604
                    Height=0.608542
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='销售订单号'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox1'
                    Left=0.79375
                    Top=1.5
                    Width=2.19604
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    Text='单据编号：'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox2'
                    Left=0.926042
                    Top=8.06979
                    Width=2.19604
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='收货地址：'
                End
                    End
    End
    Items ReportHeader
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            Name='ReportHeader1'
            Height=0
            RepeatOnPage=T
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
    Items ReportFooter
        Item
            Name='ReportFooter1'
            Height=0
        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/grf/Éú²úµ¥.grf

@@ -10,14 +10,14 @@
        Oriention=Landscape
        LeftMargin=1.5
        TopMargin=0.5
        RightMargin=1.5
        RightMargin=1.03188
        BottomMargin=0.5
    End
    Object DetailGrid
        Object Recordset
            Items Field
                Item
                    Name='日期'
                    Name='销售订单日期'
                End
                Item
                    Name='单据编号'
@@ -30,12 +30,17 @@
                End
                Item
                    Name='销售数量'
                    Type=Float
                    Format='0.#####'
                End
                Item
                    Name='购货单位'
                End
                Item
                    Name='收货方联系人'
                    Name='销售订单联系人'
                End
                Item
                    Name='销售订单编号'
                End
                    End
    End
@@ -50,39 +55,43 @@
        End
        Item
            Name='物料代码'
            Width=3.99521
            Width=3.59833
        End
        Item
            Name='物料'
            Width=3.41313
            Width=3.01625
        End
        Item
            Name='规格型号'
            Width=3.41313
            Width=3.175
        End
        Item
            Name='Column2'
            Width=2.61938
            Width=2.40771
        End
        Item
            Name='Column6'
            Width=2.93688
            Width=1.61396
        End
        Item
            Name='Column7'
            Width=2.59292
            Width=2.01083
        End
        Item
            Name='Column8'
            Width=2.19604
            Width=2.38125
        End
        Item
            Name='Column9'
            Width=2.77813
            Width=2.40771
        End
        Item
            Name='Column10'
            Width=2.59292
        End
    End
Object ColumnContent
    Height=2.59292
    Height=2.19604
    Items ColumnContentCell
        Item
            Column='序号'
@@ -111,7 +120,7 @@
        End
        WordWrap=T
        ShrinkFontToFit=T
        DataField='日期'
        DataField='销售订单日期'
    End
    Item
        Column='物料代码'
@@ -133,7 +142,7 @@
        End
        WordWrap=T
        ShrinkFontToFit=T
        DataField='销售物料名称'
        DataField='销售订单编号'
    End
    Item
        Column='规格型号'
@@ -144,7 +153,7 @@
        End
        WordWrap=T
        ShrinkFontToFit=T
        DataField='包装方式'
        DataField='销售物料名称'
    End
    Item
        Column='Column2'
@@ -152,15 +161,15 @@
        Items Control
            Item
                Type=FieldBox
                Name='FieldBox1'
                Name='FieldBox3'
                Dock=Fill
                Object Font
                    Name='宋体'
                    Weight=400
                    Charset=134
                End
                TextAlign=MiddleCenter
                DataField='销售数量'
                WordWrap=T
                DataField='包装方式'
            End
            End
End
@@ -175,9 +184,11 @@
    Items Control
        Item
            Type=FieldBox
            Name='FieldBox2'
            Name='FieldBox1'
            Dock=Fill
            DataField='收货方联系人'
            WordWrap=T
            TextAlign=MiddleCenter
            DataField='销售数量'
        End
    End
End
@@ -202,15 +213,11 @@
            Text='[#单据编号#]'
        End
        Item
            Type=Barcode
            Name='Barcode4'
            Left=0.185208
            Top=0.343958
            Width=2.19604
            Height=1.98438
            BarcodeType=QRCode
            CaptionPosition=None
            Text='[#单据编号#]'
            Type=FieldBox
            Name='FieldBox2'
            Dock=Fill
            WordWrap=T
            DataField='销售订单联系人'
        End
    End
End
@@ -222,9 +229,26 @@
        Charset=134
    End
    FreeCell=T
    Items Control
        Item
            Type=Barcode
            Name='Barcode5'
            Left=0.185208
            Top=0.238125
            Width=1.95792
            Height=1.77271
            BarcodeType=QRCode
            CaptionPosition=None
            Text='[#单据编号#]'
        End
    End
End
Item
    Column='Column9'
    TextAlign=MiddleCenter
End
Item
    Column='Column10'
    TextAlign=MiddleCenter
End
End
@@ -253,7 +277,7 @@
                Charset=134
            End
            TextAlign=MiddleCenter
            Text='日期'
            Text='销售订单日期'
        End
        Item
            GroupTitle=F
@@ -277,7 +301,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='销售物料名称'
            Text='销售订单编号'
        End
        Item
            GroupTitle=F
@@ -289,7 +313,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='包装方式'
            Text='销售物料名称'
        End
        Item
            GroupTitle=F
@@ -301,7 +325,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='销售数量'
            Text='包装方式'
        End
        Item
            GroupTitle=F
@@ -313,7 +337,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='收货方联系人'
            Text='销售数量'
        End
        Item
            GroupTitle=F
@@ -325,7 +349,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='（二维码）'
            Text='联系人'
        End
        Item
            GroupTitle=F
@@ -337,7 +361,7 @@
            End
            WordWrap=T
            TextAlign=MiddleCenter
            Text='已生产'
            Text='（二维码）'
        End
        Item
            GroupTitle=F
@@ -348,6 +372,17 @@
                Charset=134
            End
            TextAlign=MiddleCenter
            Text='已生产'
        End
        Item
            GroupTitle=F
            Column='Column10'
            Object Font
                Name='宋体'
                Weight=400
                Charset=134
            End
            TextAlign=MiddleCenter
            Text='备注'
        End
    End

 WebTM/views/grf/»¨ÐÍÌõÂë.grf

@@ -1,5 +1,5 @@
Object Report
    Version='6.0.0.6'
    Version='6.8.2.5'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
@@ -33,7 +33,7 @@
                    Name='花型'
                End
                Item
                    Name='墙咔缝'
                    Name='墙咔A/U缝'
                End
                Item
                    Name='数量'
@@ -50,227 +50,245 @@
                Item
                    Name='收货方地址'
                End
            End
        End
        Items Column
            Item
                Name='Column3'
                Width=9.49854
            End
        End
        Object ColumnContent
            Height=10.0013
            RowsPerPage=1
            Items ColumnContentCell
                Item
                    Column='Column3'
                    FreeCell=T
                    CanGrow=T
                    Items Control
                        Item
                            Type=FieldBox
                            Name='FieldBox1'
                            Left=3
                            Top=2.5
                            Width=2.40771
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='联系人'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox2'
                            Left=3
                            Top=3.5
                            Width=5.82083
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='花型'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox3'
                            Left=3
                            Top=4.5
                            Width=3.20146
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='墙咔缝'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox4'
                            Left=3
                            Top=5.5
                            Width=2.40771
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='数量'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox5'
                            Left=3
                            Top=6.5
                            Width=3.01625
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='箱号'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox6'
                            Left=3
                            Top=7.5
                            Width=6.00604
                            Height=0.502708
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='外包备注'
                        End
                        Item
                            Type=Barcode
                            Name='Barcode1'
                            Left=6.19125
                            Top=5.00063
                            Width=2.25
                            Height=1.79917
                            BarcodeType=QRCode
                            CaptionPosition=None
                            Text='[#订单号#]'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox7'
                            Left=5.4
                            Top=2.5
                            Width=3.59833
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='收货方地址'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox8'
                            Left=3.01625
                            Top=8.12271
                            Width=6.00604
                            Height=1.03188
                            Object Font
                                Name='宋体'
                                Size=105000,0
                                Bold=T
                                Charset=134
                            End
                            WordWrap=T
                            TextAlign=TopLeft
                            DataField='收货方地址'
                        End
                        Item
                            Type=FieldBox
                            Name='FieldBox9'
                            Left=3
                            Top=1.5
                            Width=5.82083
                            Height=0.608542
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            DataField='销售订单号'
                        End
                        Item
                            Type=MemoBox
                            Name='MemoBox1'
                            Left=0.79375
                            Top=1.5
                            Width=2.19604
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=120000,0
                                Bold=T
                                Charset=134
                            End
                            Text='单据编号：'
                        End
                        Item
                            Type=MemoBox
                            Name='MemoBox2'
                            Left=0.9525
                            Top=8.04333
                            Width=2.19604
                            Height=0.582083
                            Object Font
                                Name='宋体'
                                Size=105000,0
                                Bold=T
                                Charset=134
                            End
                            Text='收货地址：'
                        End
                    Name='销售物料名称'
                End
                    End
                End
            End
    End
    Items Column
        Item
            Name='Column3'
            Width=9.39271
        End
        Object ColumnTitle
            Height=0
            Items ColumnTitleCell
    End
Object ColumnContent
    Height=10.0013
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    GroupTitle=F
                    Column='Column3'
                    Text='Column1'
                    Type=FieldBox
                    Name='FieldBox1'
                    Left=3
                    Top=2.5
                    Width=2.40771
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='联系人'
                End
            End
        End
                Item
                    Type=FieldBox
                    Name='FieldBox2'
                    Left=3
                    Top=4
                    Width=5.82083
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='花型'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox3'
                    Left=3
                    Top=4.5
                    Width=3.20146
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='墙咔A/U缝'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox4'
                    Left=3
                    Top=5.5
                    Width=2.40771
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='数量'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox5'
                    Left=3
                    Top=6.5
                    Width=3.01625
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='箱号'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox6'
                    Left=3
                    Top=7.5
                    Width=6.00604
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='外包备注'
                End
                Item
                    Type=Barcode
                    Name='Barcode1'
                    Left=6.19125
                    Top=5.00063
                    Width=2.25
                    Height=1.79917
                    BarcodeType=QRCode
                    CaptionPosition=None
                    Text='[#订单号#]'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox7'
                    Left=5.4
                    Top=2.5
                    Width=3.59833
                    Height=0.608542
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='收货方地址'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox8'
                    Left=3.01625
                    Top=8.12271
                    Width=6.00604
                    Height=1.03188
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    WordWrap=T
                    TextAlign=TopLeft
                    DataField='收货方地址'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox9'
                    Left=3
                    Top=1.5
                    Width=5.82083
                    Height=0.608542
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='销售订单号'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox1'
                    Left=0.79375
                    Top=1.5
                    Width=2.19604
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    Text='单据编号：'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox2'
                    Left=0.9525
                    Top=8.04333
                    Width=2.19604
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='收货地址：'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox10'
                    Left=3
                    Top=3.41
                    Width=5.60917
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=120000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='销售物料名称'
                End
                    End
    End
    Items ReportHeader
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            Name='ReportHeader1'
            Height=0
            RepeatOnPage=T
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
    Items ReportFooter
        Item
            Name='ReportFooter1'
            Height=0
        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/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -60,6 +60,10 @@
        var Type = params[params[1]];
        var OpenTmp = params[params[2]];

        if (OpenTmp =="墙咔条码") {
            Type += "1";
        }

        switch (Type) {
           
            //case "HBarCodePrint"://物料条码打印
@@ -172,23 +176,8 @@
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HSeOrderBillList.aspx?linterid=" + value, true, "");
                break;
            case "HQKPackBill"://墙咔装箱打印
                if (OpenTmp =="墙咔条码") {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?linterid=" + value, true, "");
                    break;
                }
                if (OpenTmp == "花型条码") {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_HXPackingBillList.aspx?linterid=" + value, true, "");
                    break;
                }
                if (OpenTmp == "包装方式条码") {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_BZPackingBillList.aspx?linterid=" + value, true, "");
                    break;
                }
                if (OpenTmp == "物料名称条码") {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_WLPackingBillList.aspx?linterid=" + value, true, "");
                    break;
                }
               
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
                break; 
        }
    </script>
</body>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_BZPackingBillList.aspx

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_BZPackingBillList.aspx.cs

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_BZPackingBillList.aspx.designer.cs

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_HXPackingBillList.aspx

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_HXPackingBillList.aspx.designer.cs

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_PackingBillList.aspx

@@ -4,18 +4,19 @@

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title></title>
     <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据
    <script runat="server"> 
        protected void Page_Load(object sender, EventArgs e)
        {
            //★特别提示★：
            //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        var ids = Request.Params["linterid"];
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
            var ids = Request.Params["linterid"];
            var type=Request.Params["typename"].ToString();
            var idsArray = ids.Split(',');
            var PrintIds = "";
            for (int i = 0; i < idsArray.Length; i++)
@@ -23,9 +24,27 @@
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
        SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo è®¢å•å·,a.HMaterID,m.HName ç‰©æ–™,m.HModel åž‹å·,a.HQty æ•°é‡,a.HBatchNo æ‰¹å·,a.HBarCode ç®±å·,a.HRemark åœºæ™¯å· from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ("+ PrintIds+")");
    }
</script>

            if (type.Trim()=="墙咔条码")
            {
                SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo è®¢å•å·,a.HMaterID,m.HName ç‰©æ–™,m.HModel åž‹å·,a.HQty æ•°é‡,a.HBatchNo æ‰¹å·,a.HBarCode ç®±å·,a.HRemark åœºæ™¯å· from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
            }
            else
            {
                 SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO é”€å”®è®¢å•å·,fo.F_ZZZZ_TEXT7 è”系人,fo.FRECEIVEADDRESS æ”¶è´§æ–¹åœ°å€," +
                "fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HBarCode ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 " +
                "from Gy_BarCodeBill a " +
                "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
                "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
                "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
                "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
                "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
               "where  a.HItemID in (" + PrintIds + ")");
            }
        }
    </script>
</head>
<body>
    <form id="form1" runat="server">

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_SPackingBillList.aspx

New file
@@ -0,0 +1,46 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_SPackingBillList.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_QK_SPackingBillList" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title></title>
    <script runat="server"> 
        protected void Page_Load(object sender, EventArgs e)
        {
            //★特别提示★：
            //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
            var ids = Request.Params["linterid"];
            var idsArray = ids.Split(',');
            var PrintIds = "";
            for (int i = 0; i < idsArray.Length; i++)
            {
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
            SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO é”€å”®è®¢å•å·,fo.F_ZZZZ_TEXT7 è”系人,fo.FRECEIVEADDRESS æ”¶è´§æ–¹åœ°å€," +
                "fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HBarCode ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 " +
                "from Gy_BarCodeBill a " +
                "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
                "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
                "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
                "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
                "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
               "where  a.HItemID in (" + PrintIds + ")");
        }
    </script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_SPackingBillList.aspx.cs

File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_HXPackingBillList.aspx.cs
@@ -7,7 +7,7 @@

namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_QK_HXPackingBillList : System.Web.UI.Page
    public partial class xmlLBM_QK_SPackingBillList : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_SPackingBillList.aspx.designer.cs

File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_WLPackingBillList.aspx.designer.cs
@@ -11,7 +11,7 @@
{


    public partial class xmlLBM_QK_WLPackingBillList
    public partial class xmlLBM_QK_SPackingBillList
    {

        /// <summary>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_WLPackingBillList.aspx

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_WLPackingBillList.aspx.cs

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ICMOBillList.aspx

@@ -23,15 +23,15 @@
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
    
            string sql = string.Format(@"select convert(varchar,f.FSalOrderDate ,23) é”€å”®è®¢å•æ—¥æœŸ,a.HBillNo å•æ®ç¼–号,f.F_YQN_XSDD é”€å”®è®¢å•ç¼–号, f.F_zzzz_Text4  é”€å”®ç‰©æ–™åç§°,f.F_zzzz_Text1  é”€å”®è®¢å•è”系人,
                                        f.F_BZFS åŒ…装方式,b.HQty é”€å”®æ•°é‡,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) ä¸»å­å•å·
            LogService.Write(PrintIds);
            string sql = string.Format(@"select convert(varchar,f1.FSalOrderDate ,23) é”€å”®è®¢å•æ—¥æœŸ,a.HBillNo å•æ®ç¼–号,f1.F_YQN_XSDD é”€å”®è®¢å•ç¼–号, f1.F_zzzz_Text4  é”€å”®ç‰©æ–™åç§°,f1.F_ZZZZ_XSDDLXR é”€å”®è®¢å•è”系人,f1.F_BZFS åŒ…装方式,b.HQty é”€å”®æ•°é‡,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) ä¸»å­å•å·
                                            from Sc_ICMOBillMain a 
                                            left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
                                            left join AIS20200908101915zs..T_PRD_MOENTRY f on b.HERPInterID=f.FID
                                            left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
                                            left join AIS20200908101915zs..T_PRD_MO f on f1.FID=f.FID
                                            left join Xs_SeOrderBillMain x on a.HSeOrderInterID=x.HInterID
                                            where  convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by a.HInterID desc");
            
                                            where  convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ("+ PrintIds+") order by b.HEntryID");
            LogService.Write(sql);
            SqlXMLReportData.GenOneRecordset(this, sql);
        }
    </script>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -69,7 +69,32 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label">生产车间</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDeptName" id="HDeptName">
                                            <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

                                                <!--动态渲染车间-->
                                            </select>

                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">业务状态</label>
                                        <div class="layui-input-block">
                                            <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
                                                <option value="0" selected>全部</option>
                                                <option value="计划">计划</option>
                                                <option value="计划确认">计划确认</option>
                                                <option value="下达">下达</option>
                                                <option value="开工">开工</option>
                                                <option value="完工">完工</option>
                                                <option value="结案">结案</option>
                                            </select>

                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据类型</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillType" id="HBillType">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -123,7 +148,27 @@

            //初始化界面
            set_ClearBill();
            //获取车间列
            var HDeptName = '<option value="0" style="color:red;">全部车间</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (i == 0)
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" selected>' + data[i].HName + '</option>';
                            else
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

                        }
                        $("#HDeptName").append(HDeptName);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
            //#endregion


@@ -200,13 +245,13 @@
                        , { field: '销售订单日期', title: '销售订单日期', sort: true, width: 120, hide: true }
                        , { field: '单据号', title: '单据号', sort: true, width: 170, hide: true }

                        , { field: '销售订单日期', title: '销售订单日期', sort: true, width: 120 }
                        , { field: '销售订单编号', title: '销售订单编号', sort: true, width: 120 }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true, width: 120 }
                        , { field: '包装方式', title: '包装方式', sort: true, width: 120 }
                        , { field: '销售数量', title: '销售数量', sort: true, width: 120 }
                        , { field: '销售订单联系人', title: '销售订单联系人', sort: true, width: 120 }
                        , { field: '业务状态', title: '业务状态', sort: true, width: 120 }
                        , { field: '销售订单日期', title: '销售订单日期', sort: true, width: 200 }
                        , { field: '销售订单编号', title: '销售订单编号', sort: true, width: 200 }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true, width: 200 }
                        , { field: '包装方式', title: '包装方式', sort: true, width: 150 }
                        , { field: '销售数量', title: '销售数量', sort: true, width: 150 }
                        , { field: '销售订单联系人', title: '销售订单联系人', sort: true, width: 150 }
                        , { field: '业务状态', title: '业务状态', sort: true, width: 150 }

                        , { field: '订单跟踪号', title: '订单跟踪号', sort: true, width: 120, hide: true }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true}
@@ -298,8 +343,10 @@
                var HDate1 = $("#HDate1").val();//结束日期
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var WorkCenter = $("#WorkCenter").val();//单据号
                var HDeptName = $("#HDeptName").val();//单据号
                var HMaterName = $("#HMaterName").val();//单据号
                var HDeptName = $("#HDeptName").val();//单据号
                var HStatus = $("#HStatus").val();//单据号
                var HBillType = $("#HBillType").val();//单据类型
                if (HDate) {
                    sWhere += " and æ—¥æœŸ >= '" + HDate + "'";
                }
@@ -312,11 +359,17 @@
                if (WorkCenter) {
                    sWhere += " and å•æ®å· like '%" + WorkCenter + "%'";
                }
                if (HDeptName) {
                    sWhere += " and ç”Ÿäº§è½¦é—´ like '%" + HDeptName + "%'";
                }
                if (HMaterName) {
                    sWhere += " and äº§å“ä»£ç  like '%" + HMaterName + "%'";
                }
                if (HDeptName && HDeptName!=0) {
                    sWhere += " and HDeptID = " + HDeptName ;
                }
                if (HStatus && HStatus != 0) {
                    sWhere += " and ä¸šåŠ¡çŠ¶æ€  like '%" + HStatus + "%'";
                }
                if (HBillType) {
                    sWhere += " and å•æ®ç±»åž‹ like '%" + HBillType + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -331,6 +384,8 @@
                $("#WorkCenter").val("");//单据号
                $("#HDeptName").val("");//单据号
                $("#HMaterName").val("");//单据号
                $("#HDeptName").val("");//单据号
                $("#HStatus").val("");//单据号
                $("#btnSearch").click();
                sWhere = "";
            }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú×°Ïäµ¥/QK_PackingBill.html

@@ -111,6 +111,13 @@
            form.on('submit(btnPack)', function (data) {
                var flag = "ZZ";
                var sSubStr = table.checkStatus('mainTable');
                if (sSubStr.data.length > 0) {
                    SavePack(flag, sSubStr);
                }
                else {
                    layer.msg('请最少选择1行数据！');
                    return;
                }
                SavePack(flag, sSubStr);
            });
            //拼箱生成
@@ -158,6 +165,7 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', edit: 'text', width: 100, hide: true }
                    , { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
                    , { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -221,16 +229,16 @@
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var PrintIds = data.code;
                                PrintIds = PrintIds.substring(0, PrintIds.length - 1);
                                layer.open({
                                    type: 2
                                    , area: ['50%', '50%']
                                    , title: '打印模版选择'
                                    , shade: 0.6 //遮罩透明度
                                    , maxmin: false //允许全屏最小化
                                    , anim: 0 //0-6的动画形式，-1不开启
                                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + PrintIds + '&Type=HQKPackBill', 'yes']
                                    , resize: false
                                })
                                var Type = "HQKPackBill";
                                var OpenTmp = "";
                                if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" || sSubStr.data[0].FMaterName != "")) {
                                    OpenTmp = "花型条码";
                                }
                                else {
                                    OpenTmp = "包装方式条码";
                                }
                                window.open("../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                              
                            }
                            else {
                                f_alert(data.Message);

 WebTM/views/²É¹º¹ÜÀí/ίÍⶩµ¥/WW_EntrustOrderBillList.html

@@ -141,6 +141,7 @@
                                        <label class="layui-form-label">完成状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="" selected>全部</option>
                                                <option value="未完成" selected>未完成</option>
                                                <option value="已完成">已完成</option>
                                            </select>

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -148,6 +148,7 @@
                                        <label class="layui-form-label">完成状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="" selected>全部</option>
                                                <option value="未完成" selected>未完成</option>
                                                <option value="已完成">已完成</option>
                                            </select>