diff --git a/复合检验管理/U_DataLink.pas b/复合检验管理/U_DataLink.pas
index 54c5229..8e27ed0 100644
--- a/复合检验管理/U_DataLink.pas
+++ b/复合检验管理/U_DataLink.pas
@@ -4,7 +4,21 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, 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;
 var
    DConString:String;   {ȫ�������ַ���}
    server, dtbase, user, pswd: String;  {���ݿ����Ӳ���}
diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm
index 38f0800..d8d11df 100644
--- a/复合检验管理/U_JYOrderCDOne.dfm
+++ b/复合检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 62
+    Height = 92
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 608
-      Top = 0
+      Left = 0
+      Top = 30
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 719
-      Top = 0
+      Left = 111
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 830
-      Top = 0
+      Left = 222
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -129,23 +130,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 953
-      Top = 0
+      Left = 345
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
       OnClick = ToolButton8Click
     end
     object ToolButton14: TToolButton
-      Left = 1064
-      Top = 0
+      Left = 456
+      Top = 30
       Caption = #25209#37327#20462#25913#31995#25968
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton14Click
     end
     object ToolButton1: TToolButton
-      Left = 0
+      Left = 575
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -153,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 87
+      Left = 662
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -162,33 +162,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 174
+      Left = 749
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
       ImageIndex = 12
+      Wrap = True
       Visible = False
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 273
-      Top = 30
+      Left = 0
+      Top = 60
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 384
-      Top = 30
+      Left = 111
+      Top = 60
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 447
-      Top = 30
+      Left = 174
+      Top = 60
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -202,8 +203,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 515
-      Top = 33
+      Left = 242
+      Top = 63
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -227,8 +228,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 664
-      Top = 30
+      Left = 391
+      Top = 60
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -241,32 +242,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 785
-      Top = 30
+      Left = 512
+      Top = 60
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 904
-      Top = 30
+      Left = 631
+      Top = 60
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 991
-      Top = 30
+      Left = 718
+      Top = 60
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 1054
-      Top = 30
+      Left = 781
+      Top = 60
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -275,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 92
     Width = 1384
     Height = 88
     Align = alTop
@@ -821,9 +822,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 150
+    Top = 180
     Width = 1384
-    Height = 568
+    Height = 538
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -834,7 +835,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
         item
@@ -1167,6 +1167,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #20986#24211#26102#38388
+        DataBinding.FieldName = 'CKtime'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas
index a6918fb..8f867ee 100644
--- a/复合检验管理/U_JYOrderCDOne.pas
+++ b/复合检验管理/U_JYOrderCDOne.pas
@@ -11,7 +11,20 @@ uses
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
-  cxCurrencyEdit, MMSystem;
+  cxCurrencyEdit, MMSystem, 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
   TfrmJYOrderCDOne = class(TForm)
@@ -224,6 +237,7 @@ type
     Tv1Column4: TcxGridDBColumn;
     Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -410,7 +424,7 @@ begin
         sql.add('and mjtype=''��Ʒ'' ');
       end;
       sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
-      //ShowMessage(SQL.Text);
+   //   ShowMessage(SQL.Text);
       Open;
     end;
     SCreateCDS20(ADOQueryMain, Order_Main);
@@ -516,7 +530,7 @@ end;
 
 procedure TfrmJYOrderCDOne.TBRafreshClick(Sender: TObject);
 begin
-  Tv1.DataController.Filter.AutoDataSetFilter := false;    
+  Tv1.DataController.Filter.AutoDataSetFilter := false;
   OrderNo.SetFocus;
   MovePanel2.Visible := True;
   MovePanel2.Refresh;
@@ -1547,7 +1561,7 @@ begin
       Open;
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥(����)') then
+  if (trim(ComboBox1.Text) = '�����뵥(����)') or (trim(ComboBox1.Text) = '����뵥1') then
   begin
     with ADOQueryTemp do
     begin
@@ -1598,8 +1612,34 @@ begin
       Open;
     end;
   end;
