代码修改，以一码通，生产计划单为主

2025-09-09 17:22:59 +08:00 · 2025-09-09 17:22:59 +08:00 · f6009f5cde
commit f6009f5cde
parent 0743f82756
52 changed files with 27712 additions and 6973 deletions
--- a/Z99Dependency/ThreeFun/Form/U_ClList.dfm
+++ b/Z99Dependency/ThreeFun/Form/U_ClList.dfm
@ -0,0 +1,402 @@
+object frmClList: TfrmClList
+  Left = 141
+  Top = 134
+  Width = 889
+  Height = 528
+  Caption = #25104#21697#27979#35797#25253#21578
+  Color = clBtnFace
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  OnClose = FormClose
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar
+    Left = 0
+    Top = 0
+    Width = 873
+    Height = 20
+    AutoSize = True
+    ButtonHeight = 18
+    ButtonWidth = 66
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Flat = True
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object tbselect: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #26597#35810
+      ImageIndex = 2
+      OnClick = tbselectClick
+    end
+    object tbadd: TToolButton
+      Left = 40
+      Top = 0
+      AutoSize = True
+      Caption = #22686#21152
+      ImageIndex = 3
+      OnClick = tbaddClick
+    end
+    object tbupdate: TToolButton
+      Left = 80
+      Top = 0
+      AutoSize = True
+      Caption = #20462#25913
+      ImageIndex = 54
+      OnClick = tbupdateClick
+    end
+    object tbdelete: TToolButton
+      Left = 120
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 48
+      OnClick = tbdeleteClick
+    end
+    object tbLook: TToolButton
+      Left = 160
+      Top = 0
+      AutoSize = True
+      Caption = #26597#30475
+      ImageIndex = 77
+      OnClick = tbLookClick
+    end
+    object ToolButton1: TToolButton
+      Left = 200
+      Top = 0
+      Caption = #23548#20986'Excel'
+      ImageIndex = 75
+      OnClick = ToolButton1Click
+    end
+    object tbPrintlb: TToolButton
+      Left = 266
+      Top = 0
+      Caption = #25171#21360#21015#34920
+      ImageIndex = 12
+      Visible = False
+      OnClick = tbPrintlbClick
+    end
+    object tbclose: TToolButton
+      Left = 332
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 55
+      OnClick = tbcloseClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 20
+    Width = 873
+    Height = 49
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    object Label1: TLabel
+      Left = 16
+      Top = 20
+      Width = 48
+      Height = 12
+      Caption = #29983#20135#26085#26399
+    end
+    object Label2: TLabel
+      Left = 160
+      Top = 20
+      Width = 6
+      Height = 12
+      Caption = '-'
+    end
+    object Label3: TLabel
+      Left = 456
+      Top = 64
+      Width = 24
+      Height = 12
+      Caption = #23458#25143
+    end
+    object Label4: TLabel
+      Left = 608
+      Top = 64
+      Width = 24
+      Height = 12
+      Caption = #20135#21697
+    end
+    object Label5: TLabel
+      Left = 284
+      Top = 68
+      Width = 36
+      Height = 12
+      Caption = #35745#21010#21333
+    end
+    object Label6: TLabel
+      Left = 308
+      Top = 20
+      Width = 48
+      Height = 12
+      Caption = #21592#24037#32534#21495
+    end
+    object Label7: TLabel
+      Left = 500
+      Top = 20
+      Width = 48
+      Height = 12
+      Caption = #21592#24037#21517#31216
+    end
+    object begdate: TDateTimePicker
+      Left = 68
+      Top = 16
+      Width = 90
+      Height = 20
+      Date = 40533.591564594910000000
+      Format = 'yyyy-MM-dd'
+      Time = 40533.591564594910000000
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 0
+    end
+    object enddate: TDateTimePicker
+      Left = 168
+      Top = 16
+      Width = 90
+      Height = 20
+      Date = 40533.591593796290000000
+      Format = 'yyyy-MM-dd'
+      Time = 40533.591593796290000000
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 1
+    end
+    object customName: TEdit
+      Left = 480
+      Top = 60
+      Width = 100
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 2
+    end
+    object ChnName: TEdit
+      Left = 636
+      Top = 60
+      Width = 100
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 3
+    end
+    object planNo: TEdit
+      Left = 320
+      Top = 64
+      Width = 100
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 4
+    end
+    object userID: TEdit
+      Left = 360
+      Top = 16
+      Width = 121
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 5
+    end
+    object userName: TEdit
+      Left = 552
+      Top = 16
+      Width = 121
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 6
+    end
+  end
+  object cxGrid1: TcxGrid
+    Left = 0
+    Top = 69
+    Width = 873
+    Height = 328
+    Align = alTop
+    TabOrder = 2
+    object TV1: TcxGridDBTableView
+      OnDblClick = TV1DblClick
+      NavigatorButtons.ConfirmDelete = False
+      DataController.DataSource = DataSource1
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+          Column = V1P_Num
+        end
+        item
+          Kind = skSum
+          Column = V1packs
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Deleting = False
+      OptionsData.Editing = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      OptionsView.Indicator = True
+      object V1operTime: TcxGridDBColumn
+        Caption = #27979#35797#26085#26399
+        DataBinding.FieldName = 'operTime'
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
+      object V1planNo: TcxGridDBColumn
+        Caption = #35745#21010#21333
+        DataBinding.FieldName = 'planNo'
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
+      object V1customname: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'customname'
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
+      object V1P_Code: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'P_Code'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object V1P_ChnName: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'P_ChnName'
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
+      object V1P_Spec: TcxGridDBColumn
+        Caption = #20135#21697#35268#26684
+        DataBinding.FieldName = 'P_Spec'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object V1colorname: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'colorname'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object V1P_YHNO: TcxGridDBColumn
+        Caption = #33457#21495
+        DataBinding.FieldName = 'P_YHNO'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object V1P_Colstd: TcxGridDBColumn
+        Caption = #33394#20301
+        DataBinding.FieldName = 'P_Colstd'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object V1packs: TcxGridDBColumn
+        Caption = #20214#25968
+        DataBinding.FieldName = 'packs'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object V1P_Num: TcxGridDBColumn
+        Caption = #25968#37327
+        DataBinding.FieldName = 'P_Num'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object V1P_unit: TcxGridDBColumn
+        Caption = #25968#37327#21333#20301
+        DataBinding.FieldName = 'P_unit'
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
+      object V1operatorName: TcxGridDBColumn
+        Caption = #27979#35797#20154#21592
+        DataBinding.FieldName = 'operatorName'
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
+      object V1note: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'note'
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
+    end
+    object cxGrid1Level1: TcxGridLevel
+      GridView = TV1
+    end
+  end
+  object Panetime: TPanel
+    Left = 308
+    Top = 120
+    Width = 191
+    Height = 41
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Caption = #27491#22312#26597#35810#25968#25454#65292#35831#31561#24453'...'
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clBlue
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = [fsBold]
+    ParentFont = False
+    TabOrder = 3
+    Visible = False
+  end
+  object ADOQueryTmp: TADOQuery
+    AutoCalcFields = False
+    LockType = ltPessimistic
+    CommandTimeout = 600
+    Parameters = <>
+    Left = 392
+    Top = 180
+  end
+  object DataSource1: TDataSource
+    DataSet = ADOQueryTmp
+    Left = 428
+    Top = 60
+  end
+  object ADOQueryCmd: TADOQuery
+    Parameters = <>
+    Left = 492
+    Top = 68
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 568
+    Top = 4
+  end
+  object dxComponentPrinter1: TdxComponentPrinter
+    CurrentLink = dxComponentPrinter1Link1
+    DateFormat = 4
+    TimeFormat = 2
+    Version = 0
+    Left = 464
+    Top = 236
+    object dxComponentPrinter1Link1: TdxGridReportLink
+      Component = cxGrid1
+      PrinterPage.DMPaper = 1
+      PrinterPage.Footer = 6350
+      PrinterPage.Header = 6350
+      PrinterPage.Margins.Bottom = 12700
+      PrinterPage.Margins.Left = 12700
+      PrinterPage.Margins.Right = 12700
+      PrinterPage.Margins.Top = 12700
+      PrinterPage.PageSize.X = 215900
+      PrinterPage.PageSize.Y = 279400
+      PrinterPage._dxMeasurementUnits_ = 0
+      PrinterPage._dxLastMU_ = 2
+      BuiltInReportLink = True
+    end
+  end
+end
--- a/Z99Dependency/ThreeFun/Form/U_ClList.pas
+++ b/Z99Dependency/ThreeFun/Form/U_ClList.pas
@ -0,0 +1,337 @@
+unit U_ClList;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, StrUtils,Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ComCtrls, ToolWin, StdCtrls, ExtCtrls, cxStyles, cxCustomData,
+  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB,
+  cxGridLevel, cxClasses, cxControls, cxGridCustomView,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, dxPSGlbl, dxPSUtl, dxPSEngn,
+  dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
+  dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk;
+
+type
+  TfrmClList = class(TForm)
+    ToolBar1: TToolBar;
+    tbselect: TToolButton;
+    tbadd: TToolButton;
+    tbupdate: TToolButton;
+    tbdelete: TToolButton;
+    tbclose: TToolButton;
+    Panel1: TPanel;
+    Label1: TLabel;
+    begdate: TDateTimePicker;
+    enddate: TDateTimePicker;
+    Label2: TLabel;
+    Label3: TLabel;
+    customName: TEdit;
+    Label4: TLabel;
+    ChnName: TEdit;
+    TV1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    ADOQueryTmp: TADOQuery;
+    DataSource1: TDataSource;
+    V1operTime: TcxGridDBColumn;
+    V1customname: TcxGridDBColumn;
+    V1P_Code: TcxGridDBColumn;
+    V1P_ChnName: TcxGridDBColumn;
+    V1P_Spec: TcxGridDBColumn;
+    V1packs: TcxGridDBColumn;
+    V1P_Num: TcxGridDBColumn;
+    V1P_unit: TcxGridDBColumn;
+    V1operatorName: TcxGridDBColumn;
+    V1note: TcxGridDBColumn;
+    Panetime: TPanel;
+    ADOQueryCmd: TADOQuery;
+    V1planNo: TcxGridDBColumn;
+    Label5: TLabel;
+    planNo: TEdit;
+    tbLook: TToolButton;
+    V1colorname: TcxGridDBColumn;
+    V1P_YHNO: TcxGridDBColumn;
+    V1P_Colstd: TcxGridDBColumn;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    Label6: TLabel;
+    userID: TEdit;
+    userName: TEdit;
+    Label7: TLabel;
+    tbPrintlb: TToolButton;
+    ToolButton1: TToolButton;
+    dxComponentPrinter1: TdxComponentPrinter;
+    dxComponentPrinter1Link1: TdxGridReportLink;
+    procedure tbcloseClick(Sender: TObject);
+    procedure tbaddClick(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure tbselectClick(Sender: TObject);
+    procedure tbupdateClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure tbdeleteClick(Sender: TObject);
+    procedure tbLookClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure tbPrintlbClick(Sender: TObject);
+  private
+    procedure DoQuery();
+    procedure FilterData();
+    function  DeleteData():boolean;  //删除数据
+    procedure initGrid();
+    { Private declarations }
+  public
+
+    FType:string;
+    { Public declarations }
+  end;
+
+var
+  frmClList: TfrmClList;
+implementation
+uses
+  U_DataLink,U_Fun;             //, U_ClEdit
+{$R *.dfm}
+procedure TfrmClList.initGrid();
+var
+  i:integer;
+begin
+  with adoqueryCmd do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select * from BD_ColumnConfig ');
+    sql.Add(' where tableName=''WS_Register'' ');
+    sql.Add(' and Type='''+trim(fType)+''' ');
+    sql.Add(' and isVisibleLB=1 ');
+    sql.Add(' order by orderNo ');
+    open;
+  end;
+  TV1.ClearItems;
+  if not adoqueryCmd.IsEmpty then
+  begin
+    for i:=0 to adoqueryCmd.RecordCount-1 do
+    begin
+      tv1.CreateColumn;
+      tv1.Columns[i].DataBinding.FieldName:=trim(adoqueryCmd.fieldbyname('col').AsString);
+      tv1.Columns[i].Caption:=trim(adoqueryCmd.fieldbyname('colName').AsString);
+      tv1.Columns[i].Name:='tv1'+trim(adoqueryCmd.fieldbyname('col').AsString);
+      tv1.Columns[i].HeaderAlignmentHorz:=tacenter;
+      tv1.Columns[i].Width:=90;
+      if LeftBStr(trim(adoqueryCmd.fieldbyname('col').AsString),2) ='fd' then
+      tv1.Columns[i].Summary.FooterKind:=sksum;
+   //   if  adoqueryCmd.fieldbyname('isreadonly').AsBoolean then
+   //   tv1.Columns[i].Options.Editing:=false;
+      adoqueryCmd.Next;
+    end;
+  end;
+ //TV1.ApplyBestFit();
+end;
+
+//////////////////////////////////////////////
+//////删除数据
+//////////////////////////////////////////////
+function  TfrmClList.DeleteData():boolean;
+begin
+  result:=false;
+  try
+    with adoqueryCmd do
+    begin
+      close;
+      sql.Clear;
+    //  sql.Add('delete from JD_Inspect where InspectNo='+quotedstr(trim(ADOQueryTmp.fieldbyname('InspectNo').AsString)));
+      sql.Add('delete from WS_Register where WRNo='+quotedstr(trim(ADOQueryTmp.fieldbyname('WRNo').AsString)));
+      sql.Add('and WRID='+quotedstr(trim(ADOQueryTmp.fieldbyname('WRID').AsString)));
+      execsql;
+    end;
+    result:=true;
+  except
+  end;
+end;
+procedure TfrmClList.DoQuery();
+var
+  strsql,sqlwhere:string;
+begin
+  begdate.SetFocus;
+  screen.Cursor:=crsqlwait;
+  Panetime.Visible:=true;
+  Panetime.Left:=(Width-Panetime.Width) div 2;
+  Panetime.top:=(Height-Panetime.Height-400) div 2;
+  Application.ProcessMessages;
+
+  sqlwhere:=' where WRDate>='''+formatdatetime('yyyy-MM-dd',begdate.Date)+''' '+
+            ' and   WRDate<'''+formatdatetime('yyyy-MM-dd',enddate.Date+1)+''' ';
+  sqlwhere:=sqlwhere+' and Type='''+trim(FType)+'''  ';
+  try
+    with ADOQueryTmp do
+    begin
+      close;
+      sql.Clear;
+      filtered:=false;
+      sql.Add('select * from WS_Register A');
+      sql.Add(sqlwhere);
+      open;
+    end;
+    FilterData();
+  finally
+    Panetime.Visible:=false;
+    screen.Cursor:=crdefault;
+  end;
+end;
+procedure TfrmClList.FilterData();
+var
+  filterStr:string;
+begin
+  filterStr:='';
+  if trim(userID.Text)<>'' then
+  filterStr:=filterStr+' and userID like '+quotedstr('%'+trim(userID.Text)+'%');
+  if trim(USERName.Text)<>'' then
+  filterStr:=filterStr+' and USERName like '+quotedstr('%'+trim(USERName.Text)+'%');
+  if trim(planNo.Text)<>'' then
+  filterStr:=filterStr+' and planNo like '+quotedstr('%'+trim(planNo.Text)+'%');
+  try
+    ADOQueryTmp.DisableControls ;
+    if trim(filterStr)='' then
+    begin
+      ADOQueryTmp.Filtered:=false;
+      ADOQueryTmp.EnableControls;
+      exit;
+   end;
+   filterStr:=trim(Copy(filterStr,5,length(filterStr)-4));
+    with ADOQueryTmp do
+    begin
+      filtered:=false;
+      filter:=filterStr;
+      filtered:=true;
+    end;
+   finally
+    ADOQueryTmp.EnableControls;
+  end;
+end;
+
+procedure TfrmClList.tbcloseClick(Sender: TObject);
+begin
+  close;
+end;
+
+procedure TfrmClList.tbaddClick(Sender: TObject);
+begin
+//  frmclEdit:=TfrmclEdit.create(self);
+//  with frmclEdit do
+//  begin
+//    fromid:=0;
+//    fType:=trim(self.FType);
+//    caption:=trim(self.Caption);
+//    if showmodal=1 then
+//    begin
+//      //  DoQuery();
+//     // self.ADOQueryTmp.Locate('inspectNo',fkeyNO,[]);
+//    end;
+//    DoQuery();
+//    Release;
+//  end;
+end;
+
+procedure TfrmClList.FormDestroy(Sender: TObject);
+begin
+  frmClList:=nil;
+end;
+
+procedure TfrmClList.FormClose(Sender: TObject;
+  var Action: TCloseAction);
+begin
+  writeCxGrid(self.Name+tv1.Name+Self.FType,tv1,'产量登记');
+  action:=cafree;
+end;
+
+procedure TfrmClList.FormCreate(Sender: TObject);
+begin
+  begdate.Date:=dServerDate-6;
+  enddate.Date:=dServerDate;
+  cxgrid1.Align:=alClient;
+end;
+
+procedure TfrmClList.tbselectClick(Sender: TObject);
+begin
+  DoQuery();
+end;
+
+procedure TfrmClList.tbupdateClick(Sender: TObject);
+begin
+//  if ADOQueryTmp.IsEmpty then exit;
+//  frmclEdit:=TfrmclEdit.create(self);
+//  with frmclEdit do
+//  begin
+//    fromid:=1;
+//    fType:=trim(self.FType);
+//    caption:=trim(self.Caption);
+//    fkeyNO:=trim(self.ADOQueryTmp.fieldbyname('WRNO').AsString);
+//    if showmodal=1 then
+//    begin
+//      DoQuery();
+//      self.ADOQueryTmp.Locate('WRNO',fkeyNO,[]);
+//    end;
+//    Release;
+//  end; 
+end;
+
+procedure TfrmClList.FormShow(Sender: TObject);
+begin
+  initGrid();
+  readCxGrid(self.Name+tv1.Name+Self.FType,tv1,'产量登记');
+  DoQuery();
+end;
+
+procedure TfrmClList.tbdeleteClick(Sender: TObject);
+begin
+  if adoqueryTmp.IsEmpty then exit;
+  if application.MessageBox('是否删除此信息？','提示信息',MB_YesNo+MB_DefButton2+MB_IconQuestion)=IdYes then
+  begin
+    if not DeleteData() then
+    begin
+      application.MessageBox('删除数据失败！','提示信息');
+      exit;
+    end;
+    DoQuery();
+  end;
+  
+end;
+
+procedure TfrmClList.tbLookClick(Sender: TObject);
+begin
+//  if ADOQueryTmp.IsEmpty then exit;
+//  frmclEdit:=TfrmclEdit.create(self);
+//  with frmclEdit do
+//  begin
+//    fromid:=10;
+//    fType:=trim(self.FType);
+//    fkeyNO:=trim(self.ADOQueryTmp.fieldbyname('WRNO').AsString);
+//    caption:=trim(self.Caption);
+//    if showmodal=1 then
+//    begin
+//      DoQuery();
+//      self.ADOQueryTmp.Locate('inspectNo',fkeyNO,[]);
+//    end;
+//    Release;
+//  end;
+end;
+
+procedure TfrmClList.TV1DblClick(Sender: TObject);
+begin
+  tbLook.Click;
+end;
+
+procedure TfrmClList.ToolButton1Click(Sender: TObject);
+begin
+  if ADOQueryTmp.IsEmpty then exit;
+  TcxGridToExcel(self.Caption,cxGrid1);
+end;
+
+procedure TfrmClList.tbPrintlbClick(Sender: TObject);
+begin
+  if ADOQueryTmp.IsEmpty then exit;
+  dxComponentPrinter1.ReportLink[0].Preview;
+end;
+
+end.
--- a/Z99Dependency/ThreeFun/Form/U_CompressionFun.pas
+++ b/Z99Dependency/ThreeFun/Form/U_CompressionFun.pas
@ -0,0 +1,88 @@
+unit U_CompressionFun;
+
+interface
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ComCtrls, ToolWin, ShlObj, cxShellCommon, cxControls,
+  cxContainer, cxShellTreeView, cxShellListView, StdCtrls, BtnEdit,
+  OleCtnrs, DB, ADODB,ZLib;
+
+  
+procedure CompressionStream(var ASrcStream:TMemoryStream;ACompressionLevel:Integer = 2);
+procedure UnCompressionStream(var ASrcStream:TMemoryStream);
+
+implementation
+uses
+  U_iniparam;
+
+
+
+
+////////////////////////////////////////////////////
+///////压缩流
+////////////////////////////////////////////////////
+procedure CompressionStream(var ASrcStream:TMemoryStream;ACompressionLevel:Integer = 2);
+var
+  nDestStream:TMemoryStream;
+  nTmpStream:TCompressionStream;
+  nCompressionLevel:TCompressionLevel;
+begin
+  ASrcStream.Position := 0;
+  nDestStream := TMemoryStream.Create;
+  try
+    //级别
+    case ACompressionLevel of
+      0:nCompressionLevel := clNone;
+      1:nCompressionLevel := clFastest;
+      2:nCompressionLevel := clDefault;
+      3:nCompressionLevel := clMax;
+      else
+        nCompressionLevel := clMax;
+    end;
+    //开始压缩
+    nTmpStream := TCompressionStream.Create(nCompressionLevel,nDestStream);
+    try
+      ASrcStream.SaveToStream(nTmpStream);
+    finally
+      nTmpStream.Free;//释放后nDestStream才会有数据
+    end;
+    ASrcStream.Clear;
+    ASrcStream.LoadFromStream(nDestStream);
+    ASrcStream.Position := 0;
+  finally
+    nDestStream.Clear;
+    nDestStream.Free;
+  end;
+end;
+////////////////////////////////////////////////////
+///////解压缩流
+////////////////////////////////////////////////////
+procedure UnCompressionStream(var ASrcStream:TMemoryStream);
+var
+  nTmpStream:TDecompressionStream;
+  nDestStream:TMemoryStream;
+  nBuf: array[1..512] of Byte;
+  nSrcCount: integer;
+begin
+  ASrcStream.Position := 0;
+  nDestStream := TMemoryStream.Create;
+  nTmpStream := TDecompressionStream.Create(ASrcStream);
+  try
+    repeat
+      //读入实际大小
+      nSrcCount := nTmpStream.Read(nBuf, SizeOf(nBuf));
+      if nSrcCount > 0 then
+        nDestStream.Write(nBuf, nSrcCount);
+    until (nSrcCount = 0);
+    ASrcStream.Clear;
+    ASrcStream.LoadFromStream(nDestStream);
+    ASrcStream.Position := 0;
+  finally
+    nDestStream.Clear;
+    nDestStream.Free;
+    nTmpStream.Free;
+  end;
+end;
+
+
+end.
--- a/Z99Dependency/ThreeFun/Form/U_DxZDYHelp.dfm
+++ b/Z99Dependency/ThreeFun/Form/U_DxZDYHelp.dfm
--- a/Z99Dependency/ThreeFun/Form/U_DxZDYHelp.pas
+++ b/Z99Dependency/ThreeFun/Form/U_DxZDYHelp.pas
@ -0,0 +1,310 @@
+unit U_DxZDYHelp;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+  cxDataStorage, cxEdit, DB, cxDBData, ToolWin, ComCtrls,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel,
+  cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList,
+  StdCtrls, ExtCtrls, cxCheckBox, cxDropDownEdit;
+
+type
+  TfrmDxZDYHelp = class(TForm)
+    TV1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    V1Code: TcxGridDBColumn;
+    V1Name: TcxGridDBColumn;
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DataSource1: TDataSource;
+    ClientDataSet1: TClientDataSet;
+    TBAdd: TToolButton;
+    TBSave: TToolButton;
+    TBDel: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    TBEdit: TToolButton;
+    V1Note: TcxGridDBColumn;
+    V1OrderNo: TcxGridDBColumn;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    ZDYName: TEdit;
+    ThreeImgList: TImageList;
+    V1Sel: TcxGridDBColumn;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBAddClick(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TBDelClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure TBEditClick(Sender: TObject);
+    procedure TV1CellDblClick(Sender: TcxCustomGridTableView;
+      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
+      AShift: TShiftState; var AHandled: Boolean);
+    procedure ZDYNameChange(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    flag,flagname,snote:string;
+    fnote,forderno:Boolean;
+    Mresult:string;
+    { Public declarations }
+  end;
+
+var
+  frmDxZDYHelp: TfrmDxZDYHelp;
+
+implementation
+uses
+  U_DataLink,U_Fun10, U_ZDYHelp;
+{$R *.dfm}
+
+procedure TfrmDxZDYHelp.FormCreate(Sender: TObject);
+begin
+  cxGrid1.Align:=alClient;
+  with ADOConnection1 do
+  begin
+    Connected:=false;
+    ConnectionString:=DConString;
+    Connected:=true;
+  end;
+end;
+
+procedure TfrmDxZDYHelp.FormClose(Sender: TObject;
+  var Action: TCloseAction);
+begin
+  Action:=cahide;
+end;
+
+procedure TfrmDxZDYHelp.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from KH_ZDY where Type='''+flag+'''');
+      Open;
+    end;
+    SCreateCDS20(ADOQueryMain,ClientDataSet1);
+    SInitCDSData20(ADOQueryMain,ClientDataSet1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmDxZDYHelp.TBAddClick(Sender: TObject);
+begin
+  v1name.Options.Editing:=true;
+  //TV1.OptionsData.Editing:=True;
+  with ClientDataSet1 do
+  begin
+    Append;
+    Post;
+  end;
+end;
+
+procedure TfrmDxZDYHelp.TBSaveClick(Sender: TObject);
+var
+  maxno:string;
+begin
+  if ClientDataSet1.IsEmpty then Exit;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    {with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('delete KH_ZDY where Type='''+Trim(Flag)+'''');
+      SQL.Add('delete KH_ZDY where ZDYNo='''+Trim(Flag)+'''');
+      sql.Add('insert into KH_ZDY(ZDYNo,ZDYName,Type) select :ZDYNo,:ZDYName,:Type ');
+      Parameters.ParamByName('ZDYNo').Value:=Trim(flag);
+      Parameters.ParamByName('ZDYName').Value:=Trim(flagname);
+      Parameters.ParamByName('Type').Value:='Main';
+      ExecSQL;
+    end;}
+
+    with ADOQueryCmd do
+    begin
+      with ClientDataSet1 do
+      begin
+        First;
+        while not eof do
+        begin
+          if Trim(ClientDataSet1.FieldByName('ZDYNO').AsString)='' then
+          begin
+            if GetLSNo(ADOQueryTemp,maxno,'SY','KH_ZDY',3,1)=False then
+            begin
+              ADOQueryCmd.Connection.RollbackTrans;
+              Application.MessageBox('取最大编号失败！','提示',0);
+              Exit;
+            end;
+          end else
+          begin
+            maxno:=Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+          end;
+          with ADOQueryCmd do
+          begin
+            Close;
+            sql.Clear;
+            SQL.Add('delete KH_ZDY where ZDYNO='''+Trim(ClientDataSet1.fieldbyname('ZDYNO').AsString)+'''');
+            ExecSQL;
+          end;
+          with ADOQueryCmd do
+          begin
+            Close;
+            sql.Clear;
+            sql.Add('select * from KH_ZDY where 1<>1');
+            Open;
+          end;
+          if Trim(ClientDataSet1.FieldByName('ZDYName').AsString)='' then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+            Application.MessageBox('名称不能为空！','提示',0);
+            Exit;
+          end;
+          ADOQueryCmd.Append;
+          ADOQueryCmd.FieldByName('ZDYNo').Value:=Trim(maxno);
+          ADOQueryCmd.FieldByName('ZDYName').Value:=ClientDataSet1.fieldbyname('ZDYName').AsString;
+          ADOQueryCmd.FieldByName('note').Value:=Trim(ClientDataSet1.fieldbyname('note').AsString);
+          //ADOQueryCmd.FieldByName('orderno').Value:=ClientDataSet1.fieldbyname('Name').AsString;
+          ADOQueryCmd.FieldByName('Type').Value:=flag;
+          ADOQueryCmd.FieldByName('valid').Value:='Y';
+          //ADOQueryCmd.FieldByName('sel').Value:=0;
+          ADOQueryCmd.Post;
+          ClientDataSet1.Edit;
+          ClientDataSet1.FieldByName('ZDYNo').Value:=Trim(maxno);
+          ClientDataSet1.Post;
+          Next;
+        end;
+      end;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+    Application.MessageBox('保存成功！','提示',0);
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('保存失败！','提示',0);
+  end;
+  V1Name.Options.Editing:=false;
+end;
+
+procedure TfrmDxZDYHelp.TBDelClick(Sender: TObject);
+begin
+  if ClientDataSet1.IsEmpty then Exit;
+  if (Trim(ClientDataSet1.FieldByName('ZDYNo').AsString)<>'') or
+     (Trim(ClientDataSet1.FieldByName('ZDYname').AsString)<>'') then
+  begin
+    if application.MessageBox('确定要删除吗?','提示信息',1)=2 then exit;
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('delete KH_ZDY where ZDYNo='''+Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString)+'''');
+      SQL.Add(' and Type='''+Trim(flag)+'''');
+      ExecSQL;
+    end;
+  end;
+  ClientDataSet1.Delete;
+end;
+
+procedure TfrmDxZDYHelp.TBCloseClick(Sender: TObject);
+begin
+  ModalResult:=2;
+  Close;
+end;
+
+procedure TfrmDxZDYHelp.FormShow(Sender: TObject);
+var
+  fsj,fsj1:string;
+begin
+  InitGrid();
+  fsj:=Trim(flag)+'01';
+  fsj1:=Trim(flagname)+'01';
+  {if ClientDataSet1.IsEmpty then
+  begin
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('insert into KH_ZDY(ZDYNo,ZDYname,Type,note)');
+      sql.Add('select '''+Trim(fsj)+'''');
+      sql.Add(','''+Trim(fsj1)+'''');
+      SQL.Add(','''+Trim(flag)+'''');
+      sql.Add(','''+Trim(snote)+'''');
+      ExecSQL;
+    end;
+    InitGrid();
+  end;}
+  frmDxZDYHelp.Caption:=Trim(flagname)+'<'+Trim(flag)+'>';
+end;
+
+procedure TfrmDxZDYHelp.ToolButton1Click(Sender: TObject);
+var
+  ftype:string;
+  i:integer;
+begin
+  i:=0;
+  with ClientDataSet1  do
+  begin
+    Mresult:='';
+    First;
+    DisableControls;
+    while not eof do
+    begin
+      if fieldbyname('Ssel').AsBoolean then
+      begin
+        if (i=1) and (ftype<>trim(fieldbyname('note').AsString)) then
+        begin
+          application.MessageBox('备注信息不同，不能选择！','提示信息',0);
+          EnableControls;
+          exit;
+        end;
+        Mresult:=Mresult+trim(fieldbyname('zdyname').AsString)+';';
+        ftype:=trim(fieldbyname('note').AsString);
+        i:=1;
+      end;
+      next;
+    end;
+    First;
+    EnableControls;
+  end;
+  ModalResult:=1;
+end;
+
+procedure TfrmDxZDYHelp.TBEditClick(Sender: TObject);
+begin
+  v1name.Options.Editing:=true;
+ // TV1.OptionsData.Editing:=True;
+end;
+
+procedure TfrmDxZDYHelp.TV1CellDblClick(Sender: TcxCustomGridTableView;
+  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
+  AShift: TShiftState; var AHandled: Boolean);
+begin
+  if v1name.Options.Editing=False then
+  begin
+    ToolButton1.Click;
+  end;
+end;
+
+procedure TfrmDxZDYHelp.ZDYNameChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2));
+    SCreateCDS20(ADOQueryMain,ClientDataSet1);
+    SInitCDSData20(ADOQueryMain,ClientDataSet1);
+  end;
+end;
+
+end.
--- a/Z99Dependency/ThreeFun/Form/U_YPTypeHelp.dfm
+++ b/Z99Dependency/ThreeFun/Form/U_YPTypeHelp.dfm
@ -0,0 +1,63 @@
+object frmYPTypeHelp: TfrmYPTypeHelp
+  Left = 320
+  Top = 178
+  Width = 371
+  Height = 524
+  Caption = #26679#21697#31867#21035#36873#25321#21015#34920
+  Color = clBtnFace
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poScreenCenter
+  OnCreate = FormCreate
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object cxDBTreeList1: TcxDBTreeList
+    Left = 0
+    Top = 0
+    Width = 249
+    Height = 486
+    Align = alLeft
+    Bands = <
+      item
+      end>
+    BufferedPaint = False
+    DataController.DataSource = DataSource1
+    DataController.ParentField = 'CPParent'
+    DataController.KeyField = 'CPID'
+    OptionsBehavior.ExpandOnDblClick = False
+    OptionsSelection.CellSelect = False
+    OptionsView.CellAutoHeight = True
+    OptionsView.Headers = False
+    RootValue = -1
+    TabOrder = 0
+    OnDblClick = cxDBTreeList1DblClick
+    object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
+      DataBinding.FieldName = 'CPName'
+      Width = 210
+      Position.ColIndex = 1
+      Position.RowIndex = 0
+      Position.BandIndex = 0
+    end
+  end
+  object ADOConnection1: TADOConnection
+    LoginPrompt = False
+    Left = 288
+    Top = 60
+  end
+  object DataSource1: TDataSource
+    DataSet = ADOQueryHelp
+    Left = 280
+    Top = 188
+  end
+  object ADOQueryHelp: TADOQuery
+    Connection = ADOConnection1
+    Parameters = <>
+    Left = 288
+    Top = 136
+  end
+end
--- a/Z99Dependency/ThreeFun/Form/U_YPTypeHelp.pas
+++ b/Z99Dependency/ThreeFun/Form/U_YPTypeHelp.pas
@ -0,0 +1,70 @@
+unit U_YPTypeHelp;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB;
+
+type
+  TfrmYPTypeHelp = class(TForm)
+    ADOConnection1: TADOConnection;
+    cxDBTreeList1: TcxDBTreeList;
+    cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn;
+    DataSource1: TDataSource;
+    ADOQueryHelp: TADOQuery;
+    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure cxDBTreeList1DblClick(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  frmYPTypeHelp: TfrmYPTypeHelp;
+
+implementation
+
+uses
+  U_DataLink;
+{$R *.dfm}
+
+procedure TfrmYPTypeHelp.FormCreate(Sender: TObject);
+begin
+  cxDBTreeList1.Align := alclient;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      //ConnectionString:='';
+      Connected := true;
+    end;
+  except
+  end;
+end;
+
+procedure TfrmYPTypeHelp.FormShow(Sender: TObject);
+begin
+  with ADOQueryHelp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select * from CP_Type where FLType=''ÑùÆ·Àà±ð'' order by CPlevel,CPOrder,CPName');
+    Open;
+  end;
+  cxDBTreeList1.Items[0].Expand(false);
+end;
+
+procedure TfrmYPTypeHelp.cxDBTreeList1DblClick(Sender: TObject);
+begin
+  if ADOQueryHelp.IsEmpty then
+    exit;
+  ModalResult := 1;
+end;
+
+end.
+
--- a/Z99Dependency/ThreeFun/Fun/U_CPBCKKCSel.dfm
+++ b/Z99Dependency/ThreeFun/Fun/U_CPBCKKCSel.dfm
@ -0,0 +1,633 @@
+object frmCPBCKKCSel: TfrmCPBCKKCSel
+  Left = 506
+  Top = 220
+  Width = 1181
+  Height = 511
+  Align = alClient
+  Caption = #25104#21697#24067#24211#23384#36873#25321
+  Color = clBtnFace
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poScreenCenter
+  OnClose = FormClose
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar
+    Left = 0
+    Top = 0
+    Width = 1165
+    Height = 33
+    ButtonHeight = 30
+    ButtonWidth = 59
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Flat = True
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    Images = DataLink_PBMDDJ.ThreeImgList
+    List = True
+    ParentColor = False
+    ParentFont = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 0
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 20
+      OnClick = TBFindClick
+    end
+    object ToolButton1: TToolButton
+      Left = 126
+      Top = 0
+      AutoSize = True
+      Caption = #30830#23450
+      ImageIndex = 31
+      Visible = False
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 189
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 21
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 33
+    Width = 1165
+    Height = 60
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    object Label3: TLabel
+      Left = 199
+      Top = 12
+      Width = 24
+      Height = 12
+      Caption = #21697#21517
+    end
+    object Label4: TLabel
+      Left = 340
+      Top = 12
+      Width = 36
+      Height = 12
+      Caption = #21152#24037#21378
+    end
+    object Label5: TLabel
+      Left = 26
+      Top = 12
+      Width = 48
+      Height = 12
+      Caption = #20837#24211#21333#21495
+    end
+    object Label8: TLabel
+      Left = 199
+      Top = 36
+      Width = 24
+      Height = 12
+      Caption = #35268#26684
+    end
+    object Label12: TLabel
+      Left = 27
+      Top = 36
+      Width = 48
+      Height = 12
+      Caption = #20837#24211#31867#22411
+    end
+    object Label6: TLabel
+      Left = 340
+      Top = 36
+      Width = 36
+      Height = 12
+      Caption = #25104'  '#20998
+    end
+    object Label7: TLabel
+      Left = 470
+      Top = 12
+      Width = 48
+      Height = 12
+      Caption = #35746' '#21333' '#21495
+    end
+    object Label1: TLabel
+      Left = 470
+      Top = 36
+      Width = 48
+      Height = 12
+      Caption = #23384#25918#24037#21378
+    end
+    object Label2: TLabel
+      Left = 646
+      Top = 36
+      Width = 48
+      Height = 12
+      Caption = #24211'    '#20301
+    end
+    object Label9: TLabel
+      Left = 646
+      Top = 12
+      Width = 48
+      Height = 12
+      Caption = #26579#21378#32568#21495
+    end
+    object Label10: TLabel
+      Left = 774
+      Top = 36
+      Width = 24
+      Height = 12
+      Caption = #39068#33394
+    end
+    object SPName: TEdit
+      Tag = 2
+      Left = 226
+      Top = 9
+      Width = 100
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 0
+      OnChange = TBFindClick
+    end
+    object FactoryName: TEdit
+      Tag = 2
+      Left = 378
+      Top = 9
+      Width = 78
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 1
+      OnChange = FactoryNameChange
+    end
+    object SPID: TEdit
+      Tag = 2
+      Left = 76
+      Top = 9
+      Width = 109
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 2
+      OnChange = TBFindClick
+    end
+    object SPSpec: TEdit
+      Tag = 2
+      Left = 226
+      Top = 32
+      Width = 100
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 3
+      OnChange = TBFindClick
+    end
+    object CRType: TComboBox
+      Tag = 2
+      Left = 76
+      Top = 32
+      Width = 109
+      Height = 20
+      Style = csDropDownList
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ItemHeight = 12
+      TabOrder = 4
+      OnChange = TBFindClick
+      Items.Strings = (
+        #21152#24037#23436#25104
+        #22238#20462#23436#25104
+        #26816#39564#36864#22238
+        #26399#21021#20837#24211
+        '')
+    end
+    object SPCF: TEdit
+      Tag = 2
+      Left = 378
+      Top = 32
+      Width = 78
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 5
+      OnChange = FactoryNameChange
+    end
+    object OrderNo: TEdit
+      Tag = 2
+      Left = 519
+      Top = 9
+      Width = 108
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 6
+      OnChange = FactoryNameChange
+    end
+    object ToFactoryName: TEdit
+      Tag = 2
+      Left = 519
+      Top = 33
+      Width = 108
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 7
+      OnChange = FactoryNameChange
+    end
+    object KuWei: TEdit
+      Tag = 2
+      Left = 694
+      Top = 32
+      Width = 65
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 8
+      OnChange = FactoryNameChange
+    end
+    object RCGangNo: TEdit
+      Tag = 2
+      Left = 694
+      Top = 8
+      Width = 65
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 9
+      OnChange = FactoryNameChange
+    end
+    object SPColor: TEdit
+      Tag = 2
+      Left = 799
+      Top = 32
+      Width = 65
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 10
+      OnChange = FactoryNameChange
+    end
+  end
+  object cxGrid2: TcxGrid
+    Left = 0
+    Top = 93
+    Width = 1165
+    Height = 380
+    Align = alClient
+    PopupMenu = PopupMenu1
+    TabOrder = 2
+    object Tv1: TcxGridDBTableView
+      NavigatorButtons.ConfirmDelete = False
+      DataController.DataSource = DataSource1
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skCount
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = v2Column6
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = v1Column9
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      Styles.Inactive = DataLink_PBMDDJ.SHuangSe
+      Styles.IncSearch = DataLink_PBMDDJ.SHuangSe
+      Styles.Selection = DataLink_PBMDDJ.SHuangSe
+      Styles.Header = DataLink_PBMDDJ.Default
+      object v1Column20: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.NullStyle = nssUnchecked
+        HeaderAlignmentHorz = taCenter
+        Width = 44
+      end
+      object v1Column6: TcxGridDBColumn
+        Caption = #20837#24211#21333#21495
+        DataBinding.FieldName = 'SPID'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 83
+      end
+      object v1Column2: TcxGridDBColumn
+        Tag = 2
+        Caption = #20837#24211#26102#38388
+        DataBinding.FieldName = 'CRTime'
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.SaveTime = False
+        Properties.ShowTime = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 93
+      end
+      object v1Column4: TcxGridDBColumn
+        Tag = 2
+        Caption = #20837#24211#31867#22411
+        DataBinding.FieldName = 'CRType'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.DropDownListStyle = lsFixedList
+        Properties.Items.Strings = (
+          #27491#24120#20837#24211
+          #29983#20135#36864#22238
+          #26399#21021#20837#24211)
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 81
+      end
+      object v1Column13: TcxGridDBColumn
+        Caption = #35746#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 95
+      end
+      object v1Column14: TcxGridDBColumn
+        Tag = 2
+        Caption = #21152#24037#21378
+        DataBinding.FieldName = 'FactoryName'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Alignment.Horz = taLeftJustify
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 103
+      end
+      object v1Column15: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'SPColor'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 116
+      end
+      object v1Column22: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'CustomerNoName'
+        HeaderAlignmentHorz = taCenter
+        Width = 83
+      end
+      object v1Column21: TcxGridDBColumn
+        Caption = #32534#21495
+        DataBinding.FieldName = 'spcode'
+        HeaderAlignmentHorz = taCenter
+        Width = 82
+      end
+      object v2Column1: TcxGridDBColumn
+        Tag = 2
+        Caption = #21697#21517
+        DataBinding.FieldName = 'SPName'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 97
+      end
+      object v1Column8: TcxGridDBColumn
+        Tag = 2
+        Caption = #35268#26684
+        DataBinding.FieldName = 'SPSpec'
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 65
+      end
+      object v1Column7: TcxGridDBColumn
+        Tag = 2
+        Caption = #25104#20998
+        DataBinding.FieldName = 'SPCF'
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 73
+      end
+      object v1Column1: TcxGridDBColumn
+        Tag = 2
+        Caption = #38376#24133
+        DataBinding.FieldName = 'SPMF'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 73
+      end
+      object v1Column10: TcxGridDBColumn
+        Caption = #20811#37325
+        DataBinding.FieldName = 'SPKZ'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
+      object v1Column16: TcxGridDBColumn
+        Caption = #26469#33258#24037#21378
+        DataBinding.FieldName = 'FromFactoryName'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
+      object v1Column11: TcxGridDBColumn
+        Tag = 2
+        Caption = #23384#25918#24037#21378
+        DataBinding.FieldName = 'ToFactoryName'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
+      object v1Column18: TcxGridDBColumn
+        Caption = #24211#20301
+        DataBinding.FieldName = 'KuWei'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 76
+      end
+      object v1Column19: TcxGridDBColumn
+        Caption = #26579#21378#32568#21495
+        DataBinding.FieldName = 'RCGangNo'
+        Options.Editing = False
+        Width = 67
+      end
+      object v1Column9: TcxGridDBColumn
+        Tag = 2
+        Caption = #24211#23384#21305#25968
+        DataBinding.FieldName = 'MXKCPiQty'
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 67
+      end
+      object v2Column6: TcxGridDBColumn
+        Tag = 2
+        Caption = #24211#23384#25968#37327
+        DataBinding.FieldName = 'MXKCQty'
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 85
+      end
+      object v1Column3: TcxGridDBColumn
+        Tag = 2
+        Caption = #25968#37327#21333#20301
+        DataBinding.FieldName = 'QtyUnit'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.DropDownListStyle = lsFixedList
+        Properties.Items.Strings = (
+          'Kg'
+          'M'
+          'Y')
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column12: TcxGridDBColumn
+        Tag = 2
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        Options.Editing = False
+        Width = 79
+      end
+    end
+    object cxGrid2Level1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_PBMDDJ.ADOLink
+    Parameters = <>
+    Left = 792
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_PBMDDJ.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 824
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_PBMDDJ.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 760
+  end
+  object DataSource1: TDataSource
+    DataSet = CDS_Main
+    Left = 920
+    Top = 152
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 888
+    Top = 152
+  end
+  object CDS_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 952
+    Top = 152
+  end
+  object RM1: TRMGridReport
+    ThreadPrepareReport = True
+    InitialZoom = pzDefault
+    PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbPageSetup, pbExit, pbExport, pbNavigator]
+    DefaultCollate = False
+    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+    PreviewOptions.RulerUnit = rmutScreenPixels
+    PreviewOptions.RulerVisible = False
+    PreviewOptions.DrawBorder = False
+    PreviewOptions.BorderPen.Color = clGray
+    PreviewOptions.BorderPen.Style = psDash
+    Dataset = RMDBMain
+    CompressLevel = rmzcFastest
+    CompressThread = False
+    LaterBuildEvents = True
+    OnlyOwnerDataSet = False
+    Left = 360
+    Top = 232
+    ReportData = {}
+  end
+  object RMDBMain: TRMDBDataSet
+    Visible = True
+    DataSet = CDS_PRT
+    Left = 424
+    Top = 232
+  end
+  object RMXLSExport1: TRMXLSExport
+    ShowAfterExport = True
+    ExportPrecision = 1
+    PagesOfSheet = 100
+    ExportImages = True
+    ExportFrames = True
+    ExportImageFormat = ifBMP
+    JPEGQuality = 0
+    ScaleX = 1.000000000000000000
+    ScaleY = 1.000000000000000000
+    CompressFile = False
+    Left = 392
+    Top = 232
+  end
+  object RMDBHZ: TRMDBDataSet
+    Visible = True
+    DataSet = CDS_HZ
+    Left = 520
+    Top = 232
+  end
+  object CDS_HZ: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 488
+    Top = 232
+  end
+  object CDS_PRT: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 456
+    Top = 232
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 328
+    Top = 232
+    object N1: TMenuItem
+      Caption = #20840#36873
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+      OnClick = N2Click
+    end
+  end
+end
--- a/Z99Dependency/ThreeFun/Fun/U_CPBCKKCSel.pas
+++ b/Z99Dependency/ThreeFun/Fun/U_CPBCKKCSel.pas
@ -0,0 +1,227 @@
+unit U_CPBCKKCSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+  cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
+  cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
+  ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
+  cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
+  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit;
+
+type
+  TfrmCPBCKKCSel = class(TForm)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    CDS_Main: TClientDataSet;
+    RM1: TRMGridReport;
+    RMDBMain: TRMDBDataSet;
+    RMXLSExport1: TRMXLSExport;
+    RMDBHZ: TRMDBDataSet;
+    CDS_HZ: TClientDataSet;
+    CDS_PRT: TClientDataSet;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    ToolButton1: TToolButton;
+    cxGrid2: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1Column6: TcxGridDBColumn;
+    v1Column2: TcxGridDBColumn;
+    v1Column4: TcxGridDBColumn;
+    v1Column13: TcxGridDBColumn;
+    v1Column14: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
+    v1Column8: TcxGridDBColumn;
+    v1Column7: TcxGridDBColumn;
+    v1Column1: TcxGridDBColumn;
+    v1Column10: TcxGridDBColumn;
+    v1Column11: TcxGridDBColumn;
+    v1Column9: TcxGridDBColumn;
+    v2Column6: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    v1Column12: TcxGridDBColumn;
+    cxGrid2Level1: TcxGridLevel;
+    Label3: TLabel;
+    Label4: TLabel;
+    Label5: TLabel;
+    Label8: TLabel;
+    Label12: TLabel;
+    Label6: TLabel;
+    Label7: TLabel;
+    SPName: TEdit;
+    FactoryName: TEdit;
+    SPID: TEdit;
+    SPSpec: TEdit;
+    CRType: TComboBox;
+    SPCF: TEdit;
+    OrderNo: TEdit;
+    Label1: TLabel;
+    ToFactoryName: TEdit;
+    v1Column16: TcxGridDBColumn;
+    v1Column15: TcxGridDBColumn;
+    Label2: TLabel;
+    KuWei: TEdit;
+    v1Column18: TcxGridDBColumn;
+    v1Column19: TcxGridDBColumn;
+    Label9: TLabel;
+    RCGangNo: TEdit;
+    Label10: TLabel;
+    SPColor: TEdit;
+    v1Column20: TcxGridDBColumn;
+    v1Column21: TcxGridDBColumn;
+    v1Column22: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ConNoMChange(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
+    procedure MPRTCodeNameChange(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure SXBatchNOChange(Sender: TObject);
+    procedure FactoryNameChange(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  frmCPBCKKCSel: TfrmCPBCKKCSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_SXCKInPut;
+
+{$R *.dfm}
+
+procedure TfrmCPBCKKCSel.FormDestroy(Sender: TObject);
+begin
+  frmDJBCKKCSelList := nil;
+end;
+
+procedure TfrmCPBCKKCSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  Action := caFree;
+end;
+
+procedure TfrmCPBCKKCSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      sql.Clear;
+      sql.Add(' select A.* ');
+      sql.Add(' ,OrderNo=(select OrderNo from JYOrder_Main JM where JM.MainId=A.OrdMainIdRK )');
+      sql.Add(' from CK_SXPB_CR A where isnull(CKName,'''')=''成品布'' ');
+      SQL.Add(' and A.CRFlag=''入库'' and MXKCQty>0');
+      Open;
+      //ShowMessage(SQL.Text);
+    end;
+    SCreateCDS20(ADOQueryMain, CDS_Main);
+    SInitCDSData20(ADOQueryMain, CDS_Main);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmCPBCKKCSel.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmCPBCKKCSel.ConNoMChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  end;
+end;
+
+procedure TfrmCPBCKKCSel.TBCloseClick(Sender: TObject);
+begin
+  WriteCxGrid('待检布库存选择列表', Tv1, '待检布仓库');
+  Close;
+end;
+
+procedure TfrmCPBCKKCSel.FormShow(Sender: TObject);
+begin
+  ReadCxGrid('待检布库存选择列表', Tv1, '待检布仓库');
+  //InitGrid();
+end;
+
+procedure TfrmCPBCKKCSel.TBFindClick(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS20(ADOQueryMain, CDS_Main);
+    SInitCDSData20(ADOQueryMain, CDS_Main);
+  end;
+end;
+
+procedure TfrmCPBCKKCSel.MPRTCodeNameChange(Sender: TObject);
+begin
+  TBFind.Click;
+end;
+
+procedure TfrmCPBCKKCSel.N1Click(Sender: TObject);
+begin
+  SelOKNo(CDS_Main, True);
+end;
+
+procedure TfrmCPBCKKCSel.N2Click(Sender: TObject);
+begin
+  SelOKNo(CDS_Main, False);
+end;
+
+procedure TfrmCPBCKKCSel.SXBatchNOChange(Sender: TObject);
+begin
+  TBFind.Click;
+end;
+
+procedure TfrmCPBCKKCSel.FactoryNameChange(Sender: TObject);
+begin
+  TBFind.Click;
+end;
+
+procedure TfrmCPBCKKCSel.ToolButton1Click(Sender: TObject);
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+  if CDS_Main.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  ModalResult := 1;
+end;
+
+procedure TfrmCPBCKKCSel.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+  ModalResult := 1;
+end;
+
+end.
+
--- a/Z99Dependency/ThreeFun/Fun/U_Fun.pas
+++ b/Z99Dependency/ThreeFun/Fun/U_Fun.pas
@ -152,7 +152,6 @@ end;
  procedure ClearOrHideControls(TMPanel: TPanel; HintValue: string; IsClear: Boolean; IsHide: Boolean);
  procedure AssignmentControls(TMPanel: TPanel; TMClientDataset: TclientDataSet; Hintvalue: string);
  procedure IsVisibleTV(TMPanel: TPanel; MTV: TcxGridDBTableView; Hintvalue: string; IsVisible: Boolean);
-
 
  function RoundFloat(f: double; i: integer): double;

 implementation
--- a/Z99Dependency/ThreeFun/Fun/U_Fun10.cfg
+++ b/Z99Dependency/ThreeFun/Fun/U_Fun10.cfg
@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
--- a/Z99Dependency/ThreeFun/Fun/U_Fun10.dof
+++ b/Z99Dependency/ThreeFun/Fun/U_Fun10.dof
@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=2052
+CodePage=936
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
--- a/Z99Dependency/ThreeFun/Fun/U_PublicFunction.pas
+++ b/Z99Dependency/ThreeFun/Fun/U_PublicFunction.pas
@ -0,0 +1,124 @@
+unit U_PublicFunction;
+interface
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ComCtrls, ToolWin, StdCtrls, BtnEdit, cxStyles, cxCustomData,
+  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit,DBGrids, DB, cxDBData,
+  cxGridLevel, cxClasses, cxControls, cxGridCustomView, ADODB,StrUtils,
+  Midas,cxGridCustomTableView, cxGridTableView, cxGridDBTableView,cxTimeEdit,
+    cxGrid,cxDBLookupComboBox,cxCalendar, cxCurrencyEdit,cxGridExportLink,
+  ExtCtrls, Buttons,DBClient,FTComboBox,cxDropDownEdit,CXmemo;
+
+  function GetMaxBh(ADOQueryTmp:TADOQuery;
+                  var mMaxBh:string;
+                  mBhType:string;
+                  mFlag:string;
+                  mStatus:string;
+                  lsLen:integer=3):Boolean;
+   procedure CreateAdoToCds(Ado1:TADOQuery; Cds1:TclientDataSet );
+   procedure InitAdoToCds(Ado1:TADOQuery;Cds1:TclientDataSet);
+implementation
+
+function GetMaxBh(ADOQueryTmp:TADOQuery;
+                  var mMaxBh:string;
+                  mBhType:string;
+                  mFlag:string;
+                  mStatus:string;
+                  lsLen:integer=3):Boolean;
+begin
+  try
+    with ADOQueryTmp do
+    begin
+      Close;
+      sql.Clear ;
+      sql.Add(' exec Get_SY_MaxBH ');
+      sql.Add(' @BHstr='+quotedstr(mFlag));
+      sql.Add(',@BHType='+quotedStr(mBhType));
+      sql.Add(',@Len='+inttostr(LsLen));
+      sql.Add(',@status='+quotedStr(mStatus));
+      Open;
+
+      if RecordCount>0 then
+      begin
+        mMaxBh:=trim(fieldByName('MaxBH').AsString) ;
+        if mMaxBh<>'' then
+          result:=true
+        else
+          Result:=false;
+      end
+      else
+      begin
+        result:=false;
+      end;
+
+    end;
+    if not Result then
+      application.MessageBox(Pchar('无法生成自动编号('+mflag+')'),'提示信息',MB_ICONINFORMATION);
+
+  Except
+    result:=false;
+    application.MessageBox(Pchar('无法生成自动编号('+mflag+')'),'提示信息',MB_ICONINFORMATION);
+  end;
+end;
+
+procedure CreateAdoToCds(Ado1:TADOQuery; Cds1:TclientDataSet );
+var
+  i:integer;
+  mfieldName:string;
+  mSize:integer;
+begin
+  mfieldName:='';
+  Cds1.FieldDefs.Clear;
+  with Ado1 do
+  begin
+    for i:=0 to fieldCount-1 do     //
+    begin
+      if (Fields[i].DataType=ftString) and (Fields[i].Size=0) then
+      begin
+        msize:=1;
+      end
+      else
+        msize:=Fields[i].Size;
+        mfieldName:=trim(fields[i].FieldName);
+        Cds1.FieldDefs.Add(mfieldName,Fields[i].DataType,msize);
+    end;
+  end;
+  Cds1.FieldDefs.Add('flag',ftString,1);
+  Cds1.FieldDefs.Add('index',ftInteger,0);
+  Cds1.Close;
+  Cds1.CreateDataSet;
+end;
+procedure InitAdoToCds(Ado1:TADOQuery;Cds1:TclientDataSet);
+var
+  i:integer;
+  k:integer;
+begin
+  Ado1.DisableControls;
+  Cds1.DisableControls;
+  Ado1.first;
+  K:=1;
+  while not Ado1.Eof do
+  begin
+    with Cds1 do
+    begin
+      Append;
+      for i:=0 to Ado1.FieldCount-1 do
+      begin
+        fields[i].value:=Ado1.Fields[i].Value ;
+      end;
+      fieldByName('flag').AsString :='1';
+      fieldByName('index').value :=k;
+      inc(k);
+      Post;
+    end;
+    Ado1.Next;
+  end;
+  if not Cds1.IsEmpty then
+  begin
+    Cds1.First ;
+  end;
+  Ado1.EnableControls;
+  Cds1.EnableControls;
+end;
+
+end.
--- a/Z99Dependency/ThreeFun/Fun/U_SelExportField.dfm
+++ b/Z99Dependency/ThreeFun/Fun/U_SelExportField.dfm
@ -44,7 +44,7 @@ object frmSelExportField: TfrmSelExportField
    TabOrder = 2
    Visible = False
    object ExpGrid: TcxGridDBTableView
-      Navigator.Buttons.CustomButtons = <>
+      NavigatorButtons.ConfirmDelete = False
      DataController.DataSource = ExportDataSource
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <>
--- a/Z99Dependency/ThreeFun/Fun/U_SelExportField.pas
+++ b/Z99Dependency/ThreeFun/Fun/U_SelExportField.pas
@ -8,22 +8,7 @@ uses
  DB,IniFiles, RM_Common, RM_Class, RM_e_Xls, cxStyles, cxCustomData,
  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData,
  cxGridLevel, cxClasses, cxControls, cxGridCustomView,
-  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid,
-  cxLookAndFeels, cxLookAndFeelPainters, 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,
-  cxNavigator;
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid;

 type
  TfrmSelExportField = class(TForm)
--- a/云翔一码通/U_YMTRKInPut.dfm
+++ b/云翔一码通/U_YMTRKInPut.dfm
@ -1,6 +1,6 @@
 object frmYMTRKInPut: TfrmYMTRKInPut
-  Left = 309
-  Top = 236
+  Left = 599
+  Top = 321
  Width = 1829
  Height = 623
  Align = alClient
--- a/云翔一码通/U_YMTRKInPut.pas
+++ b/云翔一码通/U_YMTRKInPut.pas
@ -118,6 +118,7 @@ type
  public
    { Public declarations }
    FBCId: string;
+    PState, CopyInt: Integer;
  end;

 var
@ -183,16 +184,52 @@ end;

 procedure TfrmYMTRKInPut.InitGrid();
 begin
-//  with ADOQueryTemp do
-//  begin
-////    Close;
-////    sql.Clear;
-////    sql.Add('select * from YMT_CK_MX where SPID=' + quotedstr(Trim(MCRNO)));
-////    sql.Add(' order by MXID');
-////    Open;
-//  end;
-//  SCreateCDS20(ADOQueryTemp, CDS_MX);
-//  SInitCDSData20(ADOQueryTemp, CDS_MX);
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' select A.* ');
+    sql.Add(',OrderNO=(select OrderNO from JYOrder_Main JM where JM.MainId=A.ORDMainIdRK)');
+    sql.Add(' from YMT_CK_CR A');
+    sql.Add(' where SPID=''' + Trim(FBCId) + '''');
+    Open;
+  end;
+  SCreateCDS20(ADOQueryTemp, CDS_Sub);
+  SInitCDSData20(ADOQueryTemp, CDS_Sub);
+
+  if CDS_Sub.IsEmpty then
+    Exit;
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YMT_CK_CR where FZSPID=''' + Trim(CDS_Sub.fieldbyname('SPID').AsString) + '''');
+    sql.Add(' and CRQtyFlag=-1');
+    Open;
+  end;
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    v1Column4.Options.Focusing := False;
+    v1Column14.Options.Focusing := False;
+    v2Column1.Options.Focusing := False;
+    v1Column8.Options.Focusing := False;
+    v1Column7.Options.Focusing := False;
+    v1Column1.Options.Focusing := False;
+    v1Column10.Options.Focusing := False;
+    v1Column11.Options.Focusing := False;
+    Exit;
+  end
+  else
+  begin
+    v1Column4.Options.Focusing := True;
+    v1Column14.Options.Focusing := True;
+    v2Column1.Options.Focusing := True;
+    v1Column8.Options.Focusing := True;
+    v1Column7.Options.Focusing := True;
+    v1Column1.Options.Focusing := True;
+    v1Column10.Options.Focusing := True;
+    v1Column11.Options.Focusing := True;
+  end;
 end;

 procedure TfrmYMTRKInPut.FormClose(Sender: TObject; var Action: TCloseAction);
@ -253,13 +290,6 @@ begin
        FFSPID := Trim(ADOQueryTemp.fieldbyname('SPID').AsString);
        if Trim(FFSPID) = '' then
        begin
-//          if GetLSNo(ADOQueryCmd, Maxno, 'DR', 'YMT_CK_CR', 3, 1) = False then
-//          begin
-//            Result := False;
-//            ADOQueryCmd.Connection.RollbackTrans;
-//            Application.MessageBox('取待检布入库编号失败!', '提示', 0);
-//            Exit;
-//          end;
          Maxno := Trim(CDS_Sub.fieldbyname('SPID').AsString);
        end
        else
@ -296,7 +326,6 @@ begin
          FieldByName('ORDSubIdRK').Value := Trim(CDS_Sub.fieldbyname('ORDSubIdRK').AsString);
          FieldByName('CRFlag').Value := '흙욋';
          FieldByName('CRQtyFlag').Value := 1;
-          //FieldByName('CRID').Value:=FCRID;

          RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'YMT_CK_CR', 2);

@ -344,19 +373,8 @@ begin

        Edit;
        FieldByName('SPID').Value := Trim(Maxno);
-        //FieldByName('CRID').Value:=Trim(FCRID);
        Post;
-//
-//        if Trim(CDS_Sub.fieldbyname('CRType').AsString)='客户退货' then
-//        begin
-//         if not YSData(CDS_Sub) then
-//         begin
-//           ADOQueryCmd.Connection.RollbackTrans;
-//           Application.MessageBox('保存异常!','提示',0);
-//           exit;
-//         end;
-//        end;
-
+        if PState = 0 then
          AddRows();
        Next;
      end;
@ -383,51 +401,8 @@ var
  fsj: string;
 begin
  ReadCxGrid('덤쇱꼈흙욋되션', Tv1, '덤쇱꼈꾑욋');
-  with ADOQueryTemp do
-  begin
-    Close;
-    sql.Clear;
-    sql.Add(' select A.* ');
-    sql.Add(',OrderNO=(select OrderNO from JYOrder_Main JM where JM.MainId=A.ORDMainIdRK)');
-    sql.Add(' from YMT_CK_CR A');
-    sql.Add(' where SPID=''' + Trim(FBCId) + '''');
-    Open;
-  end;
-  SCreateCDS20(ADOQueryTemp, CDS_Sub);
-  SInitCDSData20(ADOQueryTemp, CDS_Sub);
-  if CDS_Sub.IsEmpty then
-    Exit;
-  with ADOQueryTemp do
-  begin
-    Close;
-    sql.Clear;
-    sql.Add('select * from YMT_CK_CR where FZSPID=''' + Trim(CDS_Sub.fieldbyname('SPID').AsString) + '''');
-    sql.Add(' and CRQtyFlag=-1');
-    Open;
-  end;
-  if ADOQueryTemp.IsEmpty = False then
-  begin
-    v1Column4.Options.Focusing := False;
-    v1Column14.Options.Focusing := False;
-    v2Column1.Options.Focusing := False;
-    v1Column8.Options.Focusing := False;
-    v1Column7.Options.Focusing := False;
-    v1Column1.Options.Focusing := False;
-    v1Column10.Options.Focusing := False;
-    v1Column11.Options.Focusing := False;
-    Exit;
-  end
-  else
-  begin
-    v1Column4.Options.Focusing := True;
-    v1Column14.Options.Focusing := True;
-    v2Column1.Options.Focusing := True;
-    v1Column8.Options.Focusing := True;
-    v1Column7.Options.Focusing := True;
-    v1Column1.Options.Focusing := True;
-    v1Column10.Options.Focusing := True;
-    v1Column11.Options.Focusing := True;
-  end;
+  InitGrid();
+
 end;

 procedure TfrmYMTRKInPut.TBDelClick(Sender: TObject);
--- a/云翔一码通/U_YMTRKList.dfm
+++ b/云翔一码通/U_YMTRKList.dfm
@ -1,6 +1,6 @@
 object frmYMTRKList: TfrmYMTRKList
-  Left = 264
-  Top = 309
+  Left = 386
+  Top = 376
  Width = 1370
  Height = 750
  Caption = #38754#26009#22238#20179#30331#35760
--- a/云翔一码通/U_YMTRKList.pas
+++ b/云翔一码通/U_YMTRKList.pas
@ -367,6 +367,7 @@ begin
    frmYMTRKInPut := TfrmYMTRKInPut.Create(Application);
    with frmYMTRKInPut do
    begin
+      PState := 0;
      FBCId := '';
      if ShowModal = 1 then
      begin
@ -391,6 +392,7 @@ begin
    frmYMTRKInPut := TfrmYMTRKInPut.Create(Application);
    with frmYMTRKInPut do
    begin
+      PState := 1;
      FBCId := Trim(CDS_Main.fieldbyname('SPID').AsString);
      TBDel.Visible := False;
      TBAdd.Visible := False;
--- a/云翔一码通/U_ZdyAttachGYS.dfm
+++ b/云翔一码通/U_ZdyAttachGYS.dfm
@ -87,6 +87,7 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
      Width = 24
      Height = 12
      Caption = #31867#22411
+      Visible = False
    end
    object CoName: TEdit
      Tag = 2
@ -118,6 +119,7 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
      ItemHeight = 12
      TabOrder = 0
+      Visible = False
      OnChange = CoNameChange
      Items.Strings = (
        ''
@ -165,27 +167,28 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
      Styles.Header = DataLink_YXYMT.Default
      object v2Column2: TcxGridDBColumn
        Caption = #20379#24212#21830#32534#21495
-        DataBinding.FieldName = 'CoCode'
+        DataBinding.FieldName = 'ZdyCode'
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Width = 86
      end
      object v2Column6: TcxGridDBColumn
        Caption = #20379#24212#21830#21517#31216
-        DataBinding.FieldName = 'CoName'
+        DataBinding.FieldName = 'ZdyName'
        HeaderAlignmentHorz = taCenter
        Options.Focusing = False
        Width = 133
      end
      object v2Column15: TcxGridDBColumn
        Caption = #20379#24212#21830#31616#31216
-        DataBinding.FieldName = 'CoHRName'
+        DataBinding.FieldName = 'ZdyNameZ'
        HeaderAlignmentHorz = taCenter
        Width = 106
      end
      object v2Column7: TcxGridDBColumn
        Caption = #31867#22411
        DataBinding.FieldName = 'FactType'
+        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 82
--- a/云翔一码通/U_ZdyAttachGYS.pas
+++ b/云翔一码通/U_ZdyAttachGYS.pas
@ -90,8 +90,9 @@ begin
      Filtered := False;
      Close;
      SQL.Clear;
-      sql.Add(' select * from Company A left join Company_contact B  ');
-      sql.Add(' on A.CoID=B.CoID and B.IsDefault=1 where A.CoType=''¹©Ó¦ÉÌ'' and A.Valid=''Y'' ');
+      sql.Add(' select * from KH_Zdy_Attachment A   ');
+//        sql.Add(' left join Company_contact B on A.CoID=B.CoID and B.IsDefault=1');
+      sql.Add('  where A.Type=''GYS'' and A.Valid=''Y'' ');
      Open;
    end;
    SCreateCDS20(ADOQueryMain, CDS_HZ);
--- a/云翔一码通/YXYMT.dof
+++ b/云翔一码通/YXYMT.dof
@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=E:\项目资料\00_重点客户\云翔\D7myYunxiang\云翔一码通\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\云翔一码通\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
--- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.dfm
+++ b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.dfm
@ -503,7 +503,6 @@ object frmLLRKInPutMH_RCCG: TfrmLLRKInPutMH_RCCG
        OnBtnClick = ToGYSNameBtnClick
      end
      object KHNameJC: TBtnEditA
-        Tag = 2
        Left = 112
        Top = 157
        Width = 273
--- a/云翔生产管理(MYSC.dll)/U_MLSC.dfm
+++ b/云翔生产管理(MYSC.dll)/U_MLSC.dfm
@ -21,7 +21,7 @@ object frmMLSC: TfrmMLSC
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1304
+    Width = 1312
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 119
@ -99,8 +99,8 @@ object frmMLSC: TfrmMLSC
  object cxGrid1: TcxGrid
    Left = 0
    Top = 113
-    Width = 1304
-    Height = 292
+    Width = 1312
+    Height = 300
    Align = alClient
    TabOrder = 1
    object Tv1: TcxGridDBTableView
@ -187,7 +187,7 @@ object frmMLSC: TfrmMLSC
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1304
+    Width = 1312
    Height = 81
    Align = alTop
    BevelInner = bvRaised
@ -413,8 +413,8 @@ object frmMLSC: TfrmMLSC
  end
  object cxGrid2: TcxGrid
    Left = 0
-    Top = 405
-    Width = 1304
+    Top = 413
+    Width = 1312
    Height = 242
    Align = alBottom
    TabOrder = 3
--- a/云翔生产管理(MYSC.dll)/U_MLSC.pas
+++ b/云翔生产管理(MYSC.dll)/U_MLSC.pas
@ -11,19 +11,19 @@ uses
  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
  cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore,    
-   dxSkinDarkRoom,  
-     
-     
-     
-    
-    
-    
-   dxSkinOffice2013White,  
-    dxSkinSharpPlus, 
-  dxSkinSpringTime,   
-  dxSkinsDefaultPainters,   
-   dxSkinscxPCPainter;
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver,
+  dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinsCore,
+  dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
+  dxSkinSpringTime, dxSkinsDefaultPainters, dxSkinscxPCPainter,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink;

 type
  TfrmMLSC = class(TForm)
@ -134,7 +134,7 @@ var
 implementation

 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_SCPerson, U_PBGYSInPutMain, U_MLLR,U_SCDMX;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_SCPerson, U_PBGYSInPutMain, U_MLLR, U_SCDMX;

 {$R *.dfm}

--- a/云翔生产管理(MYSC.dll)/U_PBCGRKList_RCDJ.pas
+++ b/云翔生产管理(MYSC.dll)/U_PBCGRKList_RCDJ.pas
@ -11,32 +11,20 @@ uses
  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
  cxDropDownEdit, cxPC, Buttons, cxTextEdit, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxSkinsCore,  
-     dxSkinDarkRoom, 
-    
-     
-     
-    
-    
-    
-    
-  dxSkinOffice2013White,   
-   dxSkinSharpPlus,  dxSkinSpringTime, 
-    dxSkinsDefaultPainters,
-     
-  dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
-  dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
-  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
-  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
-  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinDarkRoom,
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
-  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
-  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
-  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
-  dxSkinWhiteprint, dxSkinXmas2008Blue;
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver,
+  dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue;

 type
  TfrmPBCGRKList_RCDJ = class(TForm)
--- a/样品新云翔(YPGLBOM.dll)/ProjectGroup1.bpg
+++ b/样品新云翔(YPGLBOM.dll)/ProjectGroup1.bpg
@ -9,7 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = testDll.exe ProductPrice.dll
+PROJECTS = testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@ -17,7 +17,4 @@ default: $(PROJECTS)
 testDll.exe: testDll.dpr
  $(DCC)

-ProductPrice.dll: ProductPrice.dpr
-  $(DCC)
-

--- a/样品新云翔(YPGLBOM.dll)/U_CPAdd.dfm
+++ b/样品新云翔(YPGLBOM.dll)/U_CPAdd.dfm
@ -8,7 +8,7 @@ object frmCPAdd: TfrmCPAdd
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
@ -16,15 +16,15 @@ object frmCPAdd: TfrmCPAdd
  WindowState = wsMaximized
  OnDestroy = FormDestroy
  OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1392
+    Width = 1400
    Height = 27
    ButtonHeight = 30
-    ButtonWidth = 61
+    ButtonWidth = 59
    Caption = 'ToolBar1'
    Color = clSkyBlue
    DisabledImages = DataLink_YPGLBOM.ThreeImgList
@ -43,7 +43,7 @@ object frmCPAdd: TfrmCPAdd
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 65
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -54,12 +54,12 @@ object frmCPAdd: TfrmCPAdd
  object cxGrid1: TcxGrid
    Left = 0
    Top = 27
-    Width = 1392
-    Height = 82
+    Width = 1400
+    Height = 76
    Align = alTop
    TabOrder = 1
    object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -343,14 +343,14 @@ object frmCPAdd: TfrmCPAdd
    end
  end
  object cxGrid5: TcxGrid
-    Left = 21
-    Top = 848
-    Width = 1383
-    Height = 15
+    Left = 19
+    Top = 783
+    Width = 1277
+    Height = 14
    TabOrder = 2
    Visible = False
    object tv5: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource5
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -475,9 +475,9 @@ object frmCPAdd: TfrmCPAdd
  end
  object Panel8: TPanel
    Left = 0
-    Top = 239
-    Width = 1392
-    Height = 349
+    Top = 223
+    Width = 1400
+    Height = 322
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -485,19 +485,19 @@ object frmCPAdd: TfrmCPAdd
    object Panel1: TPanel
      Left = 2
      Top = 2
-      Width = 1052
-      Height = 345
+      Width = 1085
+      Height = 318
      Align = alClient
      TabOrder = 0
      object cxGrid2: TcxGrid
        Left = 1
-        Top = 52
-        Width = 1050
-        Height = 92
+        Top = 50
+        Width = 1083
+        Height = 85
        Align = alTop
        TabOrder = 0
        object Tv2: TcxGridDBTableView
-          NavigatorButtons.ConfirmDelete = False
+          Navigator.Buttons.CustomButtons = <>
          DataController.DataSource = DataSource3
          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
          DataController.Summary.DefaultGroupSummaryItems = <>
@ -687,8 +687,8 @@ object frmCPAdd: TfrmCPAdd
      end
      object ToolBar2: TToolBar
        Left = 1
-        Top = 22
-        Width = 1050
+        Top = 20
+        Width = 1083
        Height = 30
        AutoSize = True
        ButtonHeight = 30
@ -771,13 +771,13 @@ object frmCPAdd: TfrmCPAdd
      end
      object cxGrid3: TcxGrid
        Left = 1
-        Top = 179
-        Width = 1050
-        Height = 165
+        Top = 170
+        Width = 1083
+        Height = 147
        Align = alClient
        TabOrder = 2
        object Tv3: TcxGridDBTableView
-          NavigatorButtons.ConfirmDelete = False
+          Navigator.Buttons.CustomButtons = <>
          DataController.DataSource = DataSource4
          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
          DataController.Summary.DefaultGroupSummaryItems = <>
@ -962,8 +962,8 @@ object frmCPAdd: TfrmCPAdd
      end
      object ToolBar4: TToolBar
        Left = 1
-        Top = 152
-        Width = 1050
+        Top = 143
+        Width = 1083
        Height = 27
        ButtonHeight = 30
        ButtonWidth = 59
@ -1012,19 +1012,20 @@ object frmCPAdd: TfrmCPAdd
      object cxTabControl1: TcxTabControl
        Left = 1
        Top = 1
-        Width = 1050
-        Height = 21
+        Width = 1083
+        Height = 19
        Align = alTop
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
-        Font.Height = -13
+        Font.Height = -12
        Font.Name = #23435#20307
        Font.Style = []
        ParentFont = False
-        Style = 9
-        TabIndex = 0
        TabOrder = 4
-        Tabs.Strings = (
+        Properties.CustomButtons.Buttons = <>
+        Properties.Style = 9
+        Properties.TabIndex = 0
+        Properties.Tabs.Strings = (
          #31532#19968#23618
          #31532#20108#23618
          #31532#19977#23618
@ -1035,14 +1036,13 @@ object frmCPAdd: TfrmCPAdd
          #31532#20843#23618)
        OnChange = cxTabControl1Change
        OnChanging = cxTabControl1Changing
-        ClientRectBottom = 21
-        ClientRectRight = 1050
-        ClientRectTop = 20
+        ClientRectRight = 0
+        ClientRectTop = 0
      end
      object cxSplitter3: TcxSplitter
        Left = 1
-        Top = 144
-        Width = 1050
+        Top = 135
+        Width = 1083
        Height = 8
        HotZoneClassName = 'TcxMediaPlayer9Style'
        AlignSplitter = salTop
@ -1050,14 +1050,14 @@ object frmCPAdd: TfrmCPAdd
      end
    end
    object cxGrid7: TcxGrid
-      Left = 1062
+      Left = 1095
      Top = 2
-      Width = 328
-      Height = 345
+      Width = 303
+      Height = 318
      Align = alRight
      TabOrder = 1
      object TV11: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        DataController.DataSource = DataSource16
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -1124,10 +1124,10 @@ object frmCPAdd: TfrmCPAdd
      end
    end
    object cxSplitter5: TcxSplitter
-      Left = 1054
+      Left = 1087
      Top = 2
      Width = 8
-      Height = 345
+      Height = 318
      HotZoneClassName = 'TcxMediaPlayer9Style'
      AlignSplitter = salRight
      Control = cxGrid7
@ -1135,9 +1135,9 @@ object frmCPAdd: TfrmCPAdd
  end
  object Panel2: TPanel
    Left = 0
-    Top = 596
-    Width = 1392
-    Height = 144
+    Top = 553
+    Width = 1400
+    Height = 196
    Align = alClient
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -1145,13 +1145,13 @@ object frmCPAdd: TfrmCPAdd
    object cxGrid4: TcxGrid
      Left = 2
      Top = 32
-      Width = 715
-      Height = 110
+      Width = 660
+      Height = 162
      Align = alLeft
      PopupMenu = PopupMenu1
      TabOrder = 0
      object Tv4: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        OnFocusedRecordChanged = Tv4FocusedRecordChanged
        DataController.DataSource = DataSource1
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -1243,7 +1243,7 @@ object frmCPAdd: TfrmCPAdd
    object ToolBar3: TToolBar
      Left = 2
      Top = 2
-      Width = 1388
+      Width = 1396
      Height = 30
      AutoSize = True
      ButtonHeight = 30
@ -1386,18 +1386,18 @@ object frmCPAdd: TfrmCPAdd
      end
    end
    object GroupBox1: TGroupBox
-      Left = 717
+      Left = 662
      Top = 32
-      Width = 673
-      Height = 110
+      Width = 736
+      Height = 162
      Align = alClient
      Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289
      TabOrder = 2
      object ScrollBox1: TScrollBox
        Left = 2
-        Top = 15
-        Width = 669
-        Height = 93
+        Top = 14
+        Width = 732
+        Height = 146
        Align = alClient
        BevelInner = bvLowered
        BorderStyle = bsNone
@ -1407,8 +1407,8 @@ object frmCPAdd: TfrmCPAdd
  end
  object cxSplitter1: TcxSplitter
    Left = 0
-    Top = 231
-    Width = 1392
+    Top = 103
+    Width = 1400
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salTop
@ -1416,8 +1416,8 @@ object frmCPAdd: TfrmCPAdd
  end
  object cxSplitter4: TcxSplitter
    Left = 0
-    Top = 588
-    Width = 1392
+    Top = 545
+    Width = 1400
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salTop
@ -1425,13 +1425,13 @@ object frmCPAdd: TfrmCPAdd
  end
  object cxGrid6: TcxGrid
    Left = 0
-    Top = 109
-    Width = 1392
-    Height = 63
+    Top = 111
+    Width = 1400
+    Height = 58
    Align = alTop
    TabOrder = 7
    object TV6: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -1558,13 +1558,13 @@ object frmCPAdd: TfrmCPAdd
  end
  object cxGrid8: TcxGrid
    Left = 0
-    Top = 172
-    Width = 1392
-    Height = 59
+    Top = 169
+    Width = 1400
+    Height = 54
    Align = alTop
    TabOrder = 8
    object TV7: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
--- a/样品新云翔(YPGLBOM.dll)/U_CPAdd.pas
+++ b/样品新云翔(YPGLBOM.dll)/U_CPAdd.pas
--- a/样品新云翔(YPGLBOM.dll)/U_CPAdd_ZLR.dfm
+++ b/样品新云翔(YPGLBOM.dll)/U_CPAdd_ZLR.dfm
@ -8,7 +8,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
@ -16,15 +16,15 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  WindowState = wsMaximized
  OnDestroy = FormDestroy
  OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1381
+    Width = 1389
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 61
+    ButtonWidth = 59
    Caption = 'ToolBar1'
    Color = clSkyBlue
    DisabledImages = DataLink_YPGLBOM.ThreeImgList
@ -43,7 +43,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 65
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -51,7 +51,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
      OnClick = TBCloseClick
    end
    object Panel5: TPanel
-      Left = 130
+      Left = 126
      Top = 0
      Width = 209
      Height = 30
@ -76,7 +76,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
        Left = 118
        Top = 4
        Width = 86
-        Height = 21
+        Height = 20
        TabOrder = 0
      end
    end
@ -84,12 +84,12 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  object cxGrid1: TcxGrid
    Left = 0
    Top = 32
-    Width = 1381
-    Height = 105
+    Width = 1389
+    Height = 96
    Align = alTop
    TabOrder = 1
    object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -297,14 +297,14 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    end
  end
  object cxGrid5: TcxGrid
-    Left = 21
-    Top = 848
-    Width = 1383
-    Height = 15
+    Left = 19
+    Top = 783
+    Width = 1277
+    Height = 14
    TabOrder = 2
    Visible = False
    object tv5: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource5
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -429,8 +429,8 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  end
  object cxSplitter4: TcxSplitter
    Left = 0
-    Top = 137
-    Width = 1381
+    Top = 128
+    Width = 1389
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salTop
@ -438,9 +438,9 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  end
  object Panel2: TPanel
    Left = 0
-    Top = 467
-    Width = 929
-    Height = 205
+    Top = 434
+    Width = 858
+    Height = 247
    Align = alLeft
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -448,13 +448,13 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    object cxGrid4: TcxGrid
      Left = 2
      Top = 32
-      Width = 514
-      Height = 171
+      Width = 474
+      Height = 213
      Align = alLeft
      PopupMenu = PopupMenu1
      TabOrder = 0
      object Tv4: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        OnCanFocusRecord = Tv4CanFocusRecord
        OnCellClick = Tv4CellClick
        OnFocusedRecordChanged = Tv4FocusedRecordChanged
@ -580,7 +580,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    object ToolBar3: TToolBar
      Left = 2
      Top = 2
-      Width = 925
+      Width = 854
      Height = 30
      AutoSize = True
      ButtonHeight = 30
@ -719,18 +719,18 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
      end
    end
    object GroupBox1: TGroupBox
-      Left = 516
+      Left = 476
      Top = 32
-      Width = 411
-      Height = 171
+      Width = 380
+      Height = 213
      Align = alClient
      Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289
      TabOrder = 2
      object ScrollBox1: TScrollBox
        Left = 2
-        Top = 15
-        Width = 407
-        Height = 154
+        Top = 14
+        Width = 376
+        Height = 197
        Align = alClient
        BevelInner = bvLowered
        BorderStyle = bsNone
@ -740,20 +740,20 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  end
  object Panel1: TPanel
    Left = 0
-    Top = 145
-    Width = 1381
-    Height = 314
+    Top = 136
+    Width = 1389
+    Height = 290
    Align = alTop
    TabOrder = 5
    object cxGrid2: TcxGrid
      Left = 1
      Top = 31
-      Width = 1379
-      Height = 97
+      Width = 1387
+      Height = 89
      Align = alTop
      TabOrder = 0
      object Tv2: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        DataController.DataSource = DataSource3
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -944,7 +944,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    object ToolBar2: TToolBar
      Left = 1
      Top = 1
-      Width = 1379
+      Width = 1387
      Height = 30
      AutoSize = True
      ButtonHeight = 30
@ -992,13 +992,13 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    end
    object cxGrid3: TcxGrid
      Left = 1
-      Top = 165
-      Width = 1379
-      Height = 148
+      Top = 157
+      Width = 1387
+      Height = 132
      Align = alClient
      TabOrder = 2
      object Tv3: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        DataController.DataSource = DataSource4
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -1183,8 +1183,8 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    end
    object ToolBar4: TToolBar
      Left = 1
-      Top = 136
-      Width = 1379
+      Top = 128
+      Width = 1387
      Height = 29
      ButtonHeight = 30
      ButtonWidth = 59
@ -1232,8 +1232,8 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    end
    object cxSplitter3: TcxSplitter
      Left = 1
-      Top = 128
-      Width = 1379
+      Top = 120
+      Width = 1387
      Height = 8
      HotZoneClassName = 'TcxMediaPlayer9Style'
      AlignSplitter = salTop
@ -1242,18 +1242,18 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
  end
  object cxSplitter1: TcxSplitter
    Left = 0
-    Top = 459
-    Width = 1381
+    Top = 426
+    Width = 1389
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salTop
    Control = Panel1
  end
  object Panel3: TPanel
-    Left = 937
-    Top = 467
-    Width = 444
-    Height = 205
+    Left = 866
+    Top = 434
+    Width = 523
+    Height = 247
    Align = alClient
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -1261,7 +1261,7 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    object ToolBar5: TToolBar
      Left = 2
      Top = 2
-      Width = 440
+      Width = 519
      Height = 25
      ButtonHeight = 30
      ButtonWidth = 59
@ -1309,12 +1309,12 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    object cxGrid6: TcxGrid
      Left = 2
      Top = 27
-      Width = 440
-      Height = 176
+      Width = 519
+      Height = 218
      Align = alClient
      TabOrder = 1
      object TV6: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
        DataController.DataSource = DataSource7
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
        DataController.Summary.DefaultGroupSummaryItems = <
@ -1400,10 +1400,10 @@ object frmCPAdd_ZLR: TfrmCPAdd_ZLR
    end
  end
  object cxSplitter2: TcxSplitter
-    Left = 929
-    Top = 467
+    Left = 858
+    Top = 434
    Width = 8
-    Height = 205
+    Height = 247
    HotZoneClassName = 'TcxMediaPlayer9Style'
    Control = Panel2
  end
--- a/样品新云翔(YPGLBOM.dll)/U_CPAdd_ZLR.pas
+++ b/样品新云翔(YPGLBOM.dll)/U_CPAdd_ZLR.pas
--- a/样品新云翔(YPGLBOM.dll)/U_DataLink.pas
+++ b/样品新云翔(YPGLBOM.dll)/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;  {数据库连接参数}
--- a/样品新云翔(YPGLBOM.dll)/U_FileUp.dfm
+++ b/样品新云翔(YPGLBOM.dll)/U_FileUp.dfm
@ -7,23 +7,23 @@ object frmFileUp: TfrmFileUp
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
  OnCreate = FormCreate
  OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
  object cxGrid7: TcxGrid
    Left = 0
-    Top = 44
-    Width = 553
-    Height = 363
+    Top = 41
+    Width = 563
+    Height = 375
    Align = alClient
    TabOrder = 0
    object TV7: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource1
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <>
@ -56,10 +56,10 @@ object frmFileUp: TfrmFileUp
    end
  end
  object Panel16: TPanel
-    Left = 206
-    Top = 137
-    Width = 149
-    Height = 32
+    Left = 190
+    Top = 126
+    Width = 138
+    Height = 30
    BevelInner = bvRaised
    Caption = #27491#22312#19978#20256#12290#12290#12290
    Color = clSkyBlue
@ -67,14 +67,14 @@ object frmFileUp: TfrmFileUp
    Visible = False
  end
  object ToolBar6: TToolBar
-    Left = 553
-    Top = 44
-    Width = 65
-    Height = 363
+    Left = 563
+    Top = 41
+    Width = 63
+    Height = 375
    Align = alRight
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 61
+    ButtonWidth = 59
    Caption = 'ToolBar1'
    Flat = True
    Images = DataLink_YPGLBOM.ThreeImgList
@ -111,39 +111,39 @@ object frmFileUp: TfrmFileUp
  object Panel1: TPanel
    Left = 0
    Top = 0
-    Width = 618
-    Height = 44
+    Width = 626
+    Height = 41
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    TabOrder = 3
    object Label1: TLabel
-      Left = 9
-      Top = 15
-      Width = 76
-      Height = 18
+      Left = 8
+      Top = 14
+      Width = 72
+      Height = 17
      Caption = #20135#21697#32534#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
-      Font.Height = -18
+      Font.Height = -17
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Image2: TImage
-      Left = 624
-      Top = 16
-      Width = 25
-      Height = 18
+      Left = 576
+      Top = 15
+      Width = 23
+      Height = 16
    end
    object Code: TEdit
-      Left = 85
-      Top = 10
-      Width = 228
+      Left = 78
+      Top = 9
+      Width = 211
      Height = 26
      Font.Charset = GB2312_CHARSET
      Font.Color = clBlue
-      Font.Height = -18
+      Font.Height = -17
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
--- a/样品新云翔(YPGLBOM.dll)/U_FileUp.pas
+++ b/样品新云翔(YPGLBOM.dll)/U_FileUp.pas
@ -9,7 +9,22 @@ uses
  cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
  cxClasses, cxControls, cxGridCustomView, cxGrid, IdBaseComponent,
  IdComponent, IdTCPConnection, IdTCPClient, IdFTP, StdCtrls, ADODB,jpeg,
-  BtnEdit,IniFiles;
+  BtnEdit,IniFiles, cxLookAndFeels, cxLookAndFeelPainters, 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,
+  cxNavigator;

 type
  TfrmFileUp = class(TForm)
--- a/样品新云翔(YPGLBOM.dll)/U_GetDllForm.pas
+++ b/样品新云翔(YPGLBOM.dll)/U_GetDllForm.pas
@ -13,7 +13,7 @@ function ConnData(): Boolean;
 implementation

 uses
-  U_DataLink, U_iniParam, U_MLMange, U_CPType_TP, U_CPManage_TP, U_SLT_BF1,
+  U_DataLink, U_MLMange, U_CPType_TP, U_CPManage_TP, U_SLT_BF1,
  U_BPZdy_LRSHK_BF, U_MLMangeRS, U_ZdyAttachGYSX, U_BPZdy_LRGX, U_BPZdy_LRPB,
  U_BPZdy_LRSHK, U_MLMangeRS_SMCX, U_BPZdy_TJHXK, U_CPType_TJTP,
  U_ZdyAttachmentX, U_ZdyAttachGYSX_WL, U_ZdyAttachGYSX_FL, U_ZdyAttachGYSX_RC,
--- a/样品新云翔(YPGLBOM.dll)/U_ZdyAttachCP_HX_sel.dfm
+++ b/样品新云翔(YPGLBOM.dll)/U_ZdyAttachCP_HX_sel.dfm
@ -7,34 +7,34 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
  OnClose = FormClose
  OnDestroy = FormDestroy
  OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
  object Label2: TLabel
-    Left = 733
-    Top = 14
-    Width = 39
-    Height = 13
+    Left = 677
+    Top = 13
+    Width = 36
+    Height = 12
    Caption = #19994#21153#21592
  end
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1139
+    Width = 1147
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 61
+    ButtonWidth = 59
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_YPGL.ThreeImgList
+    DisabledImages = DataLink_YPGLBOM.ThreeImgList
    Flat = True
-    Images = DataLink_YPGL.ThreeImgList
+    Images = DataLink_YPGLBOM.ThreeImgList
    List = True
    ParentColor = False
    ShowCaptions = True
@ -48,7 +48,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OnClick = TSselClick
    end
    object TBRafresh: TToolButton
-      Left = 65
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #21047#26032
@ -56,7 +56,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
-      Left = 130
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -64,7 +64,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OnClick = ToolButton2Click
    end
    object TFJ: TToolButton
-      Left = 195
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #38468#20214
@ -72,7 +72,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OnClick = TFJClick
    end
    object ToolButton1: TToolButton
-      Left = 260
+      Left = 252
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -80,7 +80,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 325
+      Left = 315
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -91,94 +91,94 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1139
-    Height = 62
+    Width = 1147
+    Height = 57
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 1
    object Label3: TLabel
-      Left = 216
-      Top = 13
-      Width = 52
-      Height = 13
+      Left = 199
+      Top = 12
+      Width = 48
+      Height = 12
      Caption = #33457#22411#21517#31216
    end
    object Label4: TLabel
-      Left = 394
-      Top = 13
-      Width = 52
-      Height = 13
+      Left = 364
+      Top = 12
+      Width = 48
+      Height = 12
      Caption = #33457#22411#25551#36848
    end
    object Label5: TLabel
-      Left = 575
-      Top = 13
-      Width = 26
-      Height = 13
+      Left = 531
+      Top = 12
+      Width = 24
+      Height = 12
      Caption = #23458#25143
    end
    object Label6: TLabel
-      Left = 35
-      Top = 13
-      Width = 52
-      Height = 13
+      Left = 32
+      Top = 12
+      Width = 48
+      Height = 12
      Caption = #33457#22411#32534#21495
    end
    object Label1: TLabel
-      Left = 394
-      Top = 36
-      Width = 53
-      Height = 13
+      Left = 364
+      Top = 33
+      Width = 48
+      Height = 12
      Caption = #19994' '#21153' '#21592
    end
    object Label7: TLabel
-      Left = 35
-      Top = 36
-      Width = 54
-      Height = 13
+      Left = 32
+      Top = 33
+      Width = 48
+      Height = 12
      Caption = #22836'    '#36317
    end
    object Label8: TLabel
-      Left = 216
-      Top = 36
-      Width = 54
-      Height = 13
+      Left = 199
+      Top = 33
+      Width = 48
+      Height = 12
      Caption = #20135'    '#37327
    end
    object ZdyName: TEdit
      Tag = 2
-      Left = 269
-      Top = 9
-      Width = 108
+      Left = 248
+      Top = 8
+      Width = 100
      Height = 21
      TabOrder = 0
      OnChange = ZdyNameChange
    end
    object defNote1: TEdit
      Tag = 2
-      Left = 448
-      Top = 9
-      Width = 108
+      Left = 414
+      Top = 8
+      Width = 99
      Height = 21
      TabOrder = 1
      OnChange = ZdyNameChange
    end
    object defnote2: TEdit
      Tag = 2
-      Left = 603
-      Top = 9
-      Width = 108
+      Left = 557
+      Top = 8
+      Width = 99
      Height = 21
      TabOrder = 2
      OnChange = ZdyNameChange
    end
    object zdyCode: TEdit
      Tag = 2
-      Left = 90
-      Top = 9
-      Width = 108
+      Left = 83
+      Top = 8
+      Width = 100
      Height = 21
      TabOrder = 3
      OnChange = ZdyNameChange
@ -186,27 +186,27 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
    end
    object defstr3: TEdit
      Tag = 2
-      Left = 448
-      Top = 32
-      Width = 108
+      Left = 414
+      Top = 30
+      Width = 99
      Height = 21
      TabOrder = 4
      OnChange = ZdyNameChange
    end
    object defstr2: TEdit
      Tag = 2
-      Left = 90
-      Top = 32
-      Width = 108
+      Left = 83
+      Top = 30
+      Width = 100
      Height = 21
      TabOrder = 5
      OnChange = ZdyNameChange
    end
    object defstr1: TEdit
      Tag = 2
-      Left = 269
-      Top = 32
-      Width = 108
+      Left = 248
+      Top = 30
+      Width = 100
      Height = 21
      TabOrder = 6
      OnChange = ZdyNameChange
@ -214,16 +214,16 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  end
  object cxGrid2: TcxGrid
    Left = 0
-    Top = 94
-    Width = 1139
-    Height = 518
+    Top = 89
+    Width = 1147
+    Height = 532
    Align = alClient
    TabOrder = 2
    object Tv2: TcxGridDBTableView
      OnDblClick = Tv2DblClick
-      NavigatorButtons.ConfirmDelete = False
-      NavigatorButtons.Delete.Enabled = False
-      NavigatorButtons.Delete.Visible = False
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
      DataController.DataSource = DS_HZ
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
@ -244,10 +244,10 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      OptionsView.Indicator = True
-      Styles.Inactive = DataLink_YPGL.SHuangSe
-      Styles.IncSearch = DataLink_YPGL.SHuangSe
-      Styles.Selection = DataLink_YPGL.SHuangSe
-      Styles.Header = DataLink_YPGL.handBlack
+      Styles.Inactive = DataLink_YPGLBOM.SHuangSe
+      Styles.IncSearch = DataLink_YPGLBOM.SHuangSe
+      Styles.Selection = DataLink_YPGLBOM.SHuangSe
+      Styles.Header = DataLink_YPGLBOM.handBlack
      object v2Column2: TcxGridDBColumn
        Caption = #33457#22411#32534#21495
        DataBinding.FieldName = 'zdyCode'
@ -332,20 +332,20 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
    end
  end
  object ADOQueryTemp: TADOQuery
-    Connection = DataLink_YPGL.ADOLink
+    Connection = DataLink_YPGLBOM.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 789
    Top = 9
  end
  object ADOQueryCmd: TADOQuery
-    Connection = DataLink_YPGL.ADOLink
+    Connection = DataLink_YPGLBOM.ADOLink
    Parameters = <>
    Left = 829
    Top = 1
  end
  object ADOQueryMain: TADOQuery
-    Connection = DataLink_YPGL.ADOLink
+    Connection = DataLink_YPGLBOM.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 989
--- a/样品新云翔(YPGLBOM.dll)/U_ZdyAttachCP_HX_sel.pas
+++ b/样品新云翔(YPGLBOM.dll)/U_ZdyAttachCP_HX_sel.pas
@ -12,7 +12,22 @@ uses
  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar,
-  cxButtonEdit, cxTextEdit, Menus, cxLookAndFeelPainters, cxButtons;
+  cxButtonEdit, cxTextEdit, Menus, cxLookAndFeelPainters, cxButtons,
+  cxLookAndFeels, 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,
+  cxNavigator;

 type

--- a/样品新云翔(YPGLBOM.dll)/YPGLBOM.dpr
+++ b/样品新云翔(YPGLBOM.dll)/YPGLBOM.dpr
@ -50,7 +50,7 @@ uses
  U_GYSListSel in 'U_GYSListSel.pas' {frmGYSListSel},
  U_SLT_Note in 'U_SLT_Note.pas' {frmSLT_Note},
  U_ZDYHelp in '..\Z99Dependency\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
-  U_RTFun in '..\..\..\RTFunAndForm\Fun\U_RTFun.pas',
+  U_RTFun in '..\Z99Dependency\RTFunAndForm\Fun\U_RTFun.pas',
  U_MLMangeRSSel in '..\生产计划单(DyeingFinishingPlan.dll)\U_MLMangeRSSel.pas' {frmMLMangeRS};

 // U_SelfForm in '..\..\SelfForm\U_SelfForm.pas',
--- a/生产计划单(DyeingFinishingPlan.dll)/ProjectGroup1.bpg
+++ b/生产计划单(DyeingFinishingPlan.dll)/ProjectGroup1.bpg
@ -9,7 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = testDll.exe ProductPrice.dll
+PROJECTS = testDll.exe DyeingFinishingPlan.dll
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@ -17,7 +17,7 @@ default: $(PROJECTS)
 testDll.exe: testDll.dpr
  $(DCC)

-ProductPrice.dll: ProductPrice.dpr
+DyeingFinishingPlan.dll: DyeingFinishingPlan.dpr
  $(DCC)


--- a/生产计划单(DyeingFinishingPlan.dll)/U_GetDllForm.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_GetDllForm.pas
@ -73,7 +73,7 @@ begin
 //  DConString := DataBaseStr;
  if trim(DataBaseStr) <> '' then
    DConString := DataBaseStr;
-//   DParameters1 := '高权限';
+   DParameters1 := '高权限';
 //  DParameters3:='1';


--- a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm
@ -3988,8 +3988,8 @@ object frmMJJYTH: TfrmMJJYTH
    end
  end
  object cxStyleRepository1: TcxStyleRepository
-    Left = 731
-    Top = 246
+    Left = 468
+    Top = 412
    PixelsPerInch = 96
    object cxStyle1: TcxStyle
      AssignedValues = [svColor, svFont]
@ -4013,38 +4013,38 @@ object frmMJJYTH: TfrmMJJYTH
  end
  object cxGridPopupMenu1: TcxGridPopupMenu
    PopupMenus = <>
-    Left = 1241
-    Top = 433
+    Left = 672
+    Top = 344
  end
  object DataSource1: TDataSource
    DataSet = Order_MJ
-    Left = 923
-    Top = 388
+    Left = 468
+    Top = 480
  end
  object Order_MJ: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1257
-    Top = 501
+    Left = 604
+    Top = 344
  end
  object ADOQueryMain: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 1216
-    Top = 432
+    Left = 604
+    Top = 208
  end
  object ADOCmd: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 1063
-    Top = 307
+    Left = 468
+    Top = 208
  end
  object RMDB_Main: TRMDBDataSet
    Visible = True
    DataSet = ADOQueryPrint
-    Left = 775
-    Top = 248
+    Left = 536
+    Top = 548
  end
  object RM2: TRMGridReport
    ThreadPrepareReport = True
@ -4063,47 +4063,47 @@ object frmMJJYTH: TfrmMJJYTH
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
-    Left = 1154
-    Top = 494
+    Left = 604
+    Top = 548
    ReportData = {}
  end
  object DataSource2: TDataSource
    DataSet = CDS_MJCD
-    Left = 788
-    Top = 422
+    Left = 536
+    Top = 480
  end
  object CDS_MJCD: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 863
-    Top = 301
+    Left = 536
+    Top = 276
  end
  object DataSource3: TDataSource
    DataSet = Order_MJ
-    Left = 1187
-    Top = 476
+    Left = 604
+    Top = 480
  end
  object CDS_MJID: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1132
-    Top = 469
+    Left = 604
+    Top = 276
  end
  object Timer1: TTimer
    Interval = 100
-    Left = 1270
-    Top = 432
+    Left = 740
+    Top = 548
  end
  object ADOQueryPrint: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 917
-    Top = 362
+    Left = 740
+    Top = 208
  end
  object cxStyleRepository2: TcxStyleRepository
-    Left = 816
-    Top = 8
+    Left = 536
+    Top = 412
    PixelsPerInch = 96
    object cxStyle3: TcxStyle
      AssignedValues = [svColor, svFont, svTextColor]
@ -4117,8 +4117,8 @@ object frmMJJYTH: TfrmMJJYTH
    end
  end
  object cxStyleRepository3: TcxStyleRepository
-    Left = 856
-    Top = 65528
+    Left = 604
+    Top = 412
    PixelsPerInch = 96
    object cxStyle4: TcxStyle
      AssignedValues = [svColor, svFont, svTextColor]
@ -4132,7 +4132,8 @@ object frmMJJYTH: TfrmMJJYTH
    end
  end
  object cxStyleRepository4: TcxStyleRepository
-    Left = 824
+    Left = 672
+    Top = 412
    PixelsPerInch = 96
    object cxStyle5: TcxStyle
      AssignedValues = [svColor, svFont, svTextColor]
@ -4146,8 +4147,8 @@ object frmMJJYTH: TfrmMJJYTH
    end
  end
  object cxStyleRepository5: TcxStyleRepository
-    Left = 848
-    Top = 8
+    Left = 740
+    Top = 412
    PixelsPerInch = 96
    object cxStyle6: TcxStyle
      AssignedValues = [svFont]
@ -4160,8 +4161,8 @@ object frmMJJYTH: TfrmMJJYTH
  end
  object cxGridPopupMenu2: TcxGridPopupMenu
    PopupMenus = <>
-    Left = 1193
-    Top = 431
+    Left = 740
+    Top = 344
  end
  object ADOQueryMainDSC: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
@ -4187,8 +4188,8 @@ object frmMJJYTH: TfrmMJJYTH
        ' '
      'and isnull(B.AnPaiChkStatus,'#39#39')='#39#23457#26680#36890#36807#39'  and A.SCXDFlag=1'
      '')
-    Left = 1112
-    Top = 460
+    Left = 672
+    Top = 208
  end
  object RM3: TRMGridReport
    ThreadPrepareReport = True
@ -4206,59 +4207,59 @@ object frmMJJYTH: TfrmMJJYTH
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
-    Left = 1163
-    Top = 431
+    Left = 672
+    Top = 548
    ReportData = {}
  end
  object ADOTmp: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 1090
-    Top = 388
+    Left = 468
+    Top = 276
  end
  object ADOQuery1: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 891
-    Top = 301
+    Left = 536
+    Top = 208
  end
  object DataSource4: TDataSource
    DataSet = JY_CP
-    Left = 1137
-    Top = 94
+    Left = 672
+    Top = 480
  end
  object DataSource5: TDataSource
    DataSet = JY_HZ
-    Left = 827
-    Top = 382
+    Left = 740
+    Top = 480
  end
  object JY_CP: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1172
-    Top = 93
+    Left = 468
+    Top = 344
  end
  object JY_HZ: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 916
-    Top = 302
+    Left = 536
+    Top = 344
  end
  object DataSource6: TDataSource
    DataSet = DB_HZ
-    Left = 1129
-    Top = 164
+    Left = 468
+    Top = 548
  end
  object DB_HZ: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1164
-    Top = 163
+    Left = 740
+    Top = 276
  end
  object ClientDataSet1: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 820
-    Top = 362
+    Left = 672
+    Top = 276
  end
 end
--- a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas
@ -10,21 +10,21 @@ uses
  cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
  RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
  ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
-  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore,    
-   dxSkinDarkRoom,  
-    
-     
-    
-    
-    
-    
-   
-   dxSkinOffice2013White, 
-     dxSkinSharpPlus,
-   dxSkinSpringTime,  
-   dxSkinsDefaultPainters, 
-     dxSkinscxPCPainter;
+  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
+  dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;

 type
  TfrmMJJYTH = class(TForm)
@ -2836,12 +2836,12 @@ begin
    SQL.Clear;
    sql.Add('select MJLEN=' + JYLen.Text);    
 //    sql.Add(',JYKG=' + JYKG.Text);
-    sql.Add(',JYKG=isnull(''' + JYKG.Text+''','''')');
+    sql.Add(',JYKG=isnull(''' + JYKG.Text + ''','''')');
 //    sql.Add(',JYJZ=' + JYJZ.Text);
