diff --git a/云翔一码通/U_YMTJGWCList.dfm b/云翔一码通/U_YMTJGWCList.dfm
index 4e12394..d047b58 100644
--- a/云翔一码通/U_YMTJGWCList.dfm
+++ b/云翔一码通/U_YMTJGWCList.dfm
@@ -1,6 +1,6 @@
 object frmYMTJGWCList: TfrmYMTJGWCList
-  Left = 631
-  Top = 430
+  Left = 433
+  Top = 674
   Width = 1370
   Height = 750
   Caption = #21152#24037#23436#25104#22238#20179#25968#25454
@@ -321,34 +321,34 @@ object frmYMTJGWCList: TfrmYMTJGWCList
         Options.Editing = False
         Width = 83
       end
-      object TV1SHDanWei: TcxGridDBColumn
+      object TV1FactoryName: TcxGridDBColumn
         Tag = 2
         Caption = #21152#24037#21333#20301
-        DataBinding.FieldName = 'SHDanWei'
+        DataBinding.FieldName = 'FactoryName'
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.ReadOnly = True
         HeaderAlignmentHorz = taCenter
         Width = 101
       end
-      object TV1MXPrtName: TcxGridDBColumn
+      object TV1SPName: TcxGridDBColumn
         Tag = 2
         Caption = #21697#21517
-        DataBinding.FieldName = 'MXPrtName'
+        DataBinding.FieldName = 'SPName'
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.ReadOnly = True
         HeaderAlignmentHorz = taCenter
         Width = 97
       end
-      object TV1MXPrtColor: TcxGridDBColumn
+      object TV1SPColor: TcxGridDBColumn
         Caption = #39068#33394
-        DataBinding.FieldName = 'MXPrtColor'
+        DataBinding.FieldName = 'SPColor'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
       end
-      object TV1MXPrtHX: TcxGridDBColumn
+      object TV1SPHX: TcxGridDBColumn
         Caption = #33457#22411
-        DataBinding.FieldName = 'MXPrtHX'
+        DataBinding.FieldName = 'SPHX'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
diff --git a/云翔一码通/U_YMTJGWCList.pas b/云翔一码通/U_YMTJGWCList.pas
index a9df58f..11a8248 100644
--- a/云翔一码通/U_YMTJGWCList.pas
+++ b/云翔一码通/U_YMTJGWCList.pas
@@ -67,10 +67,10 @@ type
     TV1CRTime: TcxGridDBColumn;
     TV1CRType: TcxGridDBColumn;
     TV1FSId: TcxGridDBColumn;
-    TV1MXPrtColor: TcxGridDBColumn;
-    TV1MXPrtHX: TcxGridDBColumn;
-    TV1SHDanWei: TcxGridDBColumn;
-    TV1MXPrtName: TcxGridDBColumn;
+    TV1SPColor: TcxGridDBColumn;
+    TV1SPHX: TcxGridDBColumn;
+    TV1FactoryName: TcxGridDBColumn;
+    TV1SPName: TcxGridDBColumn;
     TV1Qty: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
     Label13: TLabel;
@@ -172,10 +172,9 @@ begin
       Filtered := False;
       Close;
       sql.Clear;
-      sql.Add(' select A.FromMXID, A.Qty, A.CRType, A.CRTime, A.KuWei,B.*, C.SHDanWei ');
+      sql.Add(' select A.*,B.FSId, B.SCConNo');
       sql.Add(' from YMT_CK_CR A');
