diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm
index ed4899c..f91f9d7 100644
--- a/打卷检验管理/U_ProductOrderNewList.dfm
+++ b/打卷检验管理/U_ProductOrderNewList.dfm
@@ -20,10 +20,11 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1366
+    Width = 1349
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 95
+    ButtonWidth = 119
     Caption = 'ToolBar1'
     Color = clSkyBlue
     Flat = True
@@ -117,58 +118,59 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       AutoSize = True
       Caption = #25764#38144#23436#25104
       ImageIndex = 86
+      Wrap = True
       OnClick = TNoWCClick
     end
     object TBExport: TToolButton
-      Left = 678
-      Top = 0
+      Left = 0
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TFJ: TToolButton
-      Left = 741
-      Top = 0
+      Left = 63
+      Top = 30
       AutoSize = True
       Caption = #25351#31034#21333#38468#20214
       ImageIndex = 57
       OnClick = TFJClick
     end
     object TBPrint: TToolButton
-      Left = 840
-      Top = 0
+      Left = 162
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = TBPrintClick
     end
     object ToolButton4: TToolButton
-      Left = 903
-      Top = 0
+      Left = 225
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 990
-      Top = 0
+      Left = 312
+      Top = 30
       Caption = #30133#28857#31649#29702
       ImageIndex = 132
       OnClick = ToolButton5Click
     end
     object ToolButton6: TToolButton
-      Left = 1085
-      Top = 0
+      Left = 431
+      Top = 30
       AutoSize = True
       Caption = #26085#24535
       ImageIndex = 72
       OnClick = ToolButton6Click
     end
     object ToolButton7: TToolButton
-      Left = 1148
-      Top = 0
+      Left = 494
+      Top = 30
       AutoSize = True
       Caption = #37325#36830
       ImageIndex = 73
@@ -176,18 +178,25 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton7Click
     end
     object TBClose: TToolButton
-      Left = 1211
-      Top = 0
+      Left = 557
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
       OnClick = TBCloseClick
     end
+    object ToolButton8: TToolButton
+      Left = 620
+      Top = 30
+      Caption = #25171#21360#23376#34920#25351#31034#21333
+      ImageIndex = 56
+      OnClick = ToolButton8Click
+    end
   end
   object Panel1: TPanel
     Left = 0
-    Top = 32
-    Width = 1366
+    Top = 62
+    Width = 1349
     Height = 40
     Align = alTop
     BevelInner = bvRaised
@@ -415,8 +424,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 95
-    Width = 1366
+    Top = 125
+    Width = 1349
     Height = 333
     Align = alTop
     TabOrder = 3
@@ -764,8 +773,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 451
-    Width = 1366
+    Top = 458
+    Width = 1349
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
@@ -773,8 +782,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object Panel2: TPanel
     Left = 0
-    Top = 459
-    Width = 1366
+    Top = 466
+    Width = 1349
     Height = 256
     Align = alBottom
     Caption = 'Panel2'
@@ -782,7 +791,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
-      Width = 987
+      Width = 970
       Height = 254
       Align = alClient
       TabOrder = 0
@@ -855,7 +864,6 @@ object frmProductOrderNewList: TfrmProductOrderNewList
         OptionsBehavior.FocusCellOnCycle = True
         OptionsCustomize.ColumnFiltering = False
         OptionsData.Deleting = False
-        OptionsData.Editing = False
         OptionsView.Footer = True
         OptionsView.GroupByBox = False
         Styles.Inactive = DataLink_TradeManage.SHuangSe
@@ -866,6 +874,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           Caption = #23458#25143#35746#21333#21495
           DataBinding.FieldName = 'KHorderNo'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 70
         end
         object V2Column3: TcxGridDBColumn
@@ -879,6 +888,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           Caption = #21697#21517#20013#25991
           DataBinding.FieldName = 'PRTCodeName'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 75
         end
         object V2Column1: TcxGridDBColumn
@@ -917,12 +927,14 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           DataBinding.FieldName = 'PRTCode'
           Visible = False
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 70
         end
         object TV2Column7: TcxGridDBColumn
           Caption = #39068#33394'('#33521#25991')'
           DataBinding.FieldName = 'SOrddefstr4'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 80
         end
         object v1PRTOrderQty: TcxGridDBColumn
@@ -1060,44 +1072,56 @@ object frmProductOrderNewList: TfrmProductOrderNewList
         object TV2Column1: TcxGridDBColumn
           Caption = #26368#22823#21367#21495#21644
           DataBinding.FieldName = 'maxroll'