-    sql.Add(',JYJZ=isnull(''' + JYJZ.Text+''','''')');
-    sql.Add(',JYMF=isnull(''' + JYMF.Text+''','''')');
-    sql.Add(',JYKZ=isnull(''' + JYKZ.Text+''','''')');
-    sql.Add(',JYGH=isnull(''' + JYGH.Text+''','''')');
+    sql.Add(',JYJZ=isnull(''' + JYJZ.Text + ''','''')');
+    sql.Add(',JYMF=isnull(''' + JYMF.Text + ''','''')');
+    sql.Add(',JYKZ=isnull(''' + JYKZ.Text + ''','''')');
+    sql.Add(',JYGH=isnull(''' + JYGH.Text + ''','''')');
 //    ShowMessage(sql.text);
    Open;
  end;
--- a/生产计划单(DyeingFinishingPlan.dll)/U_OrderHCList.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_OrderHCList.dfm
@ -1,6 +1,6 @@
 object frmOrderHCList: TfrmOrderHCList
-  Left = 208
-  Top = 119
+  Left = 450
+  Top = 375
  Width = 1556
  Height = 834
  Caption = #26816#39564#20449#24687#31649#29702
@ -17,10 +17,75 @@ object frmOrderHCList: TfrmOrderHCList
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 12
+  object cxGrid2: TcxGrid
+    Left = 0
+    Top = 92
+    Width = 185
+    Height = 711
+    Align = alLeft
+    TabOrder = 5
+    object TV2: TcxGridDBTableView
+      OnDblClick = TV2DblClick
+      Navigator.Buttons.CustomButtons = <>
+      DataController.DataSource = DS_2
+      DataController.Filter.AutoDataSetFilter = True
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      Styles.Content = DataLink_DyeingFinishingPlan.Default
+      Styles.Inactive = DataLink_DyeingFinishingPlan.SHuangSe
+      Styles.IncSearch = DataLink_DyeingFinishingPlan.SHuangSe
+      Styles.Selection = DataLink_DyeingFinishingPlan.SHuangSe
+      Styles.Header = DataLink_DyeingFinishingPlan.Default
+      object cxGridDBColumn1: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'Name'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 145
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = TV2
+    end
+  end
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1540
+    Width = 1548
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 115
@ -99,7 +164,7 @@ object frmOrderHCList: TfrmOrderHCList
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1540
+    Width = 1548
    Height = 60
    Align = alTop
    BevelInner = bvRaised