+  if (trim(ComboBox1.Text) = '�����뵥(����)') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDHZ_DC ');
+      SQL.Add('@mainid='''' ');
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
 
-  if (trim(ComboBox1.Text) = '�����뵥') then
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+  end;
+
+  if (trim(ComboBox1.Text) = '�����뵥') or (Trim(ComboBox1.text) = '����뵥2') then
   begin
     with ADOQueryTemp do
     begin
@@ -1623,7 +1663,54 @@ begin
       Open;
     end;
   end;
+  if (trim(ComboBox1.Text) = 'ͨ���뵥��ʽ') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_L');
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
 
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+  end;
+  if (trim(ComboBox1.Text) = 'ͨ���뵥��ʽ(��)') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_LT');
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);         
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+  end;
   if (trim(ComboBox1.Text) = '�����뵥(Ⱦɫ)') then
   begin
     with ADOQueryTemp do
@@ -1766,7 +1853,7 @@ begin
         begin
           Close;
           sql.Clear;
-          sql.Add('update WFB_MJJY set CKFlag=''�ѳ���'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
+          sql.Add('update WFB_MJJY set CKFlag=''�ѳ���'',CKtime=getdate() where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
           ExecSQL;
         end;
 
@@ -1806,7 +1893,7 @@ begin
         begin
           Close;
           sql.Clear;
-          sql.Add('update WFB_MJJY set CKFlag=''���'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
+          sql.Add('update WFB_MJJY set CKFlag=''���'',CKtime=null   where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
           ExecSQL;
         end;
 
@@ -1934,7 +2021,7 @@ begin
         Close;
         sql.Clear;
 //        sql.Add('update WFB_MJJY set CKFlag=''�ѳ���'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
-        sql.Add('update WFB_MJJY set CKFlag=''�ѳ���'' where MJID=''' + Trim(Edit_CKMJID.text) + '''');
+        sql.Add('update WFB_MJJY set CKFlag=''�ѳ���'',CKtime=getdate() where MJID=''' + Trim(Edit_CKMJID.text) + '''');
         ExecSQL;
       end;
       PlaySound('wav\��ȷ.wav', 0, SND_FILENAME or SND_ASYNC);
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index c1eb9ca..948c84a 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -1,7 +1,7 @@
 unit U_MJManageNewFDNew;
 
 interface
-                                  
+
 uses
   Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
@@ -390,8 +390,8 @@ type
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
-    FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string;
-    FJZ, FJC, FDC: Double;
+    FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID, FOrderUnit: string;
+    FJZ, FJC, FDC, FMachi: Double;
     fRollType, fRollType1, fbaotype, fbaosx: string;
     isCommopen, IsJsMessage: boolean;
     MValue, FCDName, MggCDFalg: string;
@@ -531,11 +531,16 @@ begin
   begin
     if (trim(Edit7.Text) = '��') then
     begin
-      MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
-      if i2 = 0 then
-        Label9.Caption := 'M'
+      if (FOrderUnit = 'Y') or (FOrderUnit = 'y') then
+      begin
+        MJLen.Text := format('%.' + trim(fxsws) + 'f', [(i1 / 100000) / 0.9144]);
+      end
       else
-        Label9.Caption := 'Y';
+        MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+//      if i2 = 0 then
+//        Label9.Caption := 'M'
+//      else
+//        Label9.Caption := 'Y';
       edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
     end;
   end;
@@ -1110,19 +1115,32 @@ begin
       if Edit12.Text <> '' then
       begin
         FieldByName('DingMaFlag').Value := '����';
+      end
+      else
+      begin
+        FieldByName('DingMaFlag').Value := '';
       end;
       if Edit10.Text <> '' then
       begin
         FieldByName('DaoXuFlag').Value := '���ŵ���';
       end;
       FieldByName('QuhaoFlag').Value := Trim(ComboBox2.Text);
-      if (FDC <> 0) and (Edit12.text <> '') then
+      if (FDC <> 0) and (Edit12.text <> '') then                 
       begin
         FieldByName('MJLen').Value := FDC;
       end
       else
       begin
-        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+//        if Fmachi > 1 then
+//        begin
+        FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [StrToFloatdef(trim(MJLen.Text), 0) / (Fmachi / 100) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
+
+//        end
+//        else
+//        begin
+//          FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+//        end;
+//        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
       end;
 
       FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
@@ -2539,9 +2557,12 @@ begin
     FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);
     FJZ := ADOTmp.fieldbyname('jiazhong').AsFloat;
     FJC := ADOTmp.fieldbyname('jiachang').AsFloat;
+    FMachi := ADOTmp.fieldbyname('PRTmc').AsFloat;
     FDC := StrToFloatDef(ADOTmp.fieldbyname('DC').asstring, 0);
     fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString);
     fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString);
+    FOrderUnit := Trim(ADOTmp.fieldbyname('OrderUnit').AsString);
+    Label9.Caption := Trim(ADOTmp.fieldbyname('OrderUnit').AsString);
     if FDC <> 0 then
     begin
       Edit12.Visible := True;
@@ -3247,7 +3268,7 @@ begin
       if ShowModal = 1 then
       begin
         SH.Text := FName;
-      end;                             
+      end;
     end;
   finally
     frmSCPersonColor.close;
diff --git a/复合检验管理/U_OrderInPut.dfm b/复合检验管理/U_OrderInPut.dfm
index 2683404..7e60cba 100644
--- a/复合检验管理/U_OrderInPut.dfm
+++ b/复合检验管理/U_OrderInPut.dfm
@@ -96,8 +96,8 @@ object frmOrderInPut: TfrmOrderInPut
       Visible = False
     end
     object Label10: TLabel
-      Left = 563
-      Top = 67
+      Left = 651
+      Top = 19
       Width = 66
       Height = 12
       Caption = #21512' '#21516' '#21495#65306
@@ -164,8 +164,8 @@ object frmOrderInPut: TfrmOrderInPut
       Visible = False
     end
     object Label2: TLabel
-      Left = 561
-      Top = 46
+      Left = 649
+      Top = -2
       Width = 60
       Height = 12
       Caption = #24320'   '#21098#65306
@@ -331,8 +331,8 @@ object frmOrderInPut: TfrmOrderInPut
       Visible = False
     end
     object Label21: TLabel
-      Left = 383
-      Top = 44
+      Left = 647
+      Top = 84
       Width = 67
       Height = 12
       Caption = #33337'    '#26679#65306
@@ -345,7 +345,7 @@ object frmOrderInPut: TfrmOrderInPut
       Visible = False
     end
     object Label22: TLabel
-      Left = 387
+      Left = 659
       Top = 68
       Width = 67
       Height = 12
@@ -568,8 +568,8 @@ object frmOrderInPut: TfrmOrderInPut
       OnDblClick = Label37DblClick
     end
     object Label38: TLabel
-      Left = 568
-      Top = 40
+      Left = 656
+      Top = -8
       Width = 67
       Height = 12
       Caption = #28907'    '#37329#65306
@@ -749,8 +749,8 @@ object frmOrderInPut: TfrmOrderInPut
       Visible = False
     end
     object Label50: TLabel
-      Left = 563
-      Top = 94
+      Left = 651
+      Top = 46
       Width = 66
       Height = 12
       Caption = #21152' '#24037' '#21378#65306
@@ -831,6 +831,19 @@ object frmOrderInPut: TfrmOrderInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label56: TLabel
+      Left = 391
+      Top = 50
+      Width = 60
+      Height = 12
+      Caption = #30721'   '#23610#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 96
@@ -841,8 +854,8 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object ConNo: TEdit
       Tag = 2
-      Left = 628
-      Top = 64
+      Left = 716
+      Top = 16
       Width = 100
       Height = 18
       TabOrder = 3
@@ -851,8 +864,8 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object RanFactory: TBtnEditC
       Tag = 2
-      Left = 627
-      Top = 90
+      Left = 715
+      Top = 42
       Width = 100
       Height = 20
       Hint = 'Factory/'#26579#21378
@@ -1045,8 +1058,8 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object MPRTKaiJian: TBtnEditC
       Tag = 2
-      Left = 626
-      Top = 43
+      Left = 714
+      Top = -5
       Width = 100
       Height = 20
       Hint = 'MPRTKaiJian/'#24320#21098
@@ -1057,8 +1070,8 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object MPRTChuanY: TBtnEditC
       Tag = 2
-      Left = 450
-      Top = 41
+      Left = 714
+      Top = 81
       Width = 100
       Height = 20
       Hint = 'MPRTChuanY/'#33337#26679
@@ -1070,7 +1083,7 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object MPRTYaoFeng: TBtnEditC
       Tag = 2
-      Left = 451
+      Left = 723
       Top = 64
       Width = 100
       Height = 20
@@ -1260,8 +1273,8 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object MPRTTangJin: TBtnEditC
       Tag = 2
-      Left = 630
-      Top = 34
+      Left = 718
+      Top = -14
       Width = 100
       Height = 20
       Hint = 'MPRTTangJin/'#28907#37329
@@ -1550,6 +1563,14 @@ object frmOrderInPut: TfrmOrderInPut
         Options.BorderPen.Style = psDash
       end
     end
+    object PRTmc: TEdit
+      Tag = 22
+      Left = 451
+      Top = 48
+      Width = 98
+      Height = 18
+      TabOrder = 58
+    end
   end
   object ToolBar2: TToolBar
     Left = 0
diff --git a/复合检验管理/U_OrderInPut.pas b/复合检验管理/U_OrderInPut.pas
index a81327c..40d555c 100644
--- a/复合检验管理/U_OrderInPut.pas
+++ b/复合检验管理/U_OrderInPut.pas
@@ -12,7 +12,20 @@ uses
   cxCurrencyEdit, cxImage, Menus, cxLookAndFeelPainters, cxButtons, cxDBEdit,
   cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator,
   RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_Preview,
-  RM_DsgGridReport, RM_e_Graphic, RM_e_bmp;
+  RM_DsgGridReport, RM_e_Graphic, RM_e_bmp, 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
   TfrmOrderInPut = class(TForm)
@@ -177,6 +190,8 @@ type
     RMGridReportDesigner1: TRMGridReportDesigner;
     RMBMPExport1: TRMBMPExport;
     Tv1Column1: TcxGridDBColumn;
+    Label56: TLabel;
+    PRTmc: TEdit;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -387,10 +402,11 @@ begin
   begin
     Close;
     sql.Clear;
-    sql.Add('select * from JYOrder_Main where MainId=''' + Trim(FMainId) + '''');
+    sql.Add('select A.*,prtmc=(select top 1 Prtmc from JYOrder_Sub X where X.mainid=A.mainid) from JYOrder_Main A where A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
   SCSHDataNew(ADOQuery1, ScrollBox1, 2);
+  PRTmc.Text := ADOQuery1.fieldbyName('Prtmc').AsString;
   if not Order_Sub.IsEmpty then
   begin
     SLBName.Text := Order_Sub.fieldbyName('SLBName').AsString;
@@ -707,11 +723,12 @@ begin
           begin
             Append;
           end
-          else
+          else                                 
             Edit;
           FieldByName('MainId').Value := Trim(FMainId);
           FieldByName('SubId').Value := Trim(maxno);
           RTSetSaveDataCDS(ADOCmd, Tv1, Order_Sub, 'JYOrder_Sub', 0);
+          FieldByName('PRTmc').Value := StrToFloatDef((PRTmc.Text), 100);
           fieldbyname('PRTMF').Value := Order_Sub.fieldbyname('PRTMF').AsString;
           fieldbyname('PRTKZ').Value := Order_Sub.fieldbyname('PRTKZ').AsString;
           if Trim(fieldbyname('PRTOrderQty').AsString) = '' then
diff --git a/复合检验管理/U_ProductOrderLBNameSet.dfm b/复合检验管理/U_ProductOrderLBNameSet.dfm
index da4fc82..03c1241 100644
--- a/复合检验管理/U_ProductOrderLBNameSet.dfm
+++ b/复合检验管理/U_ProductOrderLBNameSet.dfm
@@ -172,15 +172,25 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       ImageIndex = 12
       OnClick = ToolButton7Click
     end
-    object ToolButton15: TToolButton
+    object ToolButton16: TToolButton
       Left = 447
       Top = 30
+      AutoSize = True
+      Caption = #30721#23610#35774#32622
+      ImageIndex = 56
+      OnClick = ToolButton16Click
+    end
+    object ToolButton15: TToolButton
+      Left = 534
+      Top = 30
+      AutoSize = True
       Caption = #39044#35272#20013#25991#26631#31614
       ImageIndex = 57
+      Visible = False
       OnClick = ToolButton15Click
     end
     object ToolButton8: TToolButton
-      Left = 554
+      Left = 645
       Top = 30
       AutoSize = True
       Caption = #39044#35272#21253#26631#31614
@@ -189,7 +199,7 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       OnClick = ToolButton8Click
     end
     object PiZhong: TEdit
-      Left = 653
+      Left = 744
       Top = 30
       Width = 121
       Height = 30
@@ -202,7 +212,7 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       TabOrder = 0
     end
     object TBClose: TToolButton
-      Left = 774
+      Left = 865
       Top = 30
       AutoSize = True
       Caption = #20851#38381
@@ -688,6 +698,12 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
         Visible = False
         Width = 60
       end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #30721#23610
+        DataBinding.FieldName = 'PRTMC'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
diff --git a/复合检验管理/U_ProductOrderLBNameSet.pas b/复合检验管理/U_ProductOrderLBNameSet.pas
index 30713c4..61c4055 100644
--- a/复合检验管理/U_ProductOrderLBNameSet.pas
+++ b/复合检验管理/U_ProductOrderLBNameSet.pas
@@ -1,6 +1,6 @@
 unit U_ProductOrderLBNameSet;
 
-interface
+interface                                              
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
@@ -10,7 +10,21 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, StrUtils, Menus, cxDropDownEdit,
-  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator;
+  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
+  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
   TfrmProductOrderLBNameSet = class(TForm)
@@ -117,6 +131,8 @@ type
     ToolButton13: TToolButton;
     ToolButton14: TToolButton;
     ToolButton15: TToolButton;
+    ToolButton16: TToolButton;
+    Tv1Column6: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -153,6 +169,7 @@ type
     procedure Tv1Column2PropertiesEditValueChanged(Sender: TObject);
     procedure Tv1Column5PropertiesEditValueChanged(Sender: TObject);
     procedure ToolButton15Click(Sender: TObject);
+    procedure ToolButton16Click(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -1554,5 +1571,70 @@ begin
   end;
 end;
 
+procedure TfrmProductOrderLBNameSet.ToolButton16Click(Sender: TObject);
+var
+  FPiZhong: string;
+  FReal: Double;
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  if Order_Main.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('û��ѡ�����ݣ�', '��ʾ', 0);
+    Exit;
+  end;
+  if Trim(PiZhong.Text) = '' then
+  begin
+    Application.MessageBox('����ϵ������Ϊ��!', '��ʾ', 0);
+    Exit;
+  end;
+  if TryStrToFloat(PiZhong.Text, FReal) = False then
+  begin
+    Application.MessageBox('��߷Ƿ�����!', '��ʾ', 0);
+    Exit;
+  end;
+  with order_Main do
+  begin
+    first;
+    while not Eof do
+    begin
+      if order_Main.FieldByName('Ssel').AsBoolean = true then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('Update JYOrder_Sub Set PRTMC=' + Trim(PiZhong.Text));
+          sql.Add(' where Subid=''' + Trim(Order_Main.fieldbyname('Subid').AsString) + '''');
+          ExecSQL;
+        end;
+        with Order_Main do
+        begin
+          Edit;
+          FieldByName('PRTMC').Value := PiZhong.Text;
+          Post;
+        end;
+      end;
+      next;
+    end;
+  end;
+  CheckBox1.Checked := False;
+  with Order_Main do
+  begin
+    DisableControls;
+    first;
+    while not Eof do
+    begin
+      edit;
+      fieldbyname('Ssel').AsBoolean := False;
+      post;
+      next;
+    end;
+    first;
+    EnableControls;
+  end;
+
+end;
+
 end.
 
diff --git a/复合检验管理/U_ProductOrderNewList.dfm b/复合检验管理/U_ProductOrderNewList.dfm
index 91e1b93..f26fb7e 100644
--- a/复合检验管理/U_ProductOrderNewList.dfm
+++ b/复合检验管理/U_ProductOrderNewList.dfm
@@ -748,7 +748,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       Height = 145
       ItemIndex = 0
       Items.Strings = (
-        #21253#35013#25351#31034#21333)
+        #21253#35013#25351#31034#21333
+        #32568#26631#31614)
       TabOrder = 1
     end
   end
@@ -845,7 +846,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
@@ -856,6 +856,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           Caption = #23458#25143#35746#21333#21495
           DataBinding.FieldName = 'KHorderNo'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 70
         end
         object V2Column3: TcxGridDBColumn
@@ -869,6 +870,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           Caption = #21697#21517#20013#25991
           DataBinding.FieldName = 'PRTCodeName'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 75
         end
         object V2Column1: TcxGridDBColumn
@@ -907,12 +909,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
@@ -956,6 +960,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
           Caption = #32568#21495
           DataBinding.FieldName = 'GangHao'
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 70
         end
         object V2PRTMF: TcxGridDBColumn
@@ -1056,37 +1061,49 @@ 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 TV2Column9: TcxGridDBColumn
+          Caption = #36873#25321
+          DataBinding.FieldName = 'Ssel'
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = TV2
@@ -1218,7 +1235,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     Top = 351
   end
   object DataSource2: TDataSource
-    DataSet = ADOQuerySub
+    DataSet = CDS_sub
     Left = 504
     Top = 316
   end
@@ -1272,4 +1289,10 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     Left = 784
     Top = 486
   end
+  object CDS_sub: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 227
+    Top = 304
+  end
 end
diff --git a/复合检验管理/U_ProductOrderNewList.pas b/复合检验管理/U_ProductOrderNewList.pas
index 52c288b..d41b20c 100644
--- a/复合检验管理/U_ProductOrderNewList.pas
+++ b/复合检验管理/U_ProductOrderNewList.pas
@@ -1,7 +1,7 @@
 unit U_ProductOrderNewList;
 
 interface
-                                                        
+
 uses
   Windows, Messages, SysUtils, strUtils, Variants, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
@@ -20,19 +20,19 @@ uses
   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;
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;
 
 type
   TfrmProductOrderNewList = class(TForm)
     ToolBar1: TToolBar;
     TBRafresh: TToolButton;
     TBFind: TToolButton;
-    TBAdd: TToolButton;
+    TBAdd: TToolButton;                                   
     TBEdit: TToolButton;
     TBDel: TToolButton;
     TBPrint: TToolButton;
@@ -161,6 +161,8 @@ type
     ToolButton6: TToolButton;
     TV2Column7: TcxGridDBColumn;
     TV2Column8: TcxGridDBColumn;
+    TV2Column9: TcxGridDBColumn;
+    CDS_sub: TClientDataSet;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -292,6 +294,8 @@ begin
     sql.Add(')AA');
     open;
   end;
+  SCreateCDS20(ADOQuerySub, CDS_sub);
+  SInitCDSData20(ADOQuerySub, CDS_sub);
 end;
 
 procedure TfrmProductOrderNewList.FormDestroy(Sender: TObject);
@@ -835,7 +839,7 @@ end;
 
 procedure TfrmProductOrderNewList.Button1Click(Sender: TObject);
 var
-  fPrintFile: string;
+  fPrintFile, Wsql: string;
   Porderno, LBName, SYRName: string;
   i, j: Integer;
   OrderKg: Double;
@@ -844,31 +848,74 @@ begin
     Exit;
   RMDBMain.DataSet := CDS_Print;
   LBName := RadioGroup1.Items.Strings[RadioGroup1.ItemIndex];
-  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf';          
-  with ADOQueryPrint do
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf';
+  Wsql := '';
+  CDS_sub.DisableControls;
+  with CDS_sub 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(' left join TP_File D on D.TFID=A.orderNO  ');
-    sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
-    sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
+    First;
+    while not Eof do
+    begin
+      if CDS_sub.FieldByName('ssel').AsBoolean then
+      begin
+        if Wsql <> '' then
+        begin
+          Wsql := Wsql + ',' + trim(CDS_sub.fieldbyname('subid').asstring);
+        end
+        else
+        begin
+          Wsql := trim(CDS_sub.fieldbyname('subid').asstring);
+        end;
+      end;
+      Next;            
 
-    Open;
+    end;
+  end;                                                
+  CDS_sub.Locate('Ssel', True, []);
+  cds_sub.EnableControls;
+  if (Wsql <> '')  and (LBName='�ױ�ǩ') then
+  begin
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('exec  P_print_ZSD');
+      sql.Add('@Filtration=' + quotedstr(Wsql));
+
+      Open;
+    end;
+    SCreateCDS20(ADOQueryPrint, CDS_Print);
+    SInitCDSData20(ADOQueryPrint, CDS_Print);
+  end
+  else
+  begin
+    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(' left join TP_File D on D.TFID=A.orderNO  ');
+      sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
+      sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
+
+      Open;
+    end;
+    SCreateCDS20(ADOQueryPrint, CDS_Print);
+    SInitCDSData20(ADOQueryPrint, CDS_Print);
   end;
-  SCreateCDS20(ADOQueryPrint, CDS_Print);
-  SInitCDSData20(ADOQueryPrint, CDS_Print);
+
   if FileExists(fPrintFile) then
   begin
     RM1.LoadFromFile(fPrintFile);
     RM1.ShowReport;
-    RMDBMain.DataSet :=nil;
+    RMDBMain.DataSet := nil;
   end
   else
   begin