更新产品管理等页面

2025-08-22 09:38:54 +08:00 · 2025-08-22 09:38:54 +08:00 · 5bc2a25bce
commit 5bc2a25bce
parent eeec0ec912
25 changed files with 651 additions and 428 deletions
--- a/云翔样品仓库/ProjectGroup1.bpg
+++ b/云翔样品仓库/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
+PROJECTS = testDll.exe YPCK.dll
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@ -17,4 +17,7 @@ default: $(PROJECTS)
 testDll.exe: testDll.dpr
  $(DCC)

+YPCK.dll: YPCK.dpr
+  $(DCC)
+

--- a/云翔样品仓库/U_BpRklist.dfm
+++ b/云翔样品仓库/U_BpRklist.dfm
@ -21,7 +21,7 @@ object frmBpRklist: TfrmBpRklist
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1412
+    Width = 1420
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 95
@ -196,7 +196,7 @@ object frmBpRklist: TfrmBpRklist
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1412
+    Width = 1420
    Height = 61
    Align = alTop
    BevelInner = bvRaised
@ -574,7 +574,7 @@ object frmBpRklist: TfrmBpRklist
  object cxGrid1: TcxGrid
    Left = 0
    Top = 113
-    Width = 1412
+    Width = 1420
    Height = 352
    Align = alTop
    TabOrder = 2
@ -876,7 +876,7 @@ object frmBpRklist: TfrmBpRklist
  object cxTabControl1: TcxTabControl
    Left = 0
    Top = 93
-    Width = 1412
+    Width = 1420
    Height = 20
    Align = alTop
    TabOrder = 3
--- a/云翔样品仓库/U_BpRklist.pas
+++ b/云翔样品仓库/U_BpRklist.pas
@ -11,7 +11,20 @@ uses
  cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxPC,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
  cxCheckBox, RM_System, RM_Common, RM_Class, RM_GridReport, Menus, MovePanel,
-  cxButtons;
+  cxButtons, 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
  TfrmBpRklist = class(TForm)
--- a/云翔样品仓库/U_DataLink.pas
+++ b/云翔样品仓库/U_DataLink.pas
@ -5,23 +5,24 @@ interface
 uses
  SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, AppEvnts, cxClasses,
-  dxSkinsCore,    
-   dxSkinDarkRoom,  
+  dxSkinsCore, dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus,
+  dxSkinSpringTime, dxSkinsDefaultPainters, 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;

-     
-    
-    
-    
-    
-   
-   dxSkinOffice2013White, 
-     dxSkinSharpPlus,
-   dxSkinSpringTime,  
-   dxSkinsDefaultPainters, 
-    ;
 var
-   DConString:String;   {全局连接字符串}
-   server, dtbase, user, pswd: String;  {数据库连接参数}
+  DConString: string;   {全局连接字符串}
+  server, dtbase, user, pswd: string;  {数据库连接参数}
  DCurHandle: hwnd;     //当前窗体句柄
  PicSvr: string;
  DName: string;   //#用户名#//
@ -82,9 +83,10 @@ type
  public
    { Public declarations }
  end;
-  TMakebar = procedure(ucData:pchar;nDataLen:integer;nErrLevel:integer;nMask:integer;nBarEdition:integer;szBmpFileName:pchar;nScale:integer);stdcall;
-  TMixtext = procedure( szSrcBmpFileName:PChar;szDstBmpFileName:PChar;sztext:PChar;fontsize,txtheight,hmargin,vmargin,txtcntoneline:integer);stdcall;

+  TMakebar = procedure(ucData: pchar; nDataLen: integer; nErrLevel: integer; nMask: integer; nBarEdition: integer; szBmpFileName: pchar; nScale: integer); stdcall;
+
+  TMixtext = procedure(szSrcBmpFileName: PChar; szDstBmpFileName: PChar; sztext: PChar; fontsize, txtheight, hmargin, vmargin, txtcntoneline: integer); stdcall;

 var
  YPCK_DataLink: TYPCK_DataLink;
@ -92,7 +94,6 @@ var
 implementation
 {$R *.dfm}

-
 procedure TYPCK_DataLink.DataModuleDestroy(Sender: TObject);
 begin
  YPCK_DataLink := nil;
@ -100,6 +101,3 @@ end;

 end.

-
-
-
--- a/云翔样品仓库/YPCK.dof
+++ b/云翔样品仓库/YPCK.dof
@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\马国钢开发代码\项目代码\云翔\云翔样品仓库\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\ÔÆÏèÑùÆ·²Ö¿â\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
--- a/云翔样品仓库/testDll.cfg
+++ b/云翔样品仓库/testDll.cfg
@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
-LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
-LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST
--- a/云翔样品仓库/testDll.dof
+++ b/云翔样品仓库/testDll.dof
@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=F:\selfware_83398\selfware\马国钢开发代码\项目代码\self\基础信息设置\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\ÔÆÏèÑùÆ·²Ö¿â\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
--- a/云翔生产管理(MYSC.dll)/U_LLCKList.pas
+++ b/云翔生产管理(MYSC.dll)/U_LLCKList.pas
@ -220,7 +220,10 @@ end;

 procedure TfrmLLCKList.TBCloseClick(Sender: TObject);
 begin
-  WriteCxGrid('加工码单CK', Tv1, '贸易生产管理');
+  WriteCxGrid('加工出库汇总主表', Tv1, '贸易生产管理');
+  WriteCxGrid('加工出库汇总子表', TV4, '贸易生产管理');
+  WriteCxGrid('加工出库客户表', TV2, '贸易生产管理');
+  WriteCxGrid('加工出库明细表', TV3, '贸易生产管理');
  Close;
 end;