+          Options.Editing = False
         end
         object TV2Column2: TcxGridDBColumn
           DataBinding.FieldName = 'djstatus'
           Visible = False
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 65
         end
         object TV2Column3: TcxGridDBColumn
           Caption = #20986#24211#21305#25968
           DataBinding.FieldName = 'CKRoll'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 65
         end
         object TV2Column4: TcxGridDBColumn
           Caption = #20986#24211#38271#24230
           DataBinding.FieldName = 'CKQty'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 65
         end
         object TV2Column5: TcxGridDBColumn
           Caption = #20986#24211#20928#37325
           DataBinding.FieldName = 'CKJZ'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 65
         end
         object TV2Column6: TcxGridDBColumn
           Caption = #20986#24211#27611#37325
           DataBinding.FieldName = 'CKMZ'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 65
         end
+        object TV2Column8: TcxGridDBColumn
+          Caption = #36873#25321
+          DataBinding.FieldName = 'ssel'
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = TV2
       end
     end
     object GroupBox1: TGroupBox
-      Left = 988
+      Left = 971
       Top = 1
       Width = 377
       Height = 254
@@ -1126,8 +1150,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object cxTabControl1: TcxTabControl
     Left = 0
-    Top = 72
-    Width = 1366
+    Top = 102
+    Width = 1349
     Height = 23
     Align = alTop
     TabOrder = 2
@@ -1140,7 +1164,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 23
-    ClientRectRight = 1366
+    ClientRectRight = 1349
     ClientRectTop = 19
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
@@ -1212,8 +1236,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object CDS_Print: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 344
-    Top = 288
+    Left = 272
+    Top = 336
   end
   object ADOQuerySub: TADOQuery
     Connection = DataLink_TradeManage.ADOLink
@@ -1222,9 +1246,9 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     Top = 351
   end
   object DataSource2: TDataSource
-    DataSet = ADOQuerySub
-    Left = 504
-    Top = 316
+    DataSet = CDS_sub
+    Left = 336
+    Top = 580
   end
   object RMDBMain: TRMDBDataSet
     Visible = True
@@ -1282,4 +1306,10 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     Left = 92
     Top = 349
   end
+  object CDS_sub: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 268
+    Top = 572
+  end
 end
diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas
index 39544bc..c208cfc 100644
--- a/打卷检验管理/U_ProductOrderNewList.pas
+++ b/打卷检验管理/U_ProductOrderNewList.pas
@@ -12,7 +12,20 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer,
   cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
   IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxBarBuiltInMenu;
+  dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;
 
 type
   TfrmProductOrderNewList = class(TForm)
@@ -149,6 +162,9 @@ type
     TV2Column7: TcxGridDBColumn;
     ToolButton7: TToolButton;
     QryCheckNet: TADOQuery;
+    ToolButton8: TToolButton;
+    CDS_sub: TClientDataSet;
+    TV2Column8: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -190,6 +206,7 @@ type
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
     procedure ToolButton7Click(Sender: TObject);
+    procedure ToolButton8Click(Sender: TObject);
   private
     DQdate: TDateTime;
     FMainId: string;
@@ -220,7 +237,7 @@ uses
 function TfrmProductOrderNewList.SelfConnData(): Boolean;
 begin
   try
-    with QryCheckNet do   
+    with QryCheckNet do
     begin
       Close;
       sql.Clear;
@@ -316,6 +333,8 @@ begin
     sql.Add(')AA');
     open;
   end;
+  SCreateCDS20(ADOQuerySub, CDS_sub);
+  SInitCDSData20(ADOQuerySub, CDS_sub);
 end;
 
 procedure TfrmProductOrderNewList.FormDestroy(Sender: TObject);
@@ -1082,7 +1101,7 @@ procedure TfrmProductOrderNewList.ToolButton5Click(Sender: TObject);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do                                       
+    with frmZDYHelp do
     begin
       flag := 'WFBCD';
       flagname := '�õ�';
@@ -1119,5 +1138,167 @@ begin
   end;
 end;
 