-      sql.Add(' JOIN YMT_FHSQ_Sub B ON B.SSID = A.ToSSID');
-      sql.Add(' JOIN YMT_FHSQ_Main C ON C.FSId = B.FSId');
+      sql.Add(' JOIN YMT_FHSQ_Sub B ON B.SSID = A.FromSSID');
       sql.add(' where A.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
       sql.Add(' and A.CRTime<=''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
       sql.Add(' and isnull(A.CKName,'''')=''����''');
diff --git a/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.dfm b/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.dfm
index aa53894..d278ecb 100644
--- a/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.dfm
@@ -1,13 +1,13 @@
 object frmMLProductOrderNewList: TfrmMLProductOrderNewList
-  Left = 189
-  Top = 134
+  Left = 1165
+  Top = 440
   Width = 1121
   Height = 687
   Caption = #38754#26009#26579#33394#35745#21010#21333
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -12
   Font.Name = #23435#20307
   Font.Style = []
   OldCreateOrder = False
@@ -16,12 +16,12 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  PixelsPerInch = 107
-  TextHeight = 13
+  PixelsPerInch = 96
+  TextHeight = 12
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1105
+    Width = 1113
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 83
@@ -139,145 +139,145 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1105
-    Height = 66
+    Width = 1113
+    Height = 60
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
     object Label1: TLabel
-      Left = 25
-      Top = 14
-      Width = 56
-      Height = 13
+      Left = 23
+      Top = 13
+      Width = 52
+      Height = 12
       Caption = #19979#21333#26085#26399
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label3: TLabel
-      Left = 202
-      Top = 14
-      Width = 42
-      Height = 13
+      Left = 186
+      Top = 13
+      Width = 39
+      Height = 12
       Caption = #25351#31034#21333
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label4: TLabel
-      Left = 362
-      Top = 14
-      Width = 60
-      Height = 13
+      Left = 334
+      Top = 13
+      Width = 54
+      Height = 12
       Caption = #23458'    '#25143
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label9: TLabel
-      Left = 202
-      Top = 40
-      Width = 42
-      Height = 13
+      Left = 186
+      Top = 37
+      Width = 39
+      Height = 12
       Caption = #21512#21516#21495
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label12: TLabel
-      Left = 664
-      Top = 129
-      Width = 28
-      Height = 13
+      Left = 613
+      Top = 119
+      Width = 26
+      Height = 12
       Caption = #20811#37325
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 362
-      Top = 40
-      Width = 56
-      Height = 13
+      Left = 334
+      Top = 37
+      Width = 52
+      Height = 12
       Caption = #21152#24037#31867#22411
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 544
-      Top = 14
-      Width = 42
-      Height = 13
+      Left = 502
+      Top = 13
+      Width = 39
+      Height = 12
       Caption = #36319#21333#21592
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 544
-      Top = 40
-      Width = 42
-      Height = 13
+      Left = 502
+      Top = 37
+      Width = 39
+      Height = 12
       Caption = #19994#21153#21592
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label7: TLabel
-      Left = 704
-      Top = 14
-      Width = 56
-      Height = 13
+      Left = 650
+      Top = 13
+      Width = 52
+      Height = 12
       Caption = #23457#26680#29366#24577
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -13
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object BegDate: TDateTimePicker
-      Left = 83
-      Top = 10
-      Width = 97
-      Height = 21
+      Left = 77
+      Top = 9
+      Width = 89
+      Height = 20
       Date = 40675.464742650460000000
       Format = 'yyyy-MM-dd'
       Time = 40675.464742650460000000
       TabOrder = 0
     end
     object EndDate: TDateTimePicker
-      Left = 83
-      Top = 36
-      Width = 97
-      Height = 21
+      Left = 77
+      Top = 33
+      Width = 89
+      Height = 20
       Date = 40675.464761099540000000
       Format = 'yyyy-MM-dd'
       Time = 40675.464761099540000000
@@ -285,74 +285,74 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
     end
     object MLOrderNo: TEdit
       Tag = 2
-      Left = 246
-      Top = 10
-      Width = 84
+      Left = 227
+      Top = 9
+      Width = 78
       Height = 21
       TabOrder = 2
       OnChange = MLOrderNoChange
     end
     object KHName: TEdit
       Tag = 2
-      Left = 424
-      Top = 10
-      Width = 87
+      Left = 391
+      Top = 9
+      Width = 81
       Height = 21
       TabOrder = 3
       OnChange = MLOrderNoChange
     end
     object MLConNo: TEdit
       Tag = 2
-      Left = 246
-      Top = 36
-      Width = 84
+      Left = 227
+      Top = 33
+      Width = 78
       Height = 21
       TabOrder = 4
       OnChange = MLOrderNoChange
     end
     object MPRTKZ: TEdit
       Tag = 2
-      Left = 709
-      Top = 107
-      Width = 60
+      Left = 654
+      Top = 99
+      Width = 56
       Height = 21
       TabOrder = 5
       OnChange = MLOrderNoChange
     end
     object JGType: TEdit
       Tag = 2
-      Left = 424
-      Top = 36
-      Width = 87
+      Left = 391
+      Top = 33
+      Width = 81
       Height = 21
       TabOrder = 6
       OnChange = MLOrderNoChange
     end
     object GenDan: TEdit
       Tag = 2
-      Left = 591
-      Top = 10
-      Width = 87
+      Left = 546
+      Top = 9
+      Width = 80
       Height = 21
       TabOrder = 7
       OnChange = MLOrderNoChange
     end
     object YWY: TEdit
       Tag = 2
-      Left = 591
-      Top = 36
-      Width = 87
+      Left = 546
+      Top = 33
+      Width = 80
       Height = 21
       TabOrder = 8
       OnChange = MLOrderNoChange
     end
     object status: TComboBox
       Tag = 2
-      Left = 764
-      Top = 10
-      Width = 112
-      Height = 21
-      ItemHeight = 13
+      Left = 705
+      Top = 9
+      Width = 104
+      Height = 20
+      ItemHeight = 12
       TabOrder = 9
       OnChange = MLOrderNoChange
       Items.Strings = (
@@ -364,15 +364,15 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
   end
   object Cxgrid1: TcxGrid
     Left = 0
-    Top = 98
-    Width = 1105
-    Height = 329
+    Top = 92
+    Width = 1113
+    Height = 361
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -476,23 +476,23 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
     end
   end
   object Panel4: TPanel
-    Left = 555
-    Top = 124
-    Width = 251
-    Height = 234
+    Left = 512
+    Top = 114
+    Width = 232
+    Height = 216
     TabOrder = 3
     Visible = False
     object Label14: TLabel
-      Left = 52
-      Top = 95
-      Width = 7
-      Height = 13
+      Left = 48
+      Top = 88
+      Width = 6
+      Height = 12
     end
     object Panel10: TPanel
       Left = 1
       Top = 1
-      Width = 249
-      Height = 25
+      Width = 230
+      Height = 23
       Align = alTop
       Alignment = taLeftJustify
       BevelOuter = bvNone
@@ -500,17 +500,17 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
       Color = clSkyBlue
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -18
+      Font.Height = -17
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 0
       OnMouseMove = Panel10MouseMove
       object Image2: TImage
-        Left = 223
+        Left = 206
         Top = 3
-        Width = 24
-        Height = 18
+        Width = 22
+        Height = 16
         ParentShowHint = False
         Picture.Data = {
           07544269746D617076040000424D760400000000000036000000280000001500
@@ -556,19 +556,19 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
       end
     end
     object Button1: TButton
-      Left = 84
-      Top = 198
-      Width = 81
-      Height = 27
+      Left = 78
+      Top = 183
+      Width = 74
+      Height = 25
       Caption = #30830#23450
       TabOrder = 1
       OnClick = Button1Click
     end
     object RadioGroup1: TRadioGroup
-      Left = 48
-      Top = 27
-      Width = 161
-      Height = 166
+      Left = 44
+      Top = 25
+      Width = 149
+      Height = 153
       ItemIndex = 0
       Items.Strings = (
         #38754#26009#35745#21010#21333
@@ -578,8 +578,8 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 427
-    Width = 1105
+    Top = 453
+    Width = 1113
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
@@ -587,21 +587,21 @@ object frmMLProductOrderNewList: TfrmMLProductOrderNewList
   end
   object Panel2: TPanel
     Left = 0
-    Top = 435
-    Width = 1105
-    Height = 212
+    Top = 461
+    Width = 1113
+    Height = 195
     Align = alBottom
     BevelOuter = bvNone
     TabOrder = 5
     object cxGrid2: TcxGrid
       Left = 0
       Top = 0
-      Width = 1105
-      Height = 212
+      Width = 1113
+      Height = 195
       Align = alClient
       TabOrder = 0
       object TV2: TcxGridDBTableView
-        NavigatorButtons.ConfirmDelete = False
+        Navigator.Buttons.CustomButtons = <>
         DataController.DataSource = DataSource2
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
         DataController.Summary.DefaultGroupSummaryItems = <
diff --git a/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.pas b/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.pas
index 84e164e..6578c9e 100644
--- a/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.pas
+++ b/云翔生产管理(MYSC.dll)/U_MLProductOrderNewList.pas
@@ -13,7 +13,22 @@ uses
   cxDBEdit, Menus, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System,
   RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu, cxPC, cxSplitter,
   IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,
-  cxCheckBox;
+  cxCheckBox, 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
   TfrmMLProductOrderNewList = class(TForm)
diff --git a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm
index 7ca7707..fdd272b 100644
--- a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.dfm
@@ -1,6 +1,6 @@
 object frmZHCPInPut: TfrmZHCPInPut
-  Left = 243
-  Top = 133
+  Left = 852
+  Top = 266
   Width = 1431
   Height = 770
   Caption = #20844#21496#20135#21697#24405#20837
@@ -87,49 +87,9 @@ object frmZHCPInPut: TfrmZHCPInPut
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
-    object Image11: TImage
-      Left = 364
-      Top = 90
-      Width = 57
-      Height = 49
-      Visible = False
-    end
-    object Image22: TImage
-      Left = 353
-      Top = 260
-      Width = 75
-      Height = 57
-      Visible = False
-    end
-    object Label5: TLabel
-      Left = 577
-      Top = 336
-      Width = 64
-      Height = 15
-      Caption = #21407#22270#35828#26126
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
-    object Label6: TLabel
-      Left = 135
-      Top = 335
-      Width = 64
-      Height = 15
-      Caption = #21407#22270#35828#26126
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
     object Label7: TLabel
       Left = 579
-      Top = 384
+      Top = 355
       Width = 59
       Height = 15
       Caption = #22791'   '#27880
@@ -142,7 +102,7 @@ object frmZHCPInPut: TfrmZHCPInPut
     end
     object Label8: TLabel
       Left = 136
-      Top = 387
+      Top = 358
       Width = 59
       Height = 15
       Caption = #21697'   '#21517
@@ -155,7 +115,7 @@ object frmZHCPInPut: TfrmZHCPInPut
     end
     object Label9: TLabel
       Left = 136
-      Top = 440
+      Top = 411
       Width = 66
       Height = 15
       Caption = #21407' '#22791' '#27880
@@ -363,61 +323,12 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
-    object Panel4: TPanel
-      Left = 824
-      Top = 53
-      Width = 541
-      Height = 121
-      Color = clSkyBlue
-      TabOrder = 24
+    object image22: TImage
+      Left = 560
+      Top = 260
+      Width = 75
+      Height = 57
       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
-      Width = 294
-      Height = 274
-      BevelInner = bvRaised
-      BevelOuter = bvLowered
-      TabOrder = 0
-      object Image1: TImage
-        Left = 200
-        Top = 208
-        Width = 75
-        Height = 57
-        Visible = False
-        OnDblClick = Image1DblClick
-      end
     end
     object Panel5: TPanel
       Left = 2
@@ -425,7 +336,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Width = 1419
       Height = 38
       Align = alTop
-      TabOrder = 1
+      TabOrder = 0
       object Label12: TLabel
         Left = 208
         Top = 12
@@ -505,8 +416,8 @@ object frmZHCPInPut: TfrmZHCPInPut
         ParentFont = False
       end
       object Label10: TLabel
-        Left = 1068
-        Top = 9
+        Left = 833
+        Top = 12
         Width = 48
         Height = 15
         Caption = #20135#37327#65306
@@ -518,8 +429,8 @@ object frmZHCPInPut: TfrmZHCPInPut
         ParentFont = False
       end
       object Label11: TLabel
-        Left = 829
-        Top = 9
+        Left = 981
+        Top = 12
         Width = 64
         Height = 15
         Caption = #33457#22411#21495#65306
@@ -530,6 +441,19 @@ object frmZHCPInPut: TfrmZHCPInPut
         Font.Style = [fsBold]
         ParentFont = False
       end
+      object Label1: TLabel
+        Left = 1220
+        Top = 12
+        Width = 80
+        Height = 15
+        Caption = #33457#22411#21517#31216#65306
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -15
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
       object ZIKZ: TEdit
         Tag = 2
         Left = 277
@@ -562,7 +486,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       object ZICF: TEdit
         Tag = 2
         Left = 435
-        Top = 8
+        Top = 9
         Width = 207
         Height = 21
         Font.Charset = GB2312_CHARSET
@@ -577,7 +501,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       object ZIID: TEdit
         Tag = 9
         Left = 702
-        Top = 8
+        Top = 9
         Width = 111
         Height = 21
         Color = clMenu
@@ -592,8 +516,8 @@ object frmZHCPInPut: TfrmZHCPInPut
       end
       object ZICL: TEdit
         Tag = 2
-        Left = 1110
-        Top = 6
+        Left = 875
+        Top = 9
         Width = 97
         Height = 21
         Font.Charset = GB2312_CHARSET
@@ -607,8 +531,8 @@ object frmZHCPInPut: TfrmZHCPInPut
       end
       object HXNO: TBtnEditC
         Tag = 2
-        Left = 890
-        Top = 5
+        Left = 1042
+        Top = 9
         Width = 175
         Height = 21
         Font.Charset = GB2312_CHARSET
@@ -621,52 +545,31 @@ object frmZHCPInPut: TfrmZHCPInPut
         OnBtnUpClick = HXNOBtnUpClick
         OnBtnDnClick = HXNOBtnDnClick
       end
-    end
-    object Panel8: TPanel
-      Left = 437
-      Top = 48
-      Width = 86
-      Height = 274
-      BevelInner = bvRaised
-      BevelOuter = bvLowered
-      TabOrder = 2
-      object Label1: TLabel
-        Left = 10
-        Top = 48
-        Width = 72
-        Height = 17
-        Caption = #26631#31614#22270#29255
+      object HXNM: TEdit
+        Tag = 2
+        Left = 1302
+        Top = 9
+        Width = 97
+        Height = 21
         Font.Charset = GB2312_CHARSET
         Font.Color = clWindowText
-        Font.Height = -17
+        Font.Height = -13
         Font.Name = #23435#20307
         Font.Style = [fsBold]
         ParentFont = False
-      end
-      object Button1: TButton
-        Left = 5
-        Top = 101
-        Width = 75
-        Height = 56
-        Caption = #36873#25321#22270#29255
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
-        ParentFont = False
-        TabOrder = 0
-        OnClick = Button1Click
+        ReadOnly = True
+        TabOrder = 6
       end
     end
     object Panel66: TPanel
-      Left = 12
+      Left = 219
       Top = 48
       Width = 247
       Height = 274
       BevelInner = bvRaised
       BevelOuter = bvLowered
-      TabOrder = 3
+      PopupMenu = pm1
+      TabOrder = 1
       object Image2: TImage
         Left = 161
         Top = 208
@@ -695,21 +598,6 @@ object frmZHCPInPut: TfrmZHCPInPut
           Font.Style = [fsBold]
           ParentFont = False
         end
-        object btn1: TButton
-          Left = 9
-          Top = 55
-          Width = 51
-          Height = 26
-          Caption = #26159
-          Font.Charset = GB2312_CHARSET
-          Font.Color = clBlack
-          Font.Height = -13
-          Font.Name = #23435#20307
-          Font.Style = [fsBold]
-          ParentFont = False
-          TabOrder = 2
-          OnClick = Button2Click
-        end
         object Panel13: TPanel
           Left = 1
           Top = 1
@@ -773,11 +661,12 @@ object frmZHCPInPut: TfrmZHCPInPut
               FF00}
             ShowHint = True
             Transparent = True
+            OnClick = img1Click
           end
         end
         object WJName: TEdit
           Left = 61
-          Top = 28
+          Top = 27
           Width = 134
           Height = 20
           Font.Charset = GB2312_CHARSET
@@ -788,9 +677,9 @@ object frmZHCPInPut: TfrmZHCPInPut
           ParentFont = False
           TabOrder = 1
         end
-        object btn2: TButton
-          Left = 141
-          Top = 55
+        object Cancel: TButton
+          Left = 136
+          Top = 56
           Width = 49
           Height = 25
           Caption = #21542
@@ -800,7 +689,8 @@ object frmZHCPInPut: TfrmZHCPInPut
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 4
+          TabOrder = 3
+          OnClick = CancelClick
         end
         object WJPach: TEdit
           Left = 83
@@ -813,10 +703,10 @@ object frmZHCPInPut: TfrmZHCPInPut
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 5
+          TabOrder = 4
         end
-        object btn3: TButton
-          Left = 76
+        object Rename: TButton
+          Left = 28
           Top = 55
           Width = 50
           Height = 25
@@ -827,18 +717,19 @@ object frmZHCPInPut: TfrmZHCPInPut
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 3
+          TabOrder = 2
+          OnClick = RenameClick
         end
       end
     end
     object Panel2: TPanel
-      Left = 258
+      Left = 465
       Top = 48
       Width = 86
       Height = 274
       BevelInner = bvRaised
       BevelOuter = bvLowered
-      TabOrder = 4
+      TabOrder = 2
       object Label3: TLabel
         Left = 10
         Top = 48
@@ -882,45 +773,13 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 5
+      TabOrder = 3
       Visible = False
     end
-    object Edit1: TEdit
-      Tag = 99
-      Left = 437
-      Top = 356
-      Width = 377
-      Height = 21
-      Color = clMenu
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -13
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 6
-    end
-    object Edit2: TEdit
-      Tag = 99
-      Left = 14
-      Top = 356
-      Width = 323
-      Height = 21
-      Color = clMenu
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -13
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 7
-    end
     object ZIGY: TMemo
       Tag = 9
       Left = 437
-      Top = 407
+      Top = 378
       Width = 377
       Height = 136
       Font.Charset = GB2312_CHARSET
@@ -929,12 +788,12 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 8
+      TabOrder = 4
     end
     object ZIName: TEdit
       Tag = 9
       Left = 14
-      Top = 407
+      Top = 377
       Width = 323
       Height = 23
       Font.Charset = GB2312_CHARSET
@@ -943,12 +802,12 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 5
     end
     object Note: TMemo
       Tag = 9
       Left = 14
-      Top = 456
+      Top = 427
       Width = 323
       Height = 88
       Font.Charset = GB2312_CHARSET
@@ -957,7 +816,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 6
     end
     object MianBu: TBtnEditA
       Tag = 9
@@ -966,7 +825,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Width = 150
       Height = 23
       ReadOnly = True
-      TabOrder = 11
+      TabOrder = 7
       OnBtnClick = MianBuBtnClick
     end
     object ZhongJianC: TBtnEditA
@@ -976,7 +835,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Width = 150
       Height = 23
       ReadOnly = True
-      TabOrder = 12
+      TabOrder = 8
       OnBtnClick = ZhongJianCBtnClick
     end
     object DiBu: TBtnEditA
@@ -985,7 +844,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Top = 104
       Width = 150
       Height = 23
-      TabOrder = 13
+      TabOrder = 9
       OnBtnClick = DiBuBtnClick
     end
     object DiBuName: TBtnEditA
@@ -994,7 +853,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Top = 104
       Width = 200
       Height = 23
-      TabOrder = 14
+      TabOrder = 10
       OnBtnClick = DiBuNameBtnClick
     end
     object ZhongJianCName: TEdit
@@ -1009,7 +868,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 15
+      TabOrder = 11
     end
     object ZhongJianCID: TEdit
       Tag = 9
@@ -1024,7 +883,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Style = [fsBold]
       ParentFont = False
       ReadOnly = True
-      TabOrder = 16
+      TabOrder = 12
       Visible = False
     end
     object DiBuID: TEdit
@@ -1040,7 +899,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Style = [fsBold]
       ParentFont = False
       ReadOnly = True
-      TabOrder = 17
+      TabOrder = 13
       Visible = False
     end
     object MianBuName: TBtnEditA
@@ -1049,7 +908,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Top = 54
       Width = 200
       Height = 23
-      TabOrder = 18
+      TabOrder = 14
       OnBtnClick = MianBuNameBtnClick
     end
     object MBCBDJ: TEdit
@@ -1064,7 +923,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 19
+      TabOrder = 15
       OnChange = MBCBDJChange
     end
     object DBCBDJ: TEdit
@@ -1079,7 +938,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 20
+      TabOrder = 16
       OnChange = MBCBDJChange
     end
     object MHDJ: TEdit
@@ -1094,7 +953,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 21
+      TabOrder = 17
       OnChange = MBCBDJChange
     end
     object XHJGFDJ: TEdit
@@ -1109,7 +968,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 22
+      TabOrder = 18
       OnChange = MBCBDJChange
     end
     object CPCBDJ: TEdit
@@ -1125,7 +984,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 23
+      TabOrder = 19
     end
     object TSHGYCB: TEdit
       Tag = 9
@@ -1139,7 +998,7 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 25
+      TabOrder = 21
       OnChange = MBCBDJChange
     end
     object CPSSL: TEdit
@@ -1154,32 +1013,71 @@ object frmZHCPInPut: TfrmZHCPInPut
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 26
+      TabOrder = 22
+    end
+    object Panel4: TPanel
+      Left = 824
+      Top = 53
+      Width = 541
+      Height = 121
+      Color = clSkyBlue
+      TabOrder = 20
+      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
   end
   object ADOTemp: TADOQuery
     Connection = DataLink_MYSC.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 773
-    Top = 317
+    Left = 833
+    Top = 287
   end
   object ADOCmd: TADOQuery
     Connection = DataLink_MYSC.ADOLink
     Parameters = <>
-    Left = 621
-    Top = 317
+    Left = 561
+    Top = 287
   end
   object ADOQuery1: TADOQuery
     Connection = DataLink_MYSC.ADOLink
     Parameters = <>
-    Left = 659
-    Top = 317
+    Left = 629
+    Top = 287
   end
   object CDS_PRT: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 621
+    Left = 561
     Top = 355
   end
   object RM1: TRMGridReport
@@ -1199,8 +1097,8 @@ object frmZHCPInPut: TfrmZHCPInPut
     CompressThread = False
     LaterBuildEvents = True
     OnlyOwnerDataSet = False
-    Left = 773
-    Top = 355
+    Left = 561
+    Top = 423
     ReportData = {}
   end
   object ODPat: TOpenDialog
@@ -1213,29 +1111,37 @@ object frmZHCPInPut: TfrmZHCPInPut
     ReadTimeout = 0
     ProxySettings.ProxyType = fpcmNone
     ProxySettings.Port = 0
-    Left = 659
+    Left = 629
     Top = 355
   end
   object SaveDialog1: TSaveDialog
-    Left = 621
-    Top = 393
+    Left = 629
+    Top = 423
   end
   object adoqueryPicture: TADOQuery
     Connection = DataLink_MYSC.ADOLink
     Parameters = <>
-    Left = 735
-    Top = 317
+    Left = 765
+    Top = 287
   end
   object RMDBMain: TRMDBDataSet
     Visible = True
     DataSet = CDS_PRT
-    Left = 735
+    Left = 833
     Top = 355
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_MYSC.ADOLink
     Parameters = <>
     Left = 697
-    Top = 317
+    Top = 287
+  end
+  object pm1: TPopupMenu
+    Left = 765
+    Top = 355
+    object MenuItem2: TMenuItem
+      Caption = #37325#21629#21517
+      OnClick = MenuItem2Click
+    end
   end
 end
diff --git a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas
index 331a6fe..2a8dcdf 100644
--- a/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPInPut.pas
@@ -12,7 +12,7 @@ uses
   cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, cxGroupBox,
   cxCheckBox, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport,
-  IniFiles;
+  IniFiles, Menus;
 
 type
   TfrmZHCPInPut = class(TForm)
@@ -26,7 +26,6 @@ type
     CDS_PRT: TClientDataSet;
     RM1: TRMGridReport;
     Panel3: TPanel;
-    Panel6: TPanel;
     Panel5: TPanel;
     Label12: TLabel;
     Label14: TLabel;
@@ -36,13 +35,9 @@ type
     ZIKZ: TEdit;
     ZIMF: TEdit;
     ZICF: TEdit;
-    Panel8: TPanel;
-    Button1: TButton;
     ODPat: TOpenDialog;
-    Image1: TImage;
     IdFTP1: TIdFTP;
     SaveDialog1: TSaveDialog;
-    Label1: TLabel;
     Panel66: TPanel;
     Image2: TImage;
     Panel2: TPanel;
@@ -53,13 +48,7 @@ type
     ZIID: TEdit;
     adoqueryPicture: TADOQuery;
     Panel1: TPanel;
-    Image11: TImage;
-    Image22: TImage;
     RMDBMain: TRMDBDataSet;
-    Label5: TLabel;
-    Edit1: TEdit;
-    Label6: TLabel;
-    Edit2: TEdit;
     ZIGY: TMemo;
     Label7: TLabel;
     Label8: TLabel;
@@ -106,18 +95,21 @@ type
     CPSSL: TEdit;
     Panel12: TPanel;
     Label32: TLabel;
-    btn1: TButton;
     Panel13: TPanel;
     img1: TImage;
     WJName: TEdit;
-    btn2: TButton;
+    Cancel: TButton;
     WJPach: TEdit;
-    btn3: TButton;
+    Rename: TButton;
+    image22: TImage;
+    Label1: TLabel;
+    HXNM: TEdit;
+    pm1: TPopupMenu;
+    MenuItem2: TMenuItem;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure Button1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
@@ -134,6 +126,10 @@ type
     procedure HXNOBtnDnClick(Sender: TObject);
     procedure HXNOBtnUpClick(Sender: TObject);
     procedure MBCBDJChange(Sender: TObject);
+    procedure MenuItem2Click(Sender: TObject);
+    procedure RenameClick(Sender: TObject);
+    procedure CancelClick(Sender: TObject);
+    procedure img1Click(Sender: TObject);
   private
     lstPat, lstPat2: TStringList;
     FangXiang1, FangXiang2: string;
@@ -262,42 +258,11 @@ begin
     sql.Add(' where ZIID=''' + Trim(FMainId) + '''');
     Open;
   end;
+
   SCSHDataNew(ADOQuery1, Panel5, 9);
   SCSHDataNew(ADOQuery1, Panel5, 2);
   SCSHDataNew(ADOQuery1, Panel3, 9);
-  with adoqueryPicture do
-  begin
-    Close;
-    sql.Clear;
-    sql.Add('select * from Image_Info A');
-    sql.Add(' inner join Image_File B on A.IMID=B.IMID');
-    sql.Add(' and A.WBID=''' + Trim(FMainId) + '''');
-    sql.Add(' and isnull(A.IMNo,'''')=''����'' and A.Valid=''Y'' ');
-    Open;
-  end;
 
-  if (adoqueryPicture.IsEmpty = False) and (CopyInt <> 99) then
-  begin
-    FStr := Trim(adoqueryPicture.fieldbyname('ImageName').AsString);
-    Edit1.Text := Copy(FStr, 1, Length(FStr) - 4);
-    jpg := TJpegImage.Create();
-    myStream := tadoblobstream.Create(tblobfield(adoqueryPicture.fieldbyname('ImageFile')), bmread);
-    jpg.LoadFromStream(myStream);
-    Image1.Picture.Assign(jpg);
-    Image1.Width := adoqueryPicture.fieldbyname('ImageWidth').Value;
-    Image1.Height := adoqueryPicture.fieldbyname('ImageHeight').Value;
-    if Trim(adoqueryPicture.fieldbyname('FangXiang').AsString) = '��ֱ' then
-    begin
-      Image1.Top := 1;
-      Image1.Left := Round((Panel6.Width - Image1.Width) / 2);
-    end
-    else
-    begin
-      Image1.Left := 1;
-      Image1.Top := Round((Panel6.Height - Image1.Height) / 2);
-    end;
-    Image1.Visible := True;
-  end;
   with adoqueryPicture do
   begin
     Close;
@@ -312,7 +277,6 @@ begin
   if (adoqueryPicture.IsEmpty = False) and (CopyInt <> 99) then
   begin
     FStr := Trim(adoqueryPicture.fieldbyname('ImageName').AsString);
-    Edit2.Text := Copy(FStr, 1, Length(FStr) - 4);
     jpg := TJpegImage.Create();
     myStream := tadoblobstream.Create(tblobfield(adoqueryPicture.fieldbyname('ImageFile')), bmread);
     jpg.LoadFromStream(myStream);
@@ -334,7 +298,6 @@ begin
 
   if TBSave.Visible = False then
   begin
-    Button1.Visible := False;
     Button2.Visible := False;
     ZIMF.Color := ZIID.Color;
     ZIKZ.Color := ZIID.Color;
@@ -428,14 +391,10 @@ begin
       end;
       RTSetsavedata(ADOCmd, 'ZH_CP_Info', Panel5, 2);
       RTSetsavedata(ADOCmd, 'ZH_CP_Info', Panel3, 9);
-      FieldByName('HXNM').Value := Trim(HXNO.TxtCode);
+//      FieldByName('HXNM').Value := Trim(HXNO.TxtCode);
       Post;
     end;
 
-    if Trim(Image1.Hint) <> '' then
-    begin
-      SaveImage(maxno, '����');
-    end;
     if Trim(Image2.Hint) <> '' then
     begin
       SaveImage(maxno, 'ͼƬ');
@@ -500,24 +459,13 @@ begin
 //      Application.MessageBox('�ײ���ź͵ײ����Ʋ��ܶ�Ϊ��!', '��ʾ', 0);
 //      Exit;
 //    end;
-
 //    if Trim(MianBuName.Text) = '' then
 //    begin
 //      Application.MessageBox('�沼���Ʋ���Ϊ��!', '��ʾ', 0);
 //      Exit;
 //    end;
 
-    if Trim(MHDJ.Text) = '' then
-    begin
-      Application.MessageBox('�޻����۲���Ϊ��!', '��ʾ', 0);
-      Exit;
-    end;
 
-    if Trim(XHJGFDJ.Text) = '' then
-    begin
-      Application.MessageBox('�廨�ӹ��ѵ��۲���Ϊ��!', '��ʾ', 0);
-      Exit;
-    end;
   end;
 
   if Trim(ZICL.Text) = '' then
@@ -551,18 +499,15 @@ var
   ImagePath, ImagName, MaxNo, MaxNoFile: string;
   AJpeg: TJPEGImage;
   myStream: TADOBlobStream;
+  LocalFileName: string; // ���ӵı��ر���
 begin
   try
-    if Trim(FIMNO) = '����' then
-    begin
-      ImagePath := Image1.Hint;
-      ImagName := Image1.Hint;
-    end
-    else if Trim(FIMNO) = 'ͼƬ' then
+    if Trim(FIMNO) = 'ͼƬ' then
     begin
       ImagePath := Image2.Hint;
       ImagName := Image2.Hint;
     end;
+
     AJpeg := TJpegImage.Create();
     with ADOCmd do
     begin
@@ -620,19 +565,14 @@ begin
       sql.Add(' select *  from Image_File where 1=2');
       open;
     end;
+
     with ADOCmd do
     begin
       Append;
       FieldByName('IMID').Value := Trim(MaxNo);
       FieldByName('IFID').Value := Trim(MaxNoFile);
       Fieldbyname('Valid').value := Trim('Y');
-      if Trim(FIMNO) = '����' then
-      begin
-        FieldByName('ImageWidth').Value := Image1.Width;
-        FieldByName('ImageHeight').Value := Image1.Height;
-        FieldByName('FangXiang').Value := FangXiang1;
-      end
-      else if Trim(FIMNO) = 'ͼƬ' then
+      if Trim(FIMNO) = 'ͼƬ' then
       begin
         FieldByName('ImageWidth').Value := Image2.Width;
         FieldByName('ImageHeight').Value := Image2.Height;
@@ -640,11 +580,7 @@ begin
       end;
       FieldByName('IFType').Value := 'С';
       myStream := TADOBlobStream.Create(TBlobField(ADOCmd.FieldByName('ImageFile')), bmWrite);
-      if Trim(FIMNO) = '����' then
-      begin
-        AJpeg.Assign(Image1.Picture.Graphic);
-      end
-      else if Trim(FIMNO) = 'ͼƬ' then
+      if Trim(FIMNO) = 'ͼƬ' then
       begin
         AJpeg.Assign(Image2.Picture.Graphic);
       end;
@@ -652,19 +588,14 @@ begin
       myStream.Free;
       Post;
     end;
+
     with ADOCmd do
     begin
       Append;
       FieldByName('IMID').Value := Trim(MaxNo);
       FieldByName('IFID').Value := Trim(MaxNoFile) + 'D';
       Fieldbyname('Valid').value := Trim('Y');
-      if Trim(FIMNO) = '����' then
-      begin
-        FieldByName('ImageWidth').Value := Image11.Width;
-        FieldByName('ImageHeight').Value := Image11.Height;
-        FieldByName('FangXiang').Value := FangXiang1;
-      end
-      else if Trim(FIMNO) = 'ͼƬ' then
+      if Trim(FIMNO) = 'ͼƬ' then
       begin
         FieldByName('ImageWidth').Value := Image22.Width;
         FieldByName('ImageHeight').Value := Image22.Height;
@@ -672,11 +603,7 @@ begin
       end;
       FieldByName('IFType').Value := '��';
       myStream := TADOBlobStream.Create(TBlobField(ADOCmd.FieldByName('ImageFile')), bmWrite);
-      if Trim(FIMNO) = '����' then
-      begin
-        AJpeg.Assign(Image11.Picture.Graphic);
-      end
-      else if Trim(FIMNO) = 'ͼƬ' then
+      if Trim(FIMNO) = 'ͼƬ' then
       begin
         AJpeg.Assign(Image22.Picture.Graphic);
       end;
@@ -684,6 +611,7 @@ begin
       myStream.Free;
       Post;
     end;
+
     try
       ReadINIFile10();
       server := ReadINIFileStr('SYSTEMSET.INI', 'SERVER', '��������ַ', '127.0.0.1');
@@ -696,6 +624,7 @@ begin
       Application.MessageBox('�޷����ӵ��ļ������������飡', '��ʾ', MB_ICONWARNING);
       Exit;
     end;
+
     if IdFTP1.Connected then
     begin
       if Trim(FIMNO) = '����' then
@@ -704,7 +633,7 @@ begin
       end
       else if Trim(FIMNO) = 'ͼƬ' then
       begin
-        IdFTP1.Put(lstPat2[0], 'YP' + '\' + Trim(MaxNo) + Trim(ImagName));
+        IdFTP1.Put(LocalFileName, 'YP' + '\' + Trim(MaxNo) + ImagName);
       end;
     end;
     if IdFTP1.Connected then
@@ -720,93 +649,6 @@ begin
   ModalResult := 1;
 end;
 
-procedure TfrmZHCPInPut.Button1Click(Sender: TObject);
-var
-  AJpeg: TJPEGImage;
-  Bitmap, Bitmap11: TBitmap;
-  ARect, ARect11: TRect;
-  TPHeight, AHeightOffset: Integer;
-  TPWidth, AWidthOffset: Integer;
-  WZShuiPing, WZChuiZhi: Integer;
-  WZFlag: string;
-  FHFStr: string;
-begin
-  lstPat.Clear;
-  if ODPat.Execute then
-  begin
-    lstPat.AddStrings(ODPat.Files);
-  end
-  else
-  begin
-    Exit;
-  end;
-  if lstPat.Count > 1 then
-  begin
-    lstPat.Clear;
-    Application.MessageBox('�����ϴ����ͼƬ!', '��ʾ', 0);
-    Exit;
-  end
-  else if lstPat.Count < 1 then
-  begin
-    Exit;
-  end;
-  Panel1.Visible := True;
-  Panel1.Refresh;
-  Panel6.Color := clBtnFace;
-  Panel6.Hint := '';
-  AJpeg := TJpegImage.Create();
-  AJpeg.LoadFromFile(ExtractFileName(ODPat.FileName));
-  Image1.Hint := ExtractFileName(ODPat.FileName);
-  if Copy(Image1.Hint, Length(Image1.Hint) - 2, Length(Image1.Hint)) <> 'jpg' then
-  begin
-    Application.MessageBox('ͼƬ������jpg��ʽ', '��ʾ', 0);
-    Exit;
-  end;
-  TPWidth := AJpeg.Width;
-  TPHeight := AJpeg.Height;
-  Bitmap := TBitmap.Create;
-  Bitmap11 := TBitmap.Create;
-  Bitmap.Width := Panel6.Width - 2;
-  Bitmap.Height := Round(Panel6.Width / TPWidth * TPHeight);
-  if Bitmap.Height > Panel6.Height then
-  begin
-    WZFlag := '��ֱ';
-    Bitmap.Height := Panel6.Height - 2;
-    Bitmap.Width := Round(Panel6.Height / TPHeight * TPWidth);
-  end;
-  Bitmap11.Width := Bitmap.Width * 2;
-  Bitmap11.Height := Bitmap.Height * 2;
-  Bitmap.Canvas.FillRect(Rect(0, 0, Bitmap.Width, Bitmap.Height));
-  ARect := Rect(0, 0, Bitmap.Width, Bitmap.Height);
-  Bitmap.Canvas.StretchDraw(ARect, AJpeg);
-  Image1.Height := Bitmap.Height;
-  Image1.Width := Bitmap.Width;
-  Image1.Picture.Assign(Bitmap);
-  if Trim(WZFlag) = '��ֱ' then
-  begin
-    Image1.Top := 1;
-    Image1.Left := Round((Panel6.Width - Image1.Width) / 2);
-  end
-  else
-  begin
-    Image1.Left := 1;
-    Image1.Top := Round((Panel6.Height - Image1.Height) / 2);
-  end;
-  FangXiang1 := WZFlag;
-  Image1.Visible := True;
-  Bitmap11.Canvas.FillRect(Rect(0, 0, Bitmap11.Width, Bitmap11.Height));
-  ARect11 := Rect(0, 0, Bitmap11.Width, Bitmap11.Height);
-  Bitmap11.Canvas.StretchDraw(ARect11, AJpeg);
-  Image11.Height := Bitmap11.Height;
-  Image11.Width := Bitmap11.Width;
-  Image11.Picture.Assign(Bitmap11);
- // Image11.Visible:=True;
-  Edit1.Text := Copy(Image1.Hint, 1, Length(Image1.Hint) - 4);
-  StrFenHang(Edit1.Text, FHFStr);
-  ZIGY.Text := FHFStr;
-  Panel1.Visible := False;
-end;
-
 function TfrmZHCPInPut.StrFenHang(FStr: string; var FHStr: string): Boolean;
 var
   i, j: Integer;
@@ -866,12 +708,18 @@ var
   AJpeg: TJPEGImage;
   Bitmap, Bitmap22: TBitmap;
   ARect, ARect22: TRect;
-  TPHeight, AHeightOffset: Integer;
-  TPWidth, AWidthOffset: Integer;
-  WZShuiPing, WZChuiZhi: Integer;
+  TPHeight: Integer;
+  TPWidth: Integer;
   WZFlag: string;
+  FullFileName: string;
+  FileExt: string;
 begin
+  // ��ʼ������
+  WZFlag := ''; // ��Ҫ����ʼ������
+
   lstPat2.Clear;
+  
+  // �ļ�ѡ��Ի���
   if ODPat.Execute then
   begin
     lstPat2.AddStrings(ODPat.Files);
@@ -880,6 +728,8 @@ begin
   begin
     Exit;
   end;
+  
+  // �ļ�������֤
   if lstPat2.Count > 1 then
   begin
     lstPat2.Clear;
@@ -890,59 +740,130 @@ begin
   begin
     Exit;
   end;
+  
+  // ��ʾ�������
   Panel1.Visible := True;
   Panel1.Refresh;
-  AJpeg := TJpegImage.Create();
-  AJpeg.LoadFromFile(ExtractFileName(ODPat.FileName));
-  Image2.Hint := ExtractFileName(ODPat.FileName);
-  //ShowMessage(Copy(Image2.Hint,Length(Image2.Hint)-2,Length(Image2.Hint)));
-  if Copy(Image2.Hint, Length(Image2.Hint) - 2, Length(Image2.Hint)) <> 'jpg' then
+  
+  // ʹ�������ļ�·��
+  FullFileName := ODPat.FileName; // ��ȡ����·��
+  // ����ļ��Ƿ����
+  if not FileExists(FullFileName) then
   begin
-    Application.MessageBox('ͼƬ������jpg��ʽ', '��ʾ', 0);
+    Application.MessageBox(PChar('�ļ�������: ' + FullFileName), '����', 0);
+    Panel1.Visible := False;
     Exit;
   end;
-  TPWidth := AJpeg.Width;
-  TPHeight := AJpeg.Height;
-  Bitmap := TBitmap.Create;
-  Bitmap22 := TBitmap.Create;
-  Bitmap.Width := Panel66.Width - 2;
-  Bitmap.Height := Round(Panel66.Width / TPWidth * TPHeight);
-  if Bitmap.Height > Panel66.Height then
-  begin
-    WZFlag := '��ֱ';
-    Bitmap.Height := Panel66.Height - 2;
-    Bitmap.Width := Round(Panel66.Height / TPHeight * TPWidth);
+
+  AJpeg := TJpegImage.Create();
+  Bitmap := nil;
+  Bitmap22 := nil;
+
+  try
+    try
+      // ����JPEG�ļ���ʹ������·����
+      AJpeg.LoadFromFile(FullFileName);
+      
+      // ��֤JPEG�ļ��Ƿ���Ч
+      if (AJpeg.Width <= 0) or (AJpeg.Height <= 0) then
+      begin
+        Application.MessageBox('ͼƬ�ļ����𻵻��ʽ��֧��!', '����', 0);
+        Exit;
+      end;
+      
+      // �洢����·����Hint
+      Image2.Hint := FullFileName;
+      
+      // �Ľ����ļ���ʽ���
+      FileExt := LowerCase(ExtractFileExt(FullFileName));
+      if (FileExt <> '.jpg') and (FileExt <> '.jpeg') then
+      begin
+        Application.MessageBox('ͼƬ������jpg��ʽ', '��ʾ', 0);
+        Exit;
+      end;
+      
+      // ��ȡͼƬ�ߴ�
+      TPWidth := AJpeg.Width;
+      TPHeight := AJpeg.Height;
+      
+      // ����λͼ����
+      Bitmap := TBitmap.Create;
+      Bitmap22 := TBitmap.Create;
+      
+      // �������ųߴ�
+      Bitmap.Width := Panel66.Width - 2;
+      Bitmap.Height := Round(Panel66.Width / TPWidth * TPHeight);
+      
+      // ����߶ȳ�����壬�򰴸߶�����
+      if Bitmap.Height > Panel66.Height then
+      begin
+        WZFlag := '��ֱ';
+        Bitmap.Height := Panel66.Height - 2;
+        Bitmap.Width := Round(Panel66.Height / TPHeight * TPWidth);
+      end;
+      
+      // ����˫���ߴ��λͼ
+      Bitmap22.Width := Bitmap.Width * 2;
+      Bitmap22.Height := Bitmap.Height * 2;
+      
+      // ����Сͼ
+      Bitmap.Canvas.FillRect(Rect(0, 0, Bitmap.Width, Bitmap.Height));
+      ARect := Rect(0, 0, Bitmap.Width, Bitmap.Height);
+      Bitmap.Canvas.StretchDraw(ARect, AJpeg);
+      
+      // ��ʾСͼ
+      Image2.Height := Bitmap.Height;
+      Image2.Width := Bitmap.Width;
+      Image2.Picture.Assign(Bitmap);
+      
+      // ���ݷ�������ͼƬλ��
+      if Trim(WZFlag) = '��ֱ' then
+      begin
+        Image2.Top := 1;
+        Image2.Left := Round((Panel66.Width - Image2.Width) / 2);
+      end
+      else
+      begin
+        Image2.Left := 1;
+        Image2.Top := Round((Panel66.Height - Image2.Height) / 2);
+      end;
+      
+      // ���淽����Ϣ
+      FangXiang2 := WZFlag;
+      
+      // ���ƴ�ͼ
+      Bitmap22.Canvas.FillRect(Rect(0, 0, Bitmap22.Width, Bitmap22.Height));
+      ARect22 := Rect(0, 0, Bitmap22.Width, Bitmap22.Height);
+      Bitmap22.Canvas.StretchDraw(ARect22, AJpeg);
+      
+      // ��ʾ��ͼ
+      Image22.Height := Bitmap22.Height;
+      Image22.Width := Bitmap22.Width;
+      Image22.Picture.Assign(Bitmap22);
+
+      Image2.Visible := True;
+      ZIName.Text := ChangeFileExt(ExtractFileName(FullFileName), '');
+
+      Panel12.Visible := True;
+
+    except
+      on E: Exception do
+      begin
+        Application.MessageBox(PChar('����ͼƬʱ��������: ' + E.Message), '����', 0);
+      end;
+    end;
+
+  finally
+    // ȷ����Դ���ͷ�
+    if Assigned(AJpeg) then
+      AJpeg.Free;
+    if Assigned(Bitmap) then
+      Bitmap.Free;
+    if Assigned(Bitmap22) then
+      Bitmap22.Free;
+
+    Panel1.Visible := False;
   end;
-  Bitmap22.Width := Bitmap.Width * 2;
-  Bitmap22.Height := Bitmap.Height * 2;
-  Bitmap.Canvas.FillRect(Rect(0, 0, Bitmap.Width, Bitmap.Height));
-  ARect := Rect(0, 0, Bitmap.Width, Bitmap.Height);
-  Bitmap.Canvas.StretchDraw(ARect, AJpeg);
-  Image2.Height := Bitmap.Height;
-  Image2.Width := Bitmap.Width;
-  Image2.Picture.Assign(Bitmap);
-  if Trim(WZFlag) = '��ֱ' then
-  begin
-    Image2.Top := 1;
-    Image2.Left := Round((Panel66.Width - Image2.Width) / 2);
-  end
-  else
-  begin
-    Image2.Left := 1;
-    Image2.Top := Round((Panel66.Height - Image2.Height) / 2);
-  end;
-  FangXiang2 := WZFlag;
-  Bitmap22.Canvas.FillRect(Rect(0, 0, Bitmap22.Width, Bitmap22.Height));
-  ARect22 := Rect(0, 0, Bitmap22.Width, Bitmap22.Height);
-  Bitmap22.Canvas.StretchDraw(ARect22, AJpeg);
-  Image22.Height := Bitmap22.Height;
-  Image22.Width := Bitmap22.Width;
-  Image22.Picture.Assign(Bitmap22);
-  Image2.Visible := True;
-  Edit2.Text := Copy(Image2.Hint, 1, Length(Image2.Hint) - 4);
-  if CopyInt <> 99 then
-    ZIName.Text := Edit2.Text;
-  Panel1.Visible := False;
 end;
 
 procedure TfrmZHCPInPut.ToolButton1Click(Sender: TObject);
@@ -1263,7 +1184,8 @@ begin
       begin
         HXNO.text := Trim(CDS_HZ.fieldbyname('zdyCode').AsString);
         ZICL.text := Trim(CDS_HZ.fieldbyname('defstr1').AsString);
-        HXNO.TxtCode := Trim(CDS_HZ.fieldbyname('ZdyName').AsString);
+//        HXNO.TxtCode := Trim(CDS_HZ.fieldbyname('ZdyName').AsString);
+        HXNM.text := Trim(CDS_HZ.fieldbyname('ZdyName').AsString);
       end;
     end;
   finally
@@ -1284,5 +1206,95 @@ begin
 
 end;
 
+procedure TfrmZHCPInPut.MenuItem2Click(Sender: TObject);
+begin
+  if lstPat2.Count < 1 then
+    exit;
+  Panel12.Visible := True;
+  Cancel.Visible := True;
+  Rename.Visible := True;
+  Panel12.Refresh;
+  WJName.Text := Trim(Image2.Hint);
+  WJName.Hint := Trim(Image2.Hint);
+end;
+
+procedure TfrmZHCPInPut.RenameClick(Sender: TObject);
+var
+  OldFileName, NewFileName, FileExt: string;
+begin
+  // ����Ƿ���ͼƬ������
+  if Trim(Image2.Hint) = '' then
+  begin
+    Application.MessageBox('����ѡ��ͼƬ!', '��ʾ', 0);
+    Exit;
+  end;
+  
+  // ������ļ����Ƿ�Ϊ��
+  if Trim(WJName.Text) = '' then
+  begin
+    Application.MessageBox('���������ļ���!', '��ʾ', 0);
+    Exit;
+  end;
+
+  // ���ԭ�ļ��Ƿ����
+  if not FileExists(Image2.Hint) then
+  begin
+    Application.MessageBox('ԭͼƬ�ļ������ڣ������ѱ�ɾ�����ƶ�!', '����', 0);
+    Exit;
+  end;
+  
+  // ��ȡ��ǰ�ļ�������չ��
+  OldFileName := Image2.Hint;
+  FileExt := ExtractFileExt(OldFileName); // ��ȡԭ�ļ�����չ��
+  // �������ļ�����������ͬĿ¼����չ����
+  NewFileName := ExtractFilePath(OldFileName) + Trim(WJName.Text) + FileExt;
+  
+  // ������ļ��Ƿ��Ѵ��ڣ��Ҳ���ͬһ���ļ���
+  if (NewFileName <> OldFileName) and FileExists(NewFileName) then
+  begin
+    if Application.MessageBox(PChar('�ļ� "' + ExtractFileName(NewFileName) + '" �Ѵ��ڣ��Ƿ񸲸�?'), '��ʾ', MB_YESNO + MB_ICONQUESTION) = IDNO then
+      Exit;
+  end;
+  
+  // ִ��������
+  if RenameFile(OldFileName, NewFileName) then
+  begin
+    // ����������ر���
+    Image2.Hint := NewFileName;  // ����Hint�е�����·��
+    // ����lstPat2�е��ļ�·��
+    if lstPat2.Count > 0 then
+      lstPat2[0] := NewFileName
+    else
+      lstPat2.Add(NewFileName);
+      
+    // ���½�����ʾ��ֻ��ʾ�ļ�����������չ����
+//    Edit2.Text := Trim(WJName.Text);
+    // ���CopyInt����99��Ҳ����ZIName
+    if CopyInt <> 99 then
+      ZIName.Text := Trim(WJName.Text);
+
+    Application.MessageBox(PChar('�ļ��ѳɹ�������Ϊ: ' + ExtractFileName(NewFileName)), '�ɹ�', MB_ICONINFORMATION);
+    
+    // ��ѡ����¼������־
+    // WriteToLog('ͼƬ������: ' + ExtractFileName(OldFileName) + ' -> ' + ExtractFileName(NewFileName));
+
+    Panel12.Visible := False;
+  end
+  else
+  begin
+    Application.MessageBox('������ʧ�ܣ������ļ��Ƿ�ռ�û�Ȩ�޲���!', '����', MB_ICONERROR);
+  end;
+end;
+
+procedure TfrmZHCPInPut.CancelClick(Sender: TObject);
+begin
+  panel12.Visible := False;
+end;
+
+procedure TfrmZHCPInPut.img1Click(Sender: TObject);
+begin
+  Panel12.Visible := False;
+end;
+
 end.
 
diff --git a/样品新云翔(YPGLBOM.dll)/ProjectGroup1.bpg b/样品新云翔(YPGLBOM.dll)/ProjectGroup1.bpg
index e6b2914..44c4d2c 100644
--- 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
+PROJECTS = testDll.exe YPGLBOM.dll
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -17,4 +17,7 @@ default: $(PROJECTS)
 testDll.exe: testDll.dpr
   $(DCC)
 
+YPGLBOM.dll: YPGLBOM.dpr
+  $(DCC)
+
 
diff --git a/样品新云翔(YPGLBOM.dll)/YPGLBOM.dof b/样品新云翔(YPGLBOM.dll)/YPGLBOM.dof
index b539425..74d138e 100644
--- a/样品新云翔(YPGLBOM.dll)/YPGLBOM.dof
+++ b/样品新云翔(YPGLBOM.dll)/YPGLBOM.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�����ֿ�������\��Ŀ����\����\��Ʒ������(YPGLBOM.dll)\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\��Ʒ������(YPGLBOM.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=