@ -381,10 +446,10 @@ object frmOrderHCList: TfrmOrderHCList
    end
  end
  object cxGrid1: TcxGrid
-    Left = 0
+    Left = 185
    Top = 92
-    Width = 1540
-    Height = 703
+    Width = 1363
+    Height = 711
    Align = alClient
    TabOrder = 2
    object Tv1: TcxGridDBTableView
@ -714,33 +779,33 @@ object frmOrderHCList: TfrmOrderHCList
  object cxGridPopupMenu1: TcxGridPopupMenu
    Grid = cxGrid1
    PopupMenus = <>
-    Left = 561
-    Top = 201
+    Left = 692
+    Top = 387
  end
  object ADOQueryMain: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 496
-    Top = 200
+    Left = 692
+    Top = 319
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 528
-    Top = 200
+    Left = 760
+    Top = 319
  end
  object DataSource1: TDataSource
    DataSet = Order_Main
-    Left = 432
-    Top = 201
+    Left = 760
+    Top = 387
  end
  object Order_Main: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 402
-    Top = 200
+    Left = 624
+    Top = 387
  end
  object RM1: TRMGridReport
    ThreadPrepareReport = True
@ -758,15 +823,15 @@ object frmOrderHCList: TfrmOrderHCList
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
-    Left = 688
-    Top = 206
+    Left = 624
+    Top = 455
    ReportData = {}
  end
  object RMDB_Main: TRMDBDataSet
    Visible = True
    DataSet = CDS_PRT