+procedure TfrmProductOrderNewList.ToolButton8Click(Sender: TObject);
+var
+  fPrintFile, sqlStr: string;
+  Txt, fImagePath: string;
+  Moudle: THandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+begin
+  if CDS_sub.IsEmpty then
+    Exit;
+  if CDS_sub.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('û��ѡ������!', '��ʾ', 0);
+    Exit;
+  end;
+  RMDBMain.DataSet := CDS_Print;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('delete TBZSDID where DName=''' + Trim(DCode) + '''');
+    ExecSQL;
+  end;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('SELECT * FROM TBZSDID where 1=2 ');
+    open;
+  end;
+  sqlStr := '';
+  CDS_sub.DisableControls;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_sub do
+    begin
+      First;
+      while not Eof do
+      begin
+        if Fieldbyname('Ssel').AsBoolean then
+        begin
+          sqlStr := sqlStr + 'insert into TBZSDID(SubId,Dname) ';
+          sqlStr := sqlStr + ' values( ';
+          sqlStr := sqlStr + ' ''' + Trim(CDS_sub.fieldbyname('subid').AsString) + ''', ';
+          sqlStr := sqlStr + ' ''' + Trim(DCode) + ''' ';
+          sqlStr := sqlStr + ' ) ';
+        end;
+        Next;
+      end;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+  end;
+
+  CDS_sub.EnableControls;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(sqlStr);
+//    showmessage(sql.text);
+    ExecSQL;                              
+  end;
+  with ADOQueryPrint do
+  begin                                                
+    Close;
+    sql.Clear;
+    sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId),  ');
+    sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),');
+    sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),');
+    sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),');
+    sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )');
+    sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId ');
+    sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid ');
+    sql.add('  WHERE EXISTS(select SubId from TBZSDID X where X.SubId=B.subid and X.DName='''+Trim(DCode)+''')');
+//    sql.Add(' Where B.subid=''' + Trim(CDS_sub.fieldbyname('subid').AsString) + '''');
+    sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
+    Open;
+  end;
+  SCreateCDS20(ADOQueryPrint, CDS_Print);
+  SInitCDSData20(ADOQueryPrint, CDS_Print);
+  ExportFtErpFile('�ӱ�ָʾ��.rmf', ADOQueryCmd);
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\�ӱ�ָʾ��.rmf';
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
+//          RM1.ShowReport;
+    RM1.PrintReport;
+    RMDBMain.DataSet := nil;
+  end
+  else
+  begin
+    CDS_sub.EnableControls;
+    Application.MessageBox(PChar('û����' + trim(fPrintFile)), '��ʾ��Ϣ', 0);
+    exit;
+  end;
+//  with CDS_sub do
+//  begin
+//    First;
+//    while not Eof do
+//    begin
+//      if CDS_sub.FieldByName('SSel').AsBoolean = True then
+//      begin
+//        RMDBMain.DataSet := CDS_Print;
+//        try
+//          Moudle := LoadLibrary('MakeQRBarcode.dll');
+//          @Makebar := GetProcAddress(Moudle, 'Make');
+//          @Mixtext := GetProcAddress(Moudle, 'MixText');
+//          Txt := Trim(CDS_sub.fieldbyname('subid').AsString);
+//          fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+//          if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
+//            CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
+//          if FileExists(fImagePath) then
+//            DeleteFile(fImagePath);
+//          Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
+//        except
+//          application.MessageBox('����������ʧ�ܣ�', '��ʾ��Ϣ', MB_ICONERROR);
+//          Order_Main.EnableControls;
+//          exit;
+//        end;
+//        with ADOQueryPrint do
+//        begin
+//          Close;
+//          sql.Clear;
+//          sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId),  ');
+//          sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),');
+//          sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),');
+//          sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),');
+//          sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )');
+//          sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId ');
+//          sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid ');
+//          sql.Add(' Where B.subid=''' + Trim(CDS_sub.fieldbyname('subid').AsString) + '''');
+//          sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
+//          Open;
+//        end;
+//        SCreateCDS20(ADOQueryPrint, CDS_Print);
+//        SInitCDSData20(ADOQueryPrint, CDS_Print);
+//        ExportFtErpFile('�ӱ�ָʾ��.rmf', ADOQueryCmd);
+//        fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\�ӱ�ָʾ��.rmf';
+//        if FileExists(fPrintFile) then
+//        begin
+//          RM1.LoadFromFile(fPrintFile);
+////          RM1.ShowReport;
+//          RM1.PrintReport;
+//          RMDBMain.DataSet := nil;
+//        end
+//        else
+//        begin
+//          CDS_sub.EnableControls;
+//          Application.MessageBox(PChar('û����' + trim(fPrintFile)), '��ʾ��Ϣ', 0);
+//          exit;
+//        end;
+//      end;
+//      Next;
+//    end;
+//  end;
+//  CDS_sub.EnableControls;
+
+end;
+
 end.