@ -402,7 +405,11 @@ var
 begin
  BegDate.Date := StrToDate(formatdatetime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
  EndDate.Date := SGetServerDate(ADOQueryTemp);
-  ReadCxGrid('加工码单', Tv1, '贸易生产管理');
+
+  ReadCxGrid('加工出库汇总主表', Tv1, '贸易生产管理');
+  ReadCxGrid('加工出库汇总子表', TV4, '贸易生产管理');
+  ReadCxGrid('加工出库客户表', TV2, '贸易生产管理');
+  ReadCxGrid('加工出库明细表', TV3, '贸易生产管理');

  InitGrid();
  InitGridByCustomer();
@ -421,7 +428,7 @@ begin
    SInitCDSData20(ADOQueryMain, Order_Main);
  end;

-  if ADOQuery1.Active = False then
+  if ADOQuery2.Active = False then
    Exit
  else
  begin
@ -571,7 +578,7 @@ begin
    Exit
  else
  begin
-    SDofilter(ADOQuery1, SGetFilters(Panel1, 1, 2));
+    SDofilter(ADOQuery2, SGetFilters(Panel1, 1, 2));
    SCreateCDS20(ADOQuery2, CDS_2);
    SInitCDSData20(ADOQuery2, CDS_2);
  end;
--- a/云翔生产管理(MYSC.dll)/U_LLKCList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_LLKCList.dfm
@ -22,7 +22,7 @@ object frmLLKCList: TfrmLLKCList
    Top = 121
    Width = 1548
    Height = 597
-    ActivePage = TabSheet1
+    ActivePage = TabSheet3
    Align = alClient
    Font.Charset = GB2312_CHARSET
    Font.Color = clWindowText
@ -34,6 +34,7 @@ object frmLLKCList: TfrmLLKCList
    TabPosition = tpBottom
    object TabSheet1: TTabSheet
      Caption = #23458#25143#27719#24635
+      TabVisible = False
      object cxGrid2: TcxGrid
        Left = 0
        Top = 0
@ -154,6 +155,7 @@ object frmLLKCList: TfrmLLKCList
    object TabSheet2: TTabSheet
      Caption = #26126#32454#20449#24687
      ImageIndex = 1
+      TabVisible = False
      object cxGrid3: TcxGrid
        Left = 0
        Top = 0
@ -487,6 +489,7 @@ object frmLLKCList: TfrmLLKCList
        object Tv1: TcxGridDBTableView
          OnDblClick = Tv1DblClick
          Navigator.Buttons.CustomButtons = <>
+          OnFocusedRecordChanged = Tv1FocusedRecordChanged
          DataController.DataSource = DS_Main
          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
          DataController.Summary.DefaultGroupSummaryItems = <>
@ -1115,7 +1118,7 @@ object frmLLKCList: TfrmLLKCList
    end
    object MLOrderNo: TEdit
      Tag = 2
-      Left = 691
+      Left = 696
      Top = 8
      Width = 95
      Height = 23
@ -1128,21 +1131,6 @@ object frmLLKCList: TfrmLLKCList
      TabOrder = 9
      OnChange = CustomerNoNameChange
    end
-    object KHNameHZZ: TEdit
-      Tag = 2
-      Left = 691
-      Top = 36
-      Width = 95
-      Height = 23
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 10
-      OnChange = CustomerNoNameChange
-    end
    object PBBatchNo: TEdit
      Tag = 2
      Left = 883
@ -1155,7 +1143,7 @@ object frmLLKCList: TfrmLLKCList
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
-      TabOrder = 11
+      TabOrder = 10
      OnChange = CustomerNoNameChange
    end
    object MYColor: TEdit
@ -1170,8 +1158,33 @@ object frmLLKCList: TfrmLLKCList
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
+      TabOrder = 11
+      OnChange = CustomerNoNameChange
+    end
+    object KHName: TComboBox
+      Tag = 1
+      Left = 696
+      Top = 35
+      Width = 95
+      Height = 23
+      Style = csDropDownList
+      DropDownCount = 20
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -15
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ItemHeight = 15
+      ParentFont = False
      TabOrder = 12
      OnChange = CustomerNoNameChange
+      Items.Strings = (
+        ''
+        #38754#26009
+        #24213#24067
+        #32447
+        #26825
+        #26080#32442#24067)
    end
  end
  object Panel2: TPanel
--- a/云翔生产管理(MYSC.dll)/U_LLKCList.pas
+++ b/云翔生产管理(MYSC.dll)/U_LLKCList.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, BtnEdit, dxBarBuiltInMenu, dxSkinBlack, dxSkinBlue,
-  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide,
-  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinDarkRoom,
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, BtnEdit, dxBarBuiltInMenu,
+  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
  TfrmLLKCList = class(TForm)
@ -112,7 +100,6 @@ type
    Label6: TLabel;
    MLOrderNo: TEdit;
    Label7: TLabel;
-    KHNameHZZ: TEdit;
    v1Column13: TcxGridDBColumn;
    Tv1Column1: TcxGridDBColumn;
    Label8: TLabel;
@ -220,6 +207,7 @@ type
    DS_2: TDataSource;
    DS_3: TDataSource;
    DS_Sub: TDataSource;
+    KHName: TComboBox;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -263,6 +251,7 @@ type
    procedure ToolButton8Click(Sender: TObject);
    procedure Button6Click(Sender: TObject);
    procedure Button5Click(Sender: TObject);
+    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
  private
    FGXName: string;
    DQdate: TDateTime;
@ -271,6 +260,7 @@ type
    function DelData(): Boolean;
    procedure initGX();
    procedure SetStatus();
+    procedure InitSubGrid();
    { Private declarations }
  public
    FFInt, FCloth: Integer;
@ -326,7 +316,8 @@ end;

 procedure TfrmLLKCList.TBCloseClick(Sender: TObject);
 begin
-  WriteCxGrid('库存来料入库', Tv1, '库存贸易生产管理');
+  WriteCxGrid('来料库存汇总主表', Tv1, '库存贸易生产管理');
+  WriteCxGrid('来料库存汇总子表', TV4, '库存贸易生产管理');
  Close;
 end;

@ -387,18 +378,67 @@ begin
    end;
    SCreateCDS20(ADOQueryMain, Order_Main);
    SInitCDSData20(ADOQueryMain, Order_Main);
+    InitSubGrid();
  finally
    ADOQueryMain.EnableControls;
  end;
 end;

+procedure TfrmLLKCList.InitSubGrid();
+var
+  MYID: string;
+begin
+  if Order_Main.IsEmpty then
+    exit;
+
+  try
+    ADOQueryTemp.DisableControls;
+    MYID := Order_Main.FieldByName('MYID').AsString;
+
+    with ADOQueryTemp do
+    begin
+      Filtered := False;
+      Close;
+      sql.Clear;
+      sql.Add('SELECT * FROM CK_MYSC_CR_MX WHERE MYID = ''' + MYID + '''');
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_Sub);
+    SInitCDSData20(ADOQueryTemp, CDS_Sub);
+  finally
+    ADOQueryTemp.EnableControls;
+  end;
+
+end;
+
 procedure TfrmLLKCList.InitForm();
 var
-  fsj: string;
+  sql: string;
 begin
  BegDate.Date := StrToDate(formatdatetime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
  EndDate.Date := SGetServerDate(ADOQueryTemp);
-  ReadCxGrid('库存来料入库', Tv1, '库存贸易生产管理');
+
+  ReadCxGrid('来料库存汇总主表', Tv1, '库存贸易生产管理');
+  ReadCxGrid('来料库存汇总子表', TV4, '库存贸易生产管理');
+
+  sql := 'select DISTINCT A.KHName AS Name from CK_MYSC_CR A where 1=1';
+  if CheckBox1.Checked = False then
+  begin
+    sql := sql + ' and A.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', now)) + '''';
+    sql := sql + ' and A.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', now + 1)) + '''';
+    BegDate.Visible := false;
+    EndDate.Visible := false;
+  end
+  else
+  begin
+    sql := sql + ' and A.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + '''';
+    sql := sql + ' and A.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + '''';
+    BegDate.Visible := true;
+    EndDate.Visible := true;
+  end;
+  sql := sql + ' and isnull(CRType,'''')=''来料入库'' ';
+  SInitComBoxBySql(ADOQueryTemp, KHName, False, sql);
+
  SetStatus();
  InitGrid();
 end;
@ -873,7 +913,7 @@ begin
        with ADOQueryPrint do
        begin
          Close;
-          SQL.Clear;
+          sql.Clear;
          sql.Add('select AA.* ');
          sql.Add(',KHNameHZ=dbo.getpinyin(isnull(AA.KHNameJC,''''))+AA.GYSNo+isnull(AA.KHNameJC,'''')');
          sql.Add('from(');
@ -1266,5 +1306,10 @@ begin
  end;
 end;

+procedure TfrmLLKCList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+begin
+  InitSubGrid();
+end;
+
 end.

--- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.dfm
+++ b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.dfm
@ -503,6 +503,7 @@ object frmLLRKInPutMH_RCCG: TfrmLLRKInPutMH_RCCG
        OnBtnClick = ToGYSNameBtnClick
      end
      object KHNameJC: TBtnEditA
+        Tag = 2
        Left = 112
        Top = 157
        Width = 273
--- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.pas
+++ b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_RCCG.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
  TfrmLLRKInPutMH_RCCG = class(TForm)
--- a/云翔生产管理(MYSC.dll)/U_LLRKList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_LLRKList.dfm
@ -1,6 +1,6 @@
 object frmLLRKList: TfrmLLRKList
-  Left = 1195
-  Top = 285
+  Left = 306
+  Top = 372
  Width = 1361
  Height = 698
  Caption = #23458#25143#26469#26009#20837#24211#30331#35760
--- a/云翔生产管理(MYSC.dll)/U_LLRKList.pas
+++ b/云翔生产管理(MYSC.dll)/U_LLRKList.pas
@ -332,7 +332,10 @@ end;

 procedure TfrmLLRKList.TBCloseClick(Sender: TObject);
 begin
-  WriteCxGrid('来料入库111', Tv1, '贸易生产管理');
+  WriteCxGrid('来料入库汇总主表', Tv1, '贸易生产管理');
+  WriteCxGrid('来料入库汇总子表', TV4, '贸易生产管理');
+  WriteCxGrid('来料入库客户表', TV2, '贸易生产管理');
+  WriteCxGrid('来料入库明细表', TV3, '贸易生产管理');
  Close;
 end;

@ -543,7 +546,12 @@ procedure TfrmLLRKList.InitForm();
 begin
  BegDate.Date := SGetServerDateMBeg(ADOQueryTemp);
  EndDate.Date := SGetServerDate(ADOQueryTemp);
-  ReadCxGrid('来料入库111', Tv1, '贸易生产管理');
+
+  ReadCxGrid('来料入库汇总主表', Tv1, '贸易生产管理');
+  ReadCxGrid('来料入库汇总子表', TV4, '贸易生产管理');
+  ReadCxGrid('来料入库客户表', TV2, '贸易生产管理');
+  ReadCxGrid('来料入库明细表', TV3, '贸易生产管理');
+  
  InitGrid();
  InitFiller();
  InitGridByCustomer();
--- a/云翔生产管理(MYSC.dll)/U_MLMangeYH.dfm
+++ b/云翔生产管理(MYSC.dll)/U_MLMangeYH.dfm
@ -21,7 +21,7 @@ object frmMLMangeYH: TfrmMLMangeYH
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1283
+    Width = 1291
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 59
@ -96,8 +96,8 @@ object frmMLMangeYH: TfrmMLMangeYH
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1283
-    Height = 626
+    Width = 1291
+    Height = 634
    Align = alClient
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -106,7 +106,7 @@ object frmMLMangeYH: TfrmMLMangeYH
    object Panel5: TPanel
      Left = 2
      Top = 2
-      Width = 1279
+      Width = 1287
      Height = 41
      Align = alTop
      BevelInner = bvRaised
@ -292,8 +292,10 @@ object frmMLMangeYH: TfrmMLMangeYH
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ItemHeight = 15
+        ItemIndex = 2
        ParentFont = False
        TabOrder = 5
+        Text = #26579#33394#38754#26009
        OnChange = HXTypeChange
        Items.Strings = (
          ''
@ -320,8 +322,8 @@ object frmMLMangeYH: TfrmMLMangeYH
    object cxGrid1: TcxGrid
      Left = 2
      Top = 43
-      Width = 1279
-      Height = 581
+      Width = 1287
+      Height = 589
      Align = alClient
      PopupMenu = PopupMenu1
      TabOrder = 1
--- a/云翔生产管理(MYSC.dll)/U_MLMangeYH.pas
+++ b/云翔生产管理(MYSC.dll)/U_MLMangeYH.pas
@ -13,7 +13,20 @@ uses
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxTextEdit, cxButtonEdit,
  Menus, cxLookAndFeelPainters, cxButtons, cxImage, BtnEdit, jpeg,
-  cxLookAndFeels, cxNavigator;
+  cxLookAndFeels, 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
  TfrmMLMangeYH = class(TForm)
--- a/云翔生产管理(MYSC.dll)/U_PBCGRKList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_PBCGRKList.dfm
@ -178,9 +178,6 @@ object frmPBCGRKList: TfrmPBCGRKList
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Sorting = False
-        SortIndex = 0
-        SortOrder = soAscending
        Width = 116
      end
      object v1Column7: TcxGridDBColumn
--- a/云翔生产管理(MYSC.dll)/U_PBCGRKList.pas
+++ b/云翔生产管理(MYSC.dll)/U_PBCGRKList.pas
@ -11,20 +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, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, BtnEdit, dxSkinsCore,  
-     dxSkinDarkRoom,
-    
-     
-     
-    
-    
-    
-    
-   dxSkinOffice2013White, 
-     dxSkinSharpPlus,
-   dxSkinSpringTime,  
-   dxSkinsDefaultPainters, 
-     dxSkinscxPCPainter;
+  cxNavigator, BtnEdit, 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
  TfrmPBCGRKList = class(TForm)
@ -350,7 +350,8 @@ end;

 procedure TfrmPBCGRKList.InitForm();
 begin
-  BegDate.Date := StrToDate(formatdatetime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
+//  BegDate.Date := StrToDate(formatdatetime('yyyy-MM', SGetServerDate(ADOQueryTemp)) + '-01');
+  BegDate.Date := SGetServerDate(ADOQueryTemp);
  EndDate.Date := SGetServerDate(ADOQueryTemp);
  ReadCxGrid('采购入库2', Tv1, '贸易生产管理');
  if canshu1 = '高权限' then
--- a/云翔生产管理(MYSC.dll)/U_PBCGRKList_RCDJ.pas
+++ b/云翔生产管理(MYSC.dll)/U_PBCGRKList_RCDJ.pas
@ -24,7 +24,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
  TfrmPBCGRKList_RCDJ = class(TForm)
--- a/云翔生产管理(MYSC.dll)/U_XCGRKList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_XCGRKList.dfm
@ -7,7 +7,7 @@ object frmXCGRKList: TfrmXCGRKList
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
  Font.Name = #23435#20307
  Font.Style = []
  OldCreateOrder = False
@ -15,12 +15,12 @@ object frmXCGRKList: TfrmXCGRKList
  OnCreate = FormCreate
  OnDestroy = FormDestroy
  OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1362
+    Width = 1370
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 65
@ -121,15 +121,15 @@ object frmXCGRKList: TfrmXCGRKList
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 114
-    Width = 1362
-    Height = 541
+    Top = 107
+    Width = 1370
+    Height = 557
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
    object Tv1: TcxGridDBTableView
      OnDblClick = Tv1DblClick
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -173,7 +173,6 @@ object frmXCGRKList: TfrmXCGRKList
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Sorting = False
        SortIndex = 0
        SortOrder = soAscending
        Width = 116
@ -294,100 +293,100 @@ object frmXCGRKList: TfrmXCGRKList
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1362
-    Height = 82
+    Width = 1370
+    Height = 75
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 1
    object Label34: TLabel
-      Left = 255
-      Top = 20
-      Width = 85
-      Height = 16
+      Left = 235
+      Top = 18
+      Width = 80
+      Height = 15
      Caption = #20379#24212#21830#31616#31216
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label2: TLabel
-      Left = 38
-      Top = 20
-      Width = 34
-      Height = 16
+      Left = 35
+      Top = 18
+      Width = 32
+      Height = 15
      Caption = #21697#21517
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label1: TLabel
-      Left = 38
-      Top = 48
-      Width = 34
-      Height = 16
+      Left = 35
+      Top = 44
+      Width = 32
+      Height = 15
      Caption = #22791#27880
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label3: TLabel
-      Left = 255
-      Top = 48
-      Width = 102
-      Height = 16
+      Left = 235
+      Top = 44
+      Width = 96
+      Height = 15
      Caption = #36827#20179#21333#20301#31616#31216
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label4: TLabel
-      Left = 631
-      Top = 20
-      Width = 51
-      Height = 16
+      Left = 582
+      Top = 18
+      Width = 48
+      Height = 15
      Caption = #21046#20316#20154
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label5: TLabel
-      Left = 629
-      Top = 48
-      Width = 51
-      Height = 16
+      Left = 581
+      Top = 44
+      Width = 48
+      Height = 15
      Caption = #37319#36141#20154
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object KHNameJC: TEdit
      Tag = 2
-      Left = 363
-      Top = 15
-      Width = 128
+      Left = 335
+      Top = 14
+      Width = 118
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -395,30 +394,30 @@ object frmXCGRKList: TfrmXCGRKList
      OnChange = CustomerNoNameChange
    end
    object BegDate: TDateTimePicker
-      Left = 895
-      Top = 15
-      Width = 129
-      Height = 24
+      Left = 826
+      Top = 14
+      Width = 119
+      Height = 23
      Date = 40768.458268587970000000
      Time = 40768.458268587970000000
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 5
    end
    object EndDate: TDateTimePicker
-      Left = 895
-      Top = 44
-      Width = 129
-      Height = 24
+      Left = 826
+      Top = 41
+      Width = 119
+      Height = 23
      Date = 40768.458268587970000000
      Time = 40768.458268587970000000
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -426,13 +425,13 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object MYName: TEdit
      Tag = 2
-      Left = 76
-      Top = 15
-      Width = 152
+      Left = 70
+      Top = 14
+      Width = 140
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -441,13 +440,13 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object Note: TEdit
      Tag = 2
-      Left = 76
-      Top = 44
-      Width = 152
+      Left = 70
+      Top = 41
+      Width = 140
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -455,14 +454,14 @@ object frmXCGRKList: TfrmXCGRKList
      OnChange = CustomerNoNameChange
    end
    object CheckBox1: TCheckBox
-      Left = 803
-      Top = 18
-      Width = 89
-      Height = 17
+      Left = 741
+      Top = 17
+      Width = 82
+      Height = 15
      Caption = #26597#35810#26085#26399
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -470,23 +469,23 @@ object frmXCGRKList: TfrmXCGRKList
      OnClick = CheckBox1Click
    end
    object Button2: TButton
-      Left = 492
-      Top = 14
-      Width = 29
-      Height = 26
+      Left = 454
+      Top = 13
+      Width = 27
+      Height = 24
      Caption = '...'
      TabOrder = 0
      OnClick = Button2Click
    end
    object JCDanWeiJC: TEdit
      Tag = 2
-      Left = 363
-      Top = 44
-      Width = 128
+      Left = 335
+      Top = 41
+      Width = 118
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -494,23 +493,23 @@ object frmXCGRKList: TfrmXCGRKList
      OnChange = CustomerNoNameChange
    end
    object Button1: TButton
-      Left = 492
-      Top = 43
-      Width = 29
-      Height = 26
+      Left = 454
+      Top = 40
+      Width = 27
+      Height = 24
      Caption = '...'
      TabOrder = 7
      OnClick = Button1Click
    end
    object filler: TEdit
      Tag = 2
-      Left = 686
-      Top = 15
-      Width = 90
+      Left = 633
+      Top = 14
+      Width = 83
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -519,13 +518,13 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object KHNo: TEdit
      Tag = 2
-      Left = 522
-      Top = 15
-      Width = 89
+      Left = 482
+      Top = 14
+      Width = 82
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -534,13 +533,13 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object JCKHNo: TEdit
      Tag = 2
-      Left = 522
-      Top = 44
-      Width = 89
+      Left = 482
+      Top = 41
+      Width = 82
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -549,13 +548,13 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object CGName: TEdit
      Tag = 2
-      Left = 686
-      Top = 43
-      Width = 91
+      Left = 633
+      Top = 40
+      Width = 84
      Height = 24
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -564,27 +563,27 @@ object frmXCGRKList: TfrmXCGRKList
    end
  end
  object cxGroupBox2: TcxGroupBox
-    Left = 840
-    Top = 141
+    Left = 775
+    Top = 130
    Caption = #30721#21333'('#25991#20214')'#19978#20256
    ParentColor = False
    ParentFont = False
    Style.Color = clBtnFace
    Style.Font.Charset = GB2312_CHARSET
    Style.Font.Color = clBlue
-    Style.Font.Height = -16
+    Style.Font.Height = -15
    Style.Font.Name = #24494#36719#38597#40657
    Style.Font.Style = [fsBold]
    Style.IsFontAssigned = True
    TabOrder = 3
    Visible = False
-    Height = 266
-    Width = 385
+    Height = 246
+    Width = 356
    object Image3: TImage
-      Left = 358
+      Left = 330
      Top = 2
-      Width = 24
-      Height = 18
+      Width = 23
+      Height = 16
      ParentShowHint = False
      Picture.Data = {
        07544269746D617076040000424D760400000000000036000000280000001500
@ -630,14 +629,14 @@ object frmXCGRKList: TfrmXCGRKList
    end
    object ListView1: TListView
      Left = 2
-      Top = 25
-      Width = 381
-      Height = 239
+      Top = 24
+      Width = 352
+      Height = 220
      Align = alClient
      Columns = <>
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -15
+      Font.Height = -13
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      LargeImages = ImageList1
@ -646,34 +645,34 @@ object frmXCGRKList: TfrmXCGRKList
      OnDblClick = ListView1DblClick
    end
    object Panel12: TPanel
-      Left = 33
-      Top = 75
-      Width = 323
-      Height = 106
+      Left = 30
+      Top = 69
+      Width = 299
+      Height = 98
      TabOrder = 1
      Visible = False
      object Label8: TLabel
-        Left = 11
-        Top = 35
-        Width = 64
-        Height = 15
+        Left = 10
+        Top = 32
+        Width = 56
+        Height = 13
        Caption = #25991#20214#21517#31216
        Font.Charset = GB2312_CHARSET
        Font.Color = clBlack
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
      end
      object Button3: TButton
-        Left = 15
-        Top = 65
-        Width = 83
-        Height = 27
+        Left = 14
+        Top = 60
+        Width = 76
+        Height = 25
        Caption = #26159
        Font.Charset = GB2312_CHARSET
        Font.Color = clBlack
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
@ -683,8 +682,8 @@ object frmXCGRKList: TfrmXCGRKList
      object Panel13: TPanel
        Left = 1
        Top = 1
-        Width = 321
-        Height = 23
+        Width = 297
+        Height = 21
        Align = alTop
        Alignment = taLeftJustify
        BevelOuter = bvNone
@ -692,16 +691,16 @@ object frmXCGRKList: TfrmXCGRKList
        Color = clSkyBlue
        Font.Charset = GB2312_CHARSET
        Font.Color = clRed
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
        TabOrder = 0
        object Image1: TImage
-          Left = 297
+          Left = 274
          Top = 2
-          Width = 24
-          Height = 18
+          Width = 22
+          Height = 16
          ParentShowHint = False
          Picture.Data = {
            07544269746D617076040000424D760400000000000036000000280000001500
@ -747,27 +746,27 @@ object frmXCGRKList: TfrmXCGRKList
        end
      end
      object WJName: TEdit
-        Left = 80
-        Top = 30
-        Width = 232
+        Left = 74
+        Top = 28
+        Width = 214
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clBlack
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
        TabOrder = 1
      end
      object Button7: TButton
-        Left = 228
-        Top = 65
-        Width = 81
-        Height = 27
+        Left = 210
+        Top = 60
+        Width = 75
+        Height = 25
        Caption = #21542
        Font.Charset = GB2312_CHARSET
        Font.Color = clBlack
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
@ -775,27 +774,27 @@ object frmXCGRKList: TfrmXCGRKList
        OnClick = Button7Click
      end
      object WJPach: TEdit
-        Left = 94
-        Top = 208
-        Width = 323
+        Left = 87
+        Top = 192
+        Width = 298
        Height = 29
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
-        Font.Height = -21
+        Font.Height = -20
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
        TabOrder = 5
      end
      object Button8: TButton
-        Left = 119
-        Top = 65
-        Width = 83
-        Height = 27
+        Left = 110
+        Top = 60
+        Width = 76
+        Height = 25
        Caption = #30830#23450
        Font.Charset = GB2312_CHARSET
        Font.Color = clBlack
-        Font.Height = -15
+        Font.Height = -13
        Font.Name = #23435#20307
        Font.Style = [fsBold]
        ParentFont = False
@ -804,16 +803,16 @@ object frmXCGRKList: TfrmXCGRKList
      end
    end
    object Panel3: TPanel
-      Left = 62
-      Top = 119
-      Width = 283
-      Height = 34
+      Left = 57
+      Top = 110
+      Width = 261
+      Height = 31
      BevelOuter = bvNone
      Caption = #27491#22312#20445#23384#25968#25454#65292#35831#31245#21518#12290#12290#12290
      Color = clSkyBlue
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
-      Font.Height = -16
+      Font.Height = -15
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -822,20 +821,20 @@ object frmXCGRKList: TfrmXCGRKList
    end
  end
  object Panel4: TPanel
-    Left = 1145
-    Top = 145
-    Width = 207
-    Height = 194
+    Left = 1057
+    Top = 134
+    Width = 191
+    Height = 179
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 4
    Visible = False
    object Image4: TImage
-      Left = 178
+      Left = 164
      Top = 3
-      Width = 24
-      Height = 18
+      Width = 22
+      Height = 16
      ParentShowHint = False
      Picture.Data = {
        07544269746D617076040000424D760400000000000036000000280000001500
@ -880,28 +879,28 @@ object frmXCGRKList: TfrmXCGRKList
      OnClick = Image4Click
    end
    object SpeedButton3: TSpeedButton
-      Left = 28
-      Top = 25
-      Width = 149
-      Height = 64
+      Left = 26
+      Top = 23
+      Width = 137
+      Height = 59
      Caption = #38754#32447
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      OnClick = SpeedButton3Click
    end
    object SpeedButton4: TSpeedButton
-      Left = 28
-      Top = 106
-      Width = 149
-      Height = 64
+      Left = 26
+      Top = 98
+      Width = 137
+      Height = 59
      Caption = #24213#32447
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
@ -909,20 +908,20 @@ object frmXCGRKList: TfrmXCGRKList
    end
  end
  object Panel2: TPanel
-    Left = 936
-    Top = 148
-    Width = 207
-    Height = 194
+    Left = 864
+    Top = 137
+    Width = 191
+    Height = 179
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 5
    Visible = False
    object Image2: TImage
-      Left = 178
+      Left = 164
      Top = 3
-      Width = 24
-      Height = 18
+      Width = 22
+      Height = 16
      ParentShowHint = False
      Picture.Data = {
        07544269746D617076040000424D760400000000000036000000280000001500
@ -967,28 +966,28 @@ object frmXCGRKList: TfrmXCGRKList
      OnClick = Image2Click
    end
    object SpeedButton1: TSpeedButton
-      Left = 30
-      Top = 25
-      Width = 149
-      Height = 64
+      Left = 28
+      Top = 23
+      Width = 137
+      Height = 59
      Caption = #38754#32447
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      OnClick = SpeedButton1Click
    end
    object SpeedButton2: TSpeedButton
-      Left = 30
-      Top = 106
-      Width = 149
-      Height = 64
+      Left = 28
+      Top = 98
+      Width = 137
+      Height = 59
      Caption = #24213#32447
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
--- a/云翔生产管理(MYSC.dll)/U_XCGRKList.pas
+++ b/云翔生产管理(MYSC.dll)/U_XCGRKList.pas
@ -12,7 +12,22 @@ uses
  RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls,
  Menus, cxButtonEdit, cxDropDownEdit, cxPC, Buttons, cxContainer,
  cxGroupBox, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
-  IdFTP,ShellAPI, ImgList,StrUtils;
+  IdFTP,ShellAPI, ImgList,StrUtils, 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
  TfrmXCGRKList = class(TForm)
--- a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm
@ -363,6 +363,45 @@ object frmZHCPInPut: TfrmZHCPInPut
      Font.Style = [fsBold]
      ParentFont = False
    end
+    object Panel4: TPanel
+      Left = 824
+      Top = 53
+      Width = 541
+      Height = 121
+      Color = clSkyBlue
+      TabOrder = 24
+      Visible = False
+      object Button3: TButton
+        Left = 72
+        Top = 36
+        Width = 149
+        Height = 57
+        Caption = #26825
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -35
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        TabOrder = 0
+        OnClick = Button3Click
+      end
+      object Button4: TButton
+        Left = 292
+        Top = 35
+        Width = 149
+        Height = 57
+        Caption = #38754#26009
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        TabOrder = 1
+        OnClick = Button4Click
+      end
+    end
    object Panel6: TPanel
      Left = 520
      Top = 48
@ -933,45 +972,6 @@ object frmZHCPInPut: TfrmZHCPInPut
      ParentFont = False
      TabOrder = 23
    end
-    object Panel4: TPanel
-      Left = 824
-      Top = 53
-      Width = 541
-      Height = 121
-      Color = clSkyBlue
-      TabOrder = 24
-      Visible = False
-      object Button3: TButton
-        Left = 72
-        Top = 36
-        Width = 149
-        Height = 57
-        Caption = #26825
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -35
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
-        ParentFont = False
-        TabOrder = 0
-        OnClick = Button3Click
-      end
-      object Button4: TButton
-        Left = 292
-        Top = 35
-        Width = 149
-        Height = 57
-        Caption = #38754#26009
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -32
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
-        ParentFont = False
-        TabOrder = 1
-        OnClick = Button4Click
-      end
-    end
    object TSHGYCB: TEdit
      Tag = 9
      Left = 938
--- a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas
@ -486,17 +486,17 @@ begin
      Exit;
    end;

-    if (Trim(DiBu.Text) = '') and (Trim(DiBuName.Text) = '') then
-    begin
-      Application.MessageBox('底布编号和底布名称不能都为空!', '提示', 0);
-      Exit;
-    end;
+//    if (Trim(DiBu.Text) = '') and (Trim(DiBuName.Text) = '') then
+//    begin
+//      Application.MessageBox('底布编号和底布名称不能都为空!', '提示', 0);
+//      Exit;
+//    end;

-    if Trim(MianBuName.Text) = '' then
-    begin
-      Application.MessageBox('面布名称不能为空!', '提示', 0);
-      Exit;
-    end;
+//    if Trim(MianBuName.Text) = '' then
+//    begin
+//      Application.MessageBox('面布名称不能为空!', '提示', 0);
+//      Exit;
+//    end;

    if Trim(MHDJ.Text) = '' then
    begin
--- a/云翔生产管理(MYSC.dll)/U_ZHCPList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPList.dfm
@ -86,8 +86,30 @@ object frmZHCPList: TfrmZHCPList
      ImageIndex = 4
      OnClick = ToolButton4Click
    end
-    object Panel3: TPanel
+    object LabelType: TComboBox
      Left = 410
+      Top = 1
+      Width = 110
+      Height = 28
+      Style = csDropDownList
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ItemHeight = 20
+      ItemIndex = 2
+      ParentFont = False
+      TabOrder = 2
+      Text = #23458#25143#26631#31614
+      Items.Strings = (
+        #22823#26631#31614
+        #23567#26631#31614
+        #23458#25143#26631#31614
+        #20844#21496#26631#31614)
+    end
+    object Panel3: TPanel
+      Left = 520
      Top = 0
      Width = 113
      Height = 30
@ -111,7 +133,7 @@ object frmZHCPList: TfrmZHCPList
      end
    end
    object Panel8: TPanel
-      Left = 523
+      Left = 633
      Top = 0
      Width = 115
      Height = 30
@ -168,7 +190,7 @@ object frmZHCPList: TfrmZHCPList
      end
    end
    object TBExport: TToolButton
-      Left = 638
+      Left = 748
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -177,7 +199,7 @@ object frmZHCPList: TfrmZHCPList
      OnClick = TBExportClick
    end
    object TBClose: TToolButton
-      Left = 707
+      Left = 817
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -516,205 +538,250 @@ object frmZHCPList: TfrmZHCPList
      Color = clSkyBlue
      TabOrder = 1
      object Label2: TLabel
-        Left = 36
+        Left = 4
        Top = 12
-        Width = 32
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #32534#21495
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label6: TLabel
-        Left = 199
+        Left = 176
        Top = 12
-        Width = 32
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #21697#21517
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label7: TLabel
-        Left = 433
+        Left = 536
        Top = 12
-        Width = 32
+        Width = 80
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #24037#33402
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label8: TLabel
-        Left = 662
+        Left = 896
        Top = 12
-        Width = 48
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #20462#25913#20154
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label1: TLabel
-        Left = 541
+        Left = 724
        Top = 12
-        Width = 48
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #30331#35760#20154
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label5: TLabel
-        Left = 894
-        Top = 12
-        Width = 32
+        Left = 1068
+        Top = 44
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #22791#27880
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label13: TLabel
-        Left = 784
+        Left = 1068
        Top = 12
-        Width = 32
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #23458#25143
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label14: TLabel
-        Left = 312
+        Left = 348
        Top = 12
-        Width = 32
+        Width = 80
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #31867#22411
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label16: TLabel
-        Left = 1006
-        Top = 12
-        Width = 32
+        Left = 1240
+        Top = 44
+        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #33457#22411
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label17: TLabel
-        Left = 6
+        Left = 4
        Top = 44
        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #38754#24067#32534#21495
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label18: TLabel
-        Left = 167
+        Left = 176
        Top = 44
        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #38754#24067#21517#31216
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label19: TLabel
-        Left = 313
+        Left = 348
        Top = 44
        Width = 80
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #20013#38388#23618#32534#21495
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label20: TLabel
-        Left = 488
+        Left = 536
        Top = 44
        Width = 80
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #20013#38388#23618#21517#31216
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label21: TLabel
-        Left = 646
+        Left = 724
        Top = 44
        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #24213#24067#32534#21495
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object Label22: TLabel
-        Left = 808
+        Left = 896
        Top = 44
        Width = 64
        Height = 15
+        Alignment = taRightJustify
+        BiDiMode = bdLeftToRight
        Caption = #24213#24067#21517#31216
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -15
        Font.Name = #23435#20307
        Font.Style = [fsBold]
+        ParentBiDiMode = False
        ParentFont = False
      end
      object ZIName: TEdit
        Tag = 2
-        Left = 234
+        Left = 244
        Top = 8
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -727,9 +794,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object ZIGY: TEdit
        Tag = 2
-        Left = 467
+        Left = 620
        Top = 8
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -742,9 +809,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object Editer: TEdit
        Tag = 2
-        Left = 711
+        Left = 964
        Top = 8
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -757,9 +824,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object Filler: TEdit
        Tag = 2
-        Left = 590
+        Left = 792
        Top = 8
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -772,9 +839,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object Note: TEdit
        Tag = 2
-        Left = 929
-        Top = 8
-        Width = 65
+        Left = 1136
+        Top = 40
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -787,9 +854,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object KHNameHZ: TEdit
        Tag = 2
-        Left = 819
+        Left = 1136
        Top = 8
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -802,9 +869,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object ZIType: TComboBox
        Tag = 1
-        Left = 348
+        Left = 432
        Top = 8
-        Width = 81
+        Width = 100
        Height = 23
        Style = csDropDownList
        Font.Charset = GB2312_CHARSET
@ -824,9 +891,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object HXNO: TEdit
        Tag = 3
-        Left = 1041
-        Top = 8
-        Width = 65
+        Left = 1308
+        Top = 40
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -839,9 +906,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object ZIID: TEdit
        Tag = 2
-        Left = 74
+        Left = 72
        Top = 7
-        Width = 80
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -854,9 +921,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object MianBuName: TEdit
        Tag = 2
-        Left = 234
+        Left = 244
        Top = 40
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -869,9 +936,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object MianBu: TEdit
        Tag = 2
-        Left = 74
+        Left = 72
        Top = 40
-        Width = 80
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -884,9 +951,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object ZhongJianCName: TEdit
        Tag = 2
-        Left = 572
+        Left = 620
        Top = 40
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -899,9 +966,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object ZhongJianC: TEdit
        Tag = 2
-        Left = 395
+        Left = 432
        Top = 40
-        Width = 80
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -914,9 +981,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object DiBuName: TEdit
        Tag = 2
-        Left = 881
+        Left = 964
        Top = 40
-        Width = 65
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -929,9 +996,9 @@ object frmZHCPList: TfrmZHCPList
      end
      object DiBu: TEdit
        Tag = 2
-        Left = 715
+        Left = 792
        Top = 40
-        Width = 80
+        Width = 100
        Height = 23
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
--- a/云翔生产管理(MYSC.dll)/U_ZHCPList.pas
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPList.pas
@ -144,6 +144,7 @@ type
    SpeedButton7: TSpeedButton;
    Tv1Column9: TcxGridDBColumn;
    TbCopy: TToolButton;
+    LabelType: TComboBox;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -542,6 +543,7 @@ begin
    Panel5.Visible := False;
    TbCopy.Visible := False;
  end;
+  ZIID.SetFocus;
  //InitGrid();
 end;

@ -789,7 +791,22 @@ end;

 procedure TfrmZHCPList.ToolButton4Click(Sender: TObject);
 begin
-  panel7.Visible := true;
+  if LabelType.Text = '大标签' then
+  begin
+     SpeedButton3.Click;
+  end;
+  if LabelType.Text = '小标签' then
+  begin
+     SpeedButton4.Click;
+  end;
+  if LabelType.Text = '客户标签' then
+  begin
+     SpeedButton5.Click;
+  end;
+  if LabelType.Text = '公司标签' then
+  begin
+     SpeedButton7.Click;
+  end;
 end;

 procedure TfrmZHCPList.Tv1DblClick(Sender: TObject);