-    Left = 657
-    Top = 206
+    Left = 896
+    Top = 387
  end
  object RMXLSExport1: TRMXLSExport
    ShowAfterExport = True
@ -779,20 +844,38 @@ object frmOrderHCList: TfrmOrderHCList
    ScaleX = 1.000000000000000000
    ScaleY = 1.000000000000000000
    CompressFile = False
-    Left = 601
-    Top = 192
+    Left = 692
+    Top = 455
  end
  object CDS_PRT: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 737
-    Top = 215
+    Left = 896
+    Top = 319
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 516
-    Top = 304
+    Left = 624
+    Top = 319
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 828
+    Top = 387
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 828
+    Top = 319
+  end
+  object ADOQuery1: TADOQuery
+    Connection = DataLink_DyeingFinishingPlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 976
+    Top = 391
  end
 end
--- a/生产计划单(DyeingFinishingPlan.dll)/U_OrderHCList.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_OrderHCList.pas
@ -12,20 +12,20 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
  cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic,
  RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, cxPC, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxSkinsCore,  
-     dxSkinDarkRoom,
-    
-     
-     
-    
-    
-    
-    
-   dxSkinOffice2013White, 
-     dxSkinSharpPlus,
-   dxSkinSpringTime,  
-   dxSkinsDefaultPainters, 
-     dxSkinscxPCPainter;
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinDarkRoom,
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver,
+  dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue;

 type
  TfrmOrderHCList = class(TForm)
@ -98,6 +98,13 @@ type
    ADOQueryCmd: TADOQuery;
    Label1: TLabel;
    MLHX: TEdit;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    DS_2: TDataSource;
+    CDS_2: TClientDataSet;
+    ADOQuery1: TADOQuery;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -120,6 +127,7 @@ type
    procedure JYTypeChange(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure MDNameBtnClick(Sender: TObject);
+    procedure TV2DblClick(Sender: TObject);
  private
    DQdate: TDateTime;
    FLeft, FTop: Integer;
@ -127,6 +135,7 @@ type
    canshu1: string;
    procedure InitGrid();
    procedure InitForm();
+    procedure InitKH();
    { Private declarations }
  public
    FFInt: Integer;
@ -204,6 +213,9 @@ begin
    end;
    SCreateCDS20(ADOQueryMain, Order_Main);
    SInitCDSData20(ADOQueryMain, Order_Main);
+
+    InitKH();
+
    MovePanel2.Visible := false;
  finally
    ADOQueryMain.EnableControls;
@ -211,12 +223,34 @@ begin
  end;
 end;

+procedure TfrmOrderHCList.InitKH();
+var
+  fsj: string;
+begin
+  with ADOQuery1 do
+  begin
+    Filtered := False;
+    Close;
+    sql.Clear;
+    sql.add(' select DISTINCT KM.KHNameJC AS Name');
+    sql.Add(' from ML_OrderMainNew A ');
+    sql.Add(' left join KH_Main KM on KM.KHNO=A.KHNO ');
+    sql.Add(' where OrdDate>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
+    sql.Add(' and OrdDate<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)) + '''');
+//    ShowMessage(SQL.Text);
+    Open;
+  end;
+
+  SCreateCDS20(ADOQuery1, CDS_2);
+  SInitCDSData20(ADOQuery1, CDS_2);
+end;
+
 procedure TfrmOrderHCList.InitForm();
 var
  fsj: string;
 begin
  ReadCxGrid('¶©µ¥ºË²é±íYX1', Tv1, '¼ìÑé¹ÜÀí');
-  BegDate.DateTime := SGetServerDate10(ADOQueryTemp) - 1;
+  BegDate.DateTime := SGetServerDate10(ADOQueryTemp);
  EndDate.DateTime := SGetServerDate10(ADOQueryTemp);
 end;

@ -413,5 +447,11 @@ begin
  end;
 end;

+procedure TfrmOrderHCList.TV2DblClick(Sender: TObject);
+begin
+  KHNameJC.Text := CDS_2.fieldbyname('Name').AsString;
+  InitGrid();
+end;
+
 end.

--- a/生产计划单(DyeingFinishingPlan.dll)/U_OrderInPut_New.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_OrderInPut_New.dfm
@ -1,6 +1,6 @@
 object frmOrderInPut_New: TfrmOrderInPut_New
-  Left = 311
-  Top = 117
+  Left = 441
+  Top = 378
  Width = 1556
  Height = 822
  Align = alClient
@ -46,8 +46,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
  object Panel1: TPanel
    Left = 0
    Top = 0
-    Width = 1540
-    Height = 783
+    Width = 1548
+    Height = 791
    Align = alClient
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -55,7 +55,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
    object ScrollBox1: TScrollBox
      Left = 2
      Top = 28
-      Width = 1536
+      Width = 1544
      Height = 181
      Align = alTop
      BevelInner = bvNone
@ -545,7 +545,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
    object Panel2: TPanel
      Left = 2
      Top = 2
-      Width = 1536
+      Width = 1544
      Height = 26
      Align = alTop
      BevelInner = bvRaised
@ -596,8 +596,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
    object cxPageControl1: TcxPageControl
      Left = 2
      Top = 209
-      Width = 1536
-      Height = 572
+      Width = 1544
+      Height = 580
      Align = alClient
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
@ -606,11 +606,11 @@ object frmOrderInPut_New: TfrmOrderInPut_New
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 2
-      Properties.ActivePage = cxTabSheet2
+      Properties.ActivePage = cxTabSheet1
      Properties.CustomButtons.Buttons = <>
      Properties.Style = 8
-      ClientRectBottom = 572
-      ClientRectRight = 1536
+      ClientRectBottom = 580
+      ClientRectRight = 1544
      ClientRectTop = 31
      object cxTabSheet1: TcxTabSheet
        Caption = '     '#35746#21333#26126#32454#20449#24687'     '
@ -618,8 +618,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
        object cxGrid1: TcxGrid
          Left = 0
          Top = 0
-          Width = 1536
-          Height = 541
+          Width = 1544
+          Height = 549
          Align = alClient
          PopupMenu = PopupMenu1
          TabOrder = 0
@ -768,6 +768,12 @@ object frmOrderInPut_New: TfrmOrderInPut_New
              HeaderAlignmentHorz = taCenter
              Width = 135
            end
+            object Tv1Column7: TcxGridDBColumn
+              Caption = #33457#22411#25551#36848
+              DataBinding.FieldName = 'defNote1'
+              HeaderAlignmentHorz = taCenter
+              Width = 120
+            end
            object v1Column5: TcxGridDBColumn
              Caption = #27491#21453#38754
              DataBinding.FieldName = 'ZFM'
@ -953,8 +959,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
        object cxGrid3: TcxGrid
          Left = 0
          Top = 0
-          Width = 1536
-          Height = 541
+          Width = 1544
+          Height = 549
          Align = alClient
          PopupMenu = PopupMenu2
          TabOrder = 0
@ -1062,8 +1068,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
        object cxGrid2: TcxGrid
          Left = 0
          Top = 0
-          Width = 1536
-          Height = 541
+          Width = 1544
+          Height = 549
          Align = alClient
          PopupMenu = PopupMenu2
          TabOrder = 0
@ -1253,8 +1259,8 @@ object frmOrderInPut_New: TfrmOrderInPut_New
        object Panel4: TPanel
          Left = 0
          Top = 0
-          Width = 1536
-          Height = 541
+          Width = 1544
+          Height = 549
          Align = alClient
          BevelInner = bvRaised
          BevelOuter = bvLowered
@ -1459,7 +1465,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 74
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1473,7 +1479,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 128
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1487,7 +1493,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 182
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1501,7 +1507,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 236
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1515,7 +1521,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 290
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1529,7 +1535,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 131
            Top = 343
            Width = 231
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1543,7 +1549,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 602
            Top = 74
            Width = 263
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1557,7 +1563,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 602
            Top = 128
            Width = 263
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1571,7 +1577,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 602
            Top = 182
            Width = 263
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1585,7 +1591,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 602
            Top = 236
            Width = 263
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1599,7 +1605,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 602
            Top = 290
            Width = 263
-            Height = 33
+            Height = 28
            Font.Charset = GB2312_CHARSET
            Font.Color = clBlack
            Font.Height = -20
@ -1657,7 +1663,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 75
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1675,7 +1681,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 129
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1693,7 +1699,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 182
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1711,7 +1717,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 237
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1729,7 +1735,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 290
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1747,7 +1753,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 363
            Top = 344
            Width = 116
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1765,7 +1771,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 867
            Top = 75
            Width = 102
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1783,7 +1789,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 867
            Top = 129
            Width = 102
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1801,7 +1807,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 867
            Top = 182
            Width = 102
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1819,7 +1825,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 867
            Top = 237
            Width = 102
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
@ -1837,7 +1843,7 @@ object frmOrderInPut_New: TfrmOrderInPut_New
            Left = 867
            Top = 290
            Width = 102
-            Height = 35
+            Height = 31
            Ctl3D = True
            Font.Charset = ANSI_CHARSET
            Font.Color = clBlue
--- a/生产计划单(DyeingFinishingPlan.dll)/U_OrderInPut_New.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_OrderInPut_New.pas
@ -26,7 +26,19 @@ uses
   dxSkinSharpPlus,  dxSkinSpringTime, 
    dxSkinsDefaultPainters,
     
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
+  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
+  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;

 type
  TfrmOrderInPut_New = class(TForm)
@ -210,6 +222,7 @@ type
    ADOQuery5: TADOQuery;
    Label35: TLabel;
    YIDZ: TEdit;
+    Tv1Column7: TcxGridDBColumn;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -440,13 +453,6 @@ begin
        Application.MessageBox('取最大号失败!', '提示', 0);
        Exit;
      end;
-      {if GetLSNo(ADOCmd,forderNo,'','ML_OrderMainNew',3,1)=False then
-      begin
-        ADOCmd.Connection.RollbackTrans;
-        Application.MessageBox('取最大号失败!','提示',0);
-        Exit;
-      end;
-     MLorderNo.Text:=forderNo;}
    end
    else
    begin
--- a/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_BQNew.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_BQNew.dfm
@ -7,7 +7,7 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -15
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
@ -16,12 +16,12 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  OnCreate = FormCreate
  OnDestroy = FormDestroy
  OnShow = FormShow
-  PixelsPerInch = 120
-  TextHeight = 15
+  PixelsPerInch = 96
+  TextHeight = 12
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1383
+    Width = 1393
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 130
@ -108,132 +108,132 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1383
-    Height = 97
+    Width = 1393
+    Height = 77
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 1
    object Label1: TLabel
-      Left = 5
-      Top = 20
-      Width = 92
-      Height = 22
+      Left = 4
+      Top = 16
+      Width = 80
+      Height = 19
      Caption = #19979#21333#26085#26399
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label3: TLabel
-      Left = 567
-      Top = 52
-      Width = 69
-      Height = 22
+      Left = 454
+      Top = 42
+      Width = 60
+      Height = 19
      Caption = #25351#31034#21333
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label4: TLabel
-      Left = 267
-      Top = 19
-      Width = 94
-      Height = 22
+      Left = 214
+      Top = 15
+      Width = 84
+      Height = 19
      Caption = #23458'    '#25143
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label9: TLabel
-      Left = 567
-      Top = 20
-      Width = 69
-      Height = 22
+      Left = 454
+      Top = 16
+      Width = 60
+      Height = 19
      Caption = #21512#21516#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label12: TLabel
-      Left = 766
-      Top = 149
-      Width = 32
-      Height = 15
+      Left = 613
+      Top = 119
+      Width = 26
+      Height = 12
      Caption = #20811#37325
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -15
+      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label5: TLabel
-      Left = 267
-      Top = 52
-      Width = 92
-      Height = 22
+      Left = 214
+      Top = 42
+      Width = 80
+      Height = 19
      Caption = #20135#21697#21517#31216
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label7: TLabel
-      Left = 657
-      Top = 110
-      Width = 64
-      Height = 15
+      Left = 526
+      Top = 88
+      Width = 52
+      Height = 12
      Caption = #23457#26680#29366#24577
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -15
+      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      Visible = False
    end
    object BegDate: TDateTimePicker
-      Left = 97
-      Top = 16
-      Width = 158
-      Height = 30
+      Left = 78
+      Top = 13
+      Width = 126
+      Height = 27
      Date = 40675.464742650460000000
      Format = 'yyyy-MM-dd'
      Time = 40675.464742650460000000
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 0
    end
    object EndDate: TDateTimePicker
-      Left = 96
-      Top = 49
-      Width = 158
-      Height = 30
+      Left = 77
+      Top = 39
+      Width = 126
+      Height = 27
      Date = 40675.464761099540000000
      Format = 'yyyy-MM-dd'
      Time = 40675.464761099540000000
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -241,13 +241,13 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    end
    object MLOrderNo: TEdit
      Tag = 2
-      Left = 641
-      Top = 48
-      Width = 97
+      Left = 513
+      Top = 38
+      Width = 77
      Height = 30
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -256,13 +256,13 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    end
    object KHName: TEdit
      Tag = 2
-      Left = 360
-      Top = 15
-      Width = 153
+      Left = 288
+      Top = 12
+      Width = 122
      Height = 30
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -271,13 +271,13 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    end
    object MLConNo: TEdit
      Tag = 2
-      Left = 641
-      Top = 16
-      Width = 97
+      Left = 513
+      Top = 13
+      Width = 77
      Height = 30
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -286,22 +286,22 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    end
    object MPRTKZ: TEdit
      Tag = 2
-      Left = 818
-      Top = 123
-      Width = 69
+      Left = 654
+      Top = 98
+      Width = 56
      Height = 23
      TabOrder = 5
      OnChange = MLOrderNoChange
    end
    object MLCodeName: TEdit
      Tag = 2
-      Left = 360
-      Top = 48
-      Width = 188
+      Left = 288
+      Top = 38
+      Width = 150
      Height = 30
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -310,11 +310,11 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    end
    object status: TComboBox
      Tag = 2
-      Left = 726
-      Top = 108
-      Width = 129
-      Height = 23
-      ItemHeight = 15
+      Left = 581
+      Top = 86
+      Width = 103
+      Height = 20
+      ItemHeight = 12
      TabOrder = 7
      Visible = False
      OnChange = MLOrderNoChange
@ -325,14 +325,14 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
        '')
    end
    object Button2: TButton
-      Left = 515
-      Top = 16
-      Width = 32
-      Height = 28
+      Left = 412
+      Top = 13
+      Width = 26
+      Height = 22
      Caption = '...'
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -340,14 +340,14 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
      OnClick = Button2Click
    end
    object Button1: TButton
-      Left = 859
-      Top = 16
-      Width = 93
-      Height = 29
+      Left = 687
+      Top = 13
+      Width = 75
+      Height = 23
      Caption = #30382#37325
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -355,14 +355,14 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
      OnClick = Button1Click
    end
    object Button3: TButton
-      Left = 859
-      Top = 51
-      Width = 93
-      Height = 28
+      Left = 687
+      Top = 41
+      Width = 75
+      Height = 22
      Caption = #31995#25968
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -370,40 +370,40 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
      OnClick = Button3Click
    end
    object PiZhong: TEdit
-      Left = 768
-      Top = 14
-      Width = 88
+      Left = 614
+      Top = 11
+      Width = 71
      Height = 33
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 11
    end
    object XS: TEdit
-      Left = 768
-      Top = 47
-      Width = 88
+      Left = 614
+      Top = 38
+      Width = 71
      Height = 33
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 12
    end
    object Button4: TButton
-      Left = 1071
-      Top = 51
-      Width = 93
-      Height = 28
+      Left = 857
+      Top = 41
+      Width = 74
+      Height = 22
      Caption = #30721#25968
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -411,13 +411,13 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
      OnClick = Button4Click
    end
    object MaXS: TEdit
-      Left = 980
-      Top = 47
-      Width = 88
+      Left = 784
+      Top = 38
+      Width = 70
      Height = 33
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -25
+      Font.Height = -20
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -426,9 +426,9 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  end
  object Cxgrid1: TcxGrid
    Left = 0
-    Top = 129
-    Width = 1383
-    Height = 301
+    Top = 109
+    Width = 1393
+    Height = 385
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
@ -536,13 +536,20 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
        Options.Editing = False
        Width = 78
      end
-      object Tv1Column1: TcxGridDBColumn
+      object Tv1MaXS: TcxGridDBColumn
        Caption = #30721#25968
        DataBinding.FieldName = 'MaXS'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 76
      end
+      object Tv1Filler: TcxGridDBColumn
+        Caption = #21046#21333#20154
+        DataBinding.FieldName = 'Filler'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
    end
    object Cxgrid1Level1: TcxGridLevel
      GridView = Tv1
@ -550,8 +557,8 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  end
  object cxSplitter1: TcxSplitter
    Left = 0
-    Top = 430
-    Width = 1383
+    Top = 494
+    Width = 1393
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salBottom
@ -559,17 +566,17 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
  end
  object Panel2: TPanel
    Left = 0
-    Top = 438
-    Width = 1383
-    Height = 244
+    Top = 502
+    Width = 1393
+    Height = 196
    Align = alBottom
    BevelOuter = bvNone
    TabOrder = 4
    object cxGrid2: TcxGrid
      Left = 0
      Top = 0
-      Width = 1383
-      Height = 244
+      Width = 1393
+      Height = 196
      Align = alClient
      TabOrder = 0
      object Tv2: TcxGridDBTableView
@ -833,7 +840,7 @@ object frmProductOrderNewList_BQNew: TfrmProductOrderNewList_BQNew
    Top = 583
  end
  object cxStyleRepository1: TcxStyleRepository
-    PixelsPerInch = 120
+    PixelsPerInch = 96
    object cxStyle1: TcxStyle
      AssignedValues = [svFont]
      Font.Charset = ANSI_CHARSET
--- a/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_BQNew.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_BQNew.pas
@ -13,7 +13,20 @@ uses
  RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu,
  cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
  IdFTP, ShellAPI, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator;
+  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
  TfrmProductOrderNewList_BQNew = class(TForm)
@ -98,9 +111,10 @@ type
    PiZhong: TEdit;
    XS: TEdit;
    ToolButton6: TToolButton;
-    Tv1Column1: TcxGridDBColumn;
+    Tv1MaXS: TcxGridDBColumn;
    Button4: TButton;
    MaXS: TEdit;
+    Tv1Filler: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
--- a/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_New.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_New.dfm
@ -1,6 +1,6 @@
 object frmProductOrderNewList_New: TfrmProductOrderNewList_New
-  Left = 201
-  Top = 119
+  Left = 328
+  Top = 562
  Width = 1556
  Height = 878
  Caption = #29983#20135#25351#31034#21333#26032
@ -1045,148 +1045,13 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
      Visible = False
    end
  end
-  object Cxgrid1: TcxGrid
-    Left = 0
-    Top = 135
-    Width = 1452
-    Height = 654
-    Align = alClient
-    PopupMenu = PopupMenu1
-    TabOrder = 6
-    object Tv1: TcxGridDBTableView
-      OnMouseDown = Tv1MouseDown
-      Navigator.Buttons.CustomButtons = <>
-      OnCellDblClick = Tv1CellDblClick
-      DataController.DataSource = DataSource1
-      DataController.Filter.AutoDataSetFilter = True
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-      DataController.Summary.DefaultGroupSummaryItems = <>
-      DataController.Summary.FooterSummaryItems = <
-        item
-          Kind = skSum
-          Column = v1Column2
-        end
-        item
-          Kind = skCount
-          Column = v1OrdDate
-        end>
-      DataController.Summary.SummaryGroups = <>
-      OptionsView.Footer = True
-      OptionsView.GroupByBox = False
-      OptionsView.Indicator = True
-      Styles.Content = cxStyle1
-      Styles.Inactive = cxStyle1
-      Styles.IncSearch = cxStyle1
-      Styles.Selection = cxStyle1
-      Styles.Header = cxStyle1
-      object v1Ssel: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'Ssel'
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        HeaderAlignmentHorz = taCenter
-        Width = 56
-      end
-      object v1OrdDate: TcxGridDBColumn
-        Caption = #19979#21333#26085#26399
-        DataBinding.FieldName = 'OrdDate'
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.ShowTime = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 137
-      end
-      object v1MLOrderNo: TcxGridDBColumn
-        Caption = #25351#31034#21333#21495
-        DataBinding.FieldName = 'MLOrderNo'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 151
-      end
-      object v1MLConNo: TcxGridDBColumn
-        Caption = #21512#21516#21495
-        DataBinding.FieldName = 'MLConNo'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 138
-      end
-      object v1Column1: TcxGridDBColumn
-        Caption = #23458#25143#21512#21516#21495
-        DataBinding.FieldName = 'KHConNo'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 175
-      end
-      object v1MLCodeName: TcxGridDBColumn
-        Caption = #20135#21697#21517#31216
-        DataBinding.FieldName = 'MLCodeName'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 309
-      end
-      object v1KHName: TcxGridDBColumn
-        Caption = #23458#25143
-        DataBinding.FieldName = 'KHNameJC'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 194
-      end
-      object v1Column2: TcxGridDBColumn
-        Caption = #24635#25968#37327
-        DataBinding.FieldName = 'ZQty'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 114
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #26631#31614#35268#21017
-        DataBinding.FieldName = 'CPBQGuiZe'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 118
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #33457#22411
-        DataBinding.FieldName = 'HX'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 100
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #28322#30701#35013
-        DataBinding.FieldName = 'YIDZ'
-        HeaderAlignmentHorz = taCenter
-        Width = 97
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #25968#37327#19978#38480
-        DataBinding.FieldName = 'SLSX'
-        HeaderAlignmentHorz = taCenter
-        Width = 102
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #25968#37327#19979#38480
-        DataBinding.FieldName = 'SLXX'
-        HeaderAlignmentHorz = taCenter
-        Width = 99
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #21512#21516#35746#37329
-        DataBinding.FieldName = 'HTDJ'
-        HeaderAlignmentHorz = taCenter
-        Width = 100
-      end
-    end
-    object Cxgrid1Level1: TcxGridLevel
-      GridView = Tv1
-    end
-  end
  object Panel8: TPanel
    Left = 280
    Top = 249
    Width = 996
    Height = 315
    Color = clSkyBlue
-    TabOrder = 7
+    TabOrder = 6
    Visible = False
    object Label8: TLabel
      Left = 367
@ -1413,7 +1278,7 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
    Top = 141
    Width = 232
    Height = 179
-    TabOrder = 8
+    TabOrder = 7
    Visible = False
    object Label18: TLabel
      Left = 48
@ -1508,42 +1373,237 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
      TabOrder = 2
    end
  end
+  object Panel12: TPanel
+    Left = 0
+    Top = 135
+    Width = 1452
+    Height = 654
+    Align = alClient
+    TabOrder = 8
+    object Cxgrid1: TcxGrid
+      Left = 201
+      Top = 1
+      Width = 1250
+      Height = 652
+      Align = alClient
+      PopupMenu = PopupMenu1
+      TabOrder = 0
+      object Tv1: TcxGridDBTableView
+        OnMouseDown = Tv1MouseDown
+        Navigator.Buttons.CustomButtons = <>
+        OnCellDblClick = Tv1CellDblClick
+        DataController.DataSource = DataSource1
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+            Column = v1Column2
+          end
+          item
+            Kind = skCount
+            Column = v1OrdDate
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        OptionsView.Indicator = True
+        Styles.Content = cxStyle1
+        Styles.Inactive = cxStyle1
+        Styles.IncSearch = cxStyle1
+        Styles.Selection = cxStyle1
+        Styles.Header = cxStyle1
+        object v1Ssel: TcxGridDBColumn
+          Caption = #36873#25321
+          DataBinding.FieldName = 'Ssel'
+          PropertiesClassName = 'TcxCheckBoxProperties'
+          HeaderAlignmentHorz = taCenter
+          Width = 56
+        end
+        object v1OrdDate: TcxGridDBColumn
+          Caption = #19979#21333#26085#26399
+          DataBinding.FieldName = 'OrdDate'
+          PropertiesClassName = 'TcxDateEditProperties'
+          Properties.ShowTime = False
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 137
+        end
+        object v1MLOrderNo: TcxGridDBColumn
+          Caption = #25351#31034#21333#21495
+          DataBinding.FieldName = 'MLOrderNo'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 151
+        end
+        object v1MLConNo: TcxGridDBColumn
+          Caption = #21512#21516#21495
+          DataBinding.FieldName = 'MLConNo'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 138
+        end
+        object v1Column1: TcxGridDBColumn
+          Caption = #23458#25143#21512#21516#21495
+          DataBinding.FieldName = 'KHConNo'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 175
+        end
+        object v1MLCodeName: TcxGridDBColumn
+          Caption = #20135#21697#21517#31216
+          DataBinding.FieldName = 'MLCodeName'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 309
+        end
+        object v1KHName: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'KHNameJC'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 194
+        end
+        object v1Column2: TcxGridDBColumn
+          Caption = #24635#25968#37327
+          DataBinding.FieldName = 'ZQty'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 114
+        end
+        object Tv1Column1: TcxGridDBColumn
+          Caption = #26631#31614#35268#21017
+          DataBinding.FieldName = 'CPBQGuiZe'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 118
+        end
+        object Tv1Column2: TcxGridDBColumn
+          Caption = #33457#22411
+          DataBinding.FieldName = 'HX'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
+        object Tv1Column3: TcxGridDBColumn
+          Caption = #28322#30701#35013
+          DataBinding.FieldName = 'YIDZ'
+          HeaderAlignmentHorz = taCenter
+          Width = 97
+        end
+        object Tv1Column4: TcxGridDBColumn
+          Caption = #25968#37327#19978#38480
+          DataBinding.FieldName = 'SLSX'
+          HeaderAlignmentHorz = taCenter
+          Width = 102
+        end
+        object Tv1Column5: TcxGridDBColumn
+          Caption = #25968#37327#19979#38480
+          DataBinding.FieldName = 'SLXX'
+          HeaderAlignmentHorz = taCenter
+          Width = 99
+        end
+        object Tv1Column6: TcxGridDBColumn
+          Caption = #21512#21516#35746#37329
+          DataBinding.FieldName = 'HTDJ'
+          HeaderAlignmentHorz = taCenter
+          Width = 100
+        end
+        object Tv1MLPrice: TcxGridDBColumn
+          Caption = #21333#20215
+          DataBinding.FieldName = 'MLPrice'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
+        object Tv1FeeName: TcxGridDBColumn
+          Caption = #36153#29992#21517#31216
+          DataBinding.FieldName = 'FeeName'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
+        object Tv1FeeMoney: TcxGridDBColumn
+          Caption = #36153#29992#37329#39069
+          DataBinding.FieldName = 'FeeMoney'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
+      end
+      object Cxgrid1Level1: TcxGridLevel
+        GridView = Tv1
+      end
+    end
+    object cxGrid5: TcxGrid
+      Left = 1
+      Top = 1
+      Width = 200
+      Height = 652
+      Align = alLeft
+      TabOrder = 1
+      object TV5: TcxGridDBTableView
+        OnDblClick = TV5DblClick
+        Navigator.Buttons.CustomButtons = <>
+        DataController.DataSource = DS_5
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <>
+        DataController.Summary.SummaryGroups = <>
+        OptionsView.GroupByBox = False
+        Styles.Content = cxStyle1
+        Styles.Inactive = cxStyle1
+        Styles.IncSearch = cxStyle1
+        Styles.Header = cxStyle1
+        object TV5KHNameJC: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'Name'
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 150
+        end
+      end
+      object cxGrid5Level1: TcxGridLevel
+        GridView = TV5
+      end
+    end
+  end
  object cxGridPopupMenu1: TcxGridPopupMenu
    Grid = Cxgrid1
    PopupMenus = <>
-    Left = 381
-    Top = 245
+    Left = 692
+    Top = 443
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 377
-    Top = 212
+    Left = 828
+    Top = 171
  end
  object ADOQueryMain: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 305
-    Top = 212
+    Left = 692
+    Top = 239
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 304
-    Top = 179
+    Left = 624
+    Top = 307
  end
  object DataSource1: TDataSource
    DataSet = Order_Main
-    Left = 429
-    Top = 181
+    Left = 828
+    Top = 443
  end
  object Order_Main: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 413
-    Top = 244
+    Left = 760
+    Top = 375
  end
  object RM1: TRMGridReport
    ThreadPrepareReport = True
@ -1561,15 +1621,15 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
-    Left = 405
-    Top = 414
+    Left = 760
+    Top = 647
    ReportData = {}
  end
  object RMDBMain: TRMDBDataSet
    Visible = True
    DataSet = ADOQueryPrint
-    Left = 412
-    Top = 449
+    Left = 624
+    Top = 647
  end
  object RMXLSExport1: TRMXLSExport
    ShowAfterExport = True
@ -1582,12 +1642,12 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
    ScaleX = 1.000000000000000000
    ScaleY = 1.000000000000000000
    CompressFile = False
-    Left = 410
-    Top = 214
+    Left = 828
+    Top = 647
  end
  object PopupMenu1: TPopupMenu
-    Left = 366
-    Top = 179
+    Left = 760
+    Top = 579
    object N2: TMenuItem
      Caption = #20840#36873
      OnClick = N2Click
@ -1605,76 +1665,76 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 376
-    Top = 448
+    Left = 760
+    Top = 239
  end
  object CDS_Print: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 345
-    Top = 245
+    Left = 692
+    Top = 375
  end
  object ADOQuerySub: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 296
-    Top = 541
+    Left = 896
+    Top = 239
  end
  object DataSource2: TDataSource
    DataSet = ADOQuerySub
-    Left = 326
-    Top = 541
+    Left = 896
+    Top = 443
  end
  object ADOQueryImage: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    EnableBCD = False
    Parameters = <>
-    Left = 872
-    Top = 541
+    Left = 624
+    Top = 239
  end
  object DSImage: TDataSource
    DataSet = ADOQueryImage
-    Left = 844
-    Top = 541
+    Left = 828
+    Top = 511
  end
  object IdFTP1: TIdFTP
    MaxLineAction = maException
    ReadTimeout = 0
    ProxySettings.ProxyType = fpcmNone
    ProxySettings.Port = 0
-    Left = 306
-    Top = 245
+    Left = 692
+    Top = 579
  end
  object DataSource3: TDataSource
-    Left = 902
-    Top = 541
+    Left = 624
+    Top = 511
  end
  object Order_Print: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 454
-    Top = 211
+    Left = 828
+    Top = 375
  end
  object ADOQuery1: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    Parameters = <>
-    Left = 719
-    Top = 585
+    Left = 692
+    Top = 171
  end
  object DataSource4: TDataSource
    DataSet = Ord_GX
-    Left = 749
-    Top = 585
+    Left = 692
+    Top = 511
  end
  object Ord_GX: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 691
-    Top = 583
+    Left = 624
+    Top = 443
  end
  object cxStyleRepository1: TcxStyleRepository
-    Left = 916
-    Top = 68
+    Left = 760
+    Top = 443
    PixelsPerInch = 96
    object cxStyle1: TcxStyle
      AssignedValues = [svFont]
@ -1687,25 +1747,25 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
  end
  object DS_Con: TDataSource
    DataSet = CDS_Con
-    Left = 1197
-    Top = 239
+    Left = 624
+    Top = 579
  end
  object ADOQueryCon: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 1057
-    Top = 246
+    Left = 896
+    Top = 171
  end
  object CDS_Con: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1105
-    Top = 246
+    Left = 828
+    Top = 307
  end
  object PopupMenu2: TPopupMenu
-    Left = 1018
-    Top = 243
+    Left = 828
+    Top = 579
    object MenuItem1: TMenuItem
      Caption = #21046#20316#35745#21010#21333
      OnClick = MenuItem1Click
@ -1722,62 +1782,73 @@ object frmProductOrderNewList_New: TfrmProductOrderNewList_New
  object CDS_HTSelInfo: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 903
-    Top = 235
+    Left = 896
+    Top = 307
  end
  object CDS_HTSelInfo_MX: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 937
-    Top = 237
+    Left = 624
+    Top = 375
  end
  object RMDBCJ: TRMDBDataSet
    Visible = True
    DataSet = CDS_CJ
-    Left = 197
-    Top = 337
+    Left = 896
+    Top = 579
  end
  object CDS_CJ: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 213
-    Top = 362
+    Left = 760
+    Top = 307
  end
  object ADOQueryPrint2: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 369
-    Top = 479
+    Left = 828
+    Top = 239
  end
  object RMDBMain2: TRMDBDataSet
    Visible = True
    DataSet = ADOQueryPrint2
-    Left = 411
-    Top = 486
+    Left = 692
+    Top = 647
  end
  object DataSource5: TDataSource
    DataSet = Order_Sub
-    Left = 999
-    Top = 430
+    Left = 760
+    Top = 511
  end
  object Order_Sub: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 1032
-    Top = 431
+    Left = 896
+    Top = 375
  end
  object AccessApplication1: TAccessApplication
    AutoConnect = False
    ConnectKind = ckRunningOrNew
-    Left = 659
-    Top = 153
+    Left = 624
+    Top = 171
  end
  object ADOQuery2: TADOQuery
    Connection = DataLink_DyeingFinishingPlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 417
-    Top = 595
+    Left = 760
+    Top = 171
+  end
+  object CDS_5: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 692
+    Top = 307
+  end
+  object DS_5: TDataSource
+    DataSet = CDS_5
+    Left = 896
+    Top = 511
  end
 end
--- a/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_New.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ProductOrderNewList_New.pas
@ -14,31 +14,19 @@ uses
  cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
  IdFTP, ShellAPI, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxBarBuiltInMenu, OleServer, AccessXP, dxSkinsCore,
-      dxSkinDarkRoom,
-     
-     
-     
-    
-    
-    
-    
-  dxSkinOffice2013White,   
-   dxSkinSharpPlus,  dxSkinSpringTime, 
-    dxSkinsDefaultPainters,
-     
-  dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
-  dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
-  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
-  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
-  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
-  dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven,
-  dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust,
-  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010,
-  dxSkinWhiteprint, dxSkinXmas2008Blue;
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver,
+  dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue;

 type
  TfrmProductOrderNewList_New = class(TForm)
@ -208,6 +196,16 @@ type
    Image3: TImage;
    Button2: TButton;
    RadioGroup2: TRadioGroup;
+    Panel12: TPanel;
+    TV5: TcxGridDBTableView;
+    cxGrid5Level1: TcxGridLevel;
+    cxGrid5: TcxGrid;
+    TV5KHNameJC: TcxGridDBColumn;
+    CDS_5: TClientDataSet;
+    DS_5: TDataSource;
+    Tv1MLPrice: TcxGridDBColumn;
+    Tv1FeeName: TcxGridDBColumn;
+    Tv1FeeMoney: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -253,6 +251,7 @@ type
    procedure ConBegDateChange(Sender: TObject);
    procedure ToolButton5Click(Sender: TObject);
    procedure Button2Click(Sender: TObject);
+    procedure TV5DblClick(Sender: TObject);
  private
    DQdate: TDateTime;
    procedure InitGrid();
@ -439,7 +438,7 @@ begin
      Close;
      sql.Clear;
      sql.Add('SELECT AA.* FROM(');
-      sql.add('select A.*,KM.KHNameJC,KHNameHZ=isnull(A.KHNO,'''')+isnull(KM.KHName,'''')+isnull(KM.KHNameJC,'''')');
+      sql.add('select A.*,B.MLPrice,B.FeeName,B.FeeMoney,KM.KHNameJC,KHNameHZ=isnull(A.KHNO,'''')+isnull(KM.KHName,'''')+isnull(KM.KHNameJC,'''')');
      sql.Add('+dbo.getpinyin(isnull(KM.KHName,''''))+dbo.getpinyin(isnull(KM.KHNameJC,''''))');
      SQL.Add(',ZQty=(select Sum(B.Qty) from ML_OrderSubidNew B where B.NewMLID=A.NewMLID) ');
      sql.Add(',HX=(select top 1 MLHX from ML_OrderSubidNew B where B.NewMLID=A.NewMLID)');
@ -450,6 +449,7 @@ begin
      sql.Add(',SLSX=isnull((select Sum(B.Qty) from ML_OrderSubidNew B where B.NewMLID=A.NewMLID),0) * ((100+isnull(A.YIDZ,0) + 0.0)/100) ');
      sql.Add(' from ML_OrderMainNew A ');
      sql.Add(' left join KH_Main KM on KM.KHNO=A.KHNO ');
+      sql.Add(' left join ML_OrderSubidNew B on B.NewMLID=A.NewMLID ');
      sql.Add(')AA');
      sql.Add(fwhere);
 //      ShowMessage(SQL.Text);
@ -484,6 +484,8 @@ begin
    ADOQuery2.next;
  end;

+  SCreateCDS20(ADOQuery2, CDS_5);
+  SInitCDSData20(ADOQuery2, CDS_5);
  with ADOQuery2 do
  begin
    Filtered := False;
@ -513,7 +515,7 @@ begin
  ReadCxGrid('生产指示单新YX', Tv1, '生产指示单管理');

  EndDate.DateTime := SGetServerDate10(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 15;
+  BegDate.DateTime := EndDate.DateTime;
  ConEndDate.DateTime := EndDate.DateTime;
  ConBegDate.DateTime := EndDate.DateTime - 15;
  if trim(DdataBase) = '查询' then
@ -667,6 +669,7 @@ end;
 procedure TfrmProductOrderNewList_New.FormShow(Sender: TObject);
 begin
  InitForm();
+  KHNameJC.SetFocus;
 end;

 procedure TfrmProductOrderNewList_New.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
@ -1247,14 +1250,14 @@ end;
 procedure TfrmProductOrderNewList_New.N4Click(Sender: TObject);
 begin
  Panel3.Visible := False;
-  Cxgrid1.Align := alClient;
-  Cxgrid1.Visible := True;
+  Panel12.Align := alClient;
+  Panel12.Visible := True;
 end;

 procedure TfrmProductOrderNewList_New.ToolButton3Click(Sender: TObject);
 begin
-  Cxgrid1.Align := alLeft;
-  Cxgrid1.Visible := False;
+  Panel12.Align := alLeft;
+  Panel12.Visible := False;
  Panel3.Align := alClient;
  Panel3.Visible := True;
  Panel3.Refresh;
@ -1575,5 +1578,11 @@ begin
  end;
 end;

+procedure TfrmProductOrderNewList_New.TV5DblClick(Sender: TObject);
+begin
+  KHNameJC.Text := CDS_5.fieldbyname('Name').AsString;
+  InitGrid();
+end;
+
 end.

--- a/生产计划单(DyeingFinishingPlan.dll)/U_ZdyAttachCP_HX_sel.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ZdyAttachCP_HX_sel.dfm
@ -21,7 +21,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1095
+    Width = 1103
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 59
@ -70,7 +70,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1095
+    Width = 1103
    Height = 40
    Align = alTop
    BevelInner = bvRaised
@ -117,7 +117,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      Left = 250
      Top = 9
      Width = 100
-      Height = 21
+      Height = 20
      TabOrder = 0
      OnChange = ZdyNameChange
    end
@ -126,7 +126,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      Left = 83
      Top = 9
      Width = 89
-      Height = 21
+      Height = 20
      TabOrder = 1
      OnChange = ZdyNameChange
    end
@ -150,7 +150,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      Left = 422
      Top = 9
      Width = 100
-      Height = 21
+      Height = 20
      TabOrder = 3
      OnChange = ZdyNameChange
    end
@ -159,7 +159,7 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
      Left = 571
      Top = 9
      Width = 100
-      Height = 21
+      Height = 20
      TabOrder = 4
      OnChange = ZdyNameChange
    end
@ -167,15 +167,15 @@ object frmZdyAttachCP_HX_Sel: TfrmZdyAttachCP_HX_Sel
  object cxGrid2: TcxGrid
    Left = 0
    Top = 72
-    Width = 1095
-    Height = 518
+    Width = 1103
+    Height = 525
    Align = alClient
    TabOrder = 2
    object Tv2: TcxGridDBTableView
      OnDblClick = Tv2DblClick
-      NavigatorButtons.ConfirmDelete = False
-      NavigatorButtons.Delete.Enabled = False
-      NavigatorButtons.Delete.Visible = False
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
      DataController.DataSource = DS_HZ
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
--- a/生产计划单(DyeingFinishingPlan.dll)/U_ZdyAttachCP_HX_sel.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_ZdyAttachCP_HX_sel.pas
@ -12,7 +12,22 @@ uses
  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar,
-  cxButtonEdit, cxTextEdit, Menus, cxLookAndFeelPainters, cxButtons;
+  cxButtonEdit, cxTextEdit, Menus, cxLookAndFeelPainters, cxButtons,
+  cxLookAndFeels, 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,
+  cxNavigator;
 type
  FdDy=record
               inc: integer; //客户端套接字句柄