diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof
index 684fd28..12a4ed4 100644
--- a/打卷检验管理/TradeManage.dof
+++ b/打卷检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\ƽ��\����������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJpingfeng\����������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/打卷检验管理/TradeManage.skincfg b/打卷检验管理/TradeManage.skincfg
new file mode 100644
index 0000000..554ddb0
--- /dev/null
+++ b/打卷检验管理/TradeManage.skincfg
@@ -0,0 +1,50 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=0
+dxSkinBlack=1
+dxSkinBlue=1
+dxSkinBlueprint=1
+dxSkinCaramel=1
+dxSkinCoffee=1
+dxSkinDarkRoom=1
+dxSkinDarkSide=1
+dxSkinDevExpressDarkStyle=1
+dxSkinDevExpressStyle=1
+dxSkinFoggy=1
+dxSkinGlassOceans=1
+dxSkinHighContrast=1
+dxSkiniMaginary=1
+dxSkinLilian=1
+dxSkinLiquidSky=1
+dxSkinLondonLiquidSky=1
+dxSkinMcSkin=1
+dxSkinMetropolis=1
+dxSkinMetropolisDark=1
+dxSkinMoneyTwins=1
+dxSkinOffice2007Black=1
+dxSkinOffice2007Blue=1
+dxSkinOffice2007Green=1
+dxSkinOffice2007Pink=1
+dxSkinOffice2007Silver=1
+dxSkinOffice2010Black=1
+dxSkinOffice2010Blue=1
+dxSkinOffice2010Silver=1
+dxSkinOffice2013DarkGray=1
+dxSkinOffice2013LightGray=1
+dxSkinOffice2013White=1
+dxSkinPumpkin=1
+dxSkinSeven=1
+dxSkinSevenClassic=1
+dxSkinSharp=1
+dxSkinSharpPlus=1
+dxSkinSilver=1
+dxSkinSpringTime=1
+dxSkinStardust=1
+dxSkinSummer2008=1
+dxSkinTheAsphaltWorld=1
+dxSkinsDefaultPainters=1
+dxSkinValentine=1
+dxSkinVS2010=1
+dxSkinWhiteprint=1
+dxSkinXmas2008Blue=1
diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index a6985b8..69cb28a 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 296
-  Top = 178
+  Left = 480
+  Top = 409
   Width = 1400
   Height = 757
   Caption = #26816#39564#25253#21578
@@ -21,8 +21,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1384
-    Height = 62
+    Width = 1392
+    Height = 92
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 608
-      Top = 0
+      Left = 0
+      Top = 30
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 719
-      Top = 0
+      Left = 111
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 830
-      Top = 0
+      Left = 222
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -129,16 +130,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 953
-      Top = 0
+      Left = 345
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 0
+      Left = 456
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -146,7 +146,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 87
+      Left = 543
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 174
+      Left = 630
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -163,24 +163,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 273
+      Left = 729
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
+      Wrap = True
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 384
-      Top = 30
+      Left = 0
+      Top = 60
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 447
-      Top = 30
+      Left = 63
+      Top = 60
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -194,8 +195,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 515
-      Top = 33
+      Left = 131
+      Top = 63
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -219,8 +220,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 664
-      Top = 30
+      Left = 280
+      Top = 60
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -233,32 +234,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 785
-      Top = 30
+      Left = 401
+      Top = 60
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 904
-      Top = 30
+      Left = 520
+      Top = 60
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 991
-      Top = 30
+      Left = 607
+      Top = 60
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 1054
-      Top = 30
+      Left = 670
+      Top = 60
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -267,8 +268,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
-    Width = 1384
+    Top = 92
+    Width = 1392
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -782,9 +783,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 150
-    Width = 1384
-    Height = 568
+    Top = 180
+    Width = 1392
+    Height = 546
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -1312,8 +1313,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
   end
   object Panel3: TPanel
-    Left = 503
-    Top = 203
+    Left = 975
+    Top = 427
     Width = 231
     Height = 216
     TabOrder = 6
@@ -1646,8 +1647,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
   end
   object Panel_SMCK: TPanel
-    Left = 412
-    Top = 180
+    Left = 332
+    Top = 516
     Width = 317
     Height = 97
     Color = clSkyBlue
@@ -1793,8 +1794,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
   end
   object Panel13: TPanel
-    Left = 120
-    Top = 376
+    Left = 32
+    Top = 488
     Width = 273
     Height = 129
     Color = clSkyBlue
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index 6436e41..7f08f57 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -1411,6 +1411,7 @@ begin
     sql.add('@mainID=' + quotedstr(Trim('')));
     sql.add(',@DName=' + quotedstr(Trim(DCode)));
     sql.add(',@flag=''0'' ');
+    //ShowMessage(SQL.Text);
     Open;
   end;
   SCreateCDS20(ADOQueryCmd, CDS_HZ);
diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index 580ef8c..488ab1c 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -1,8 +1,8 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 383
-  Top = 152
-  Width = 1366
-  Height = 754
+  Left = 309
+  Top = 317
+  Width = 1386
+  Height = 842
   Caption = #25104#21697#26816#39564
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 214
-    Height = 628
+    Height = 724
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -125,8 +125,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 633
     Top = 87
-    Width = 717
-    Height = 628
+    Width = 745
+    Height = 724
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -977,7 +977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 428
     Top = 87
     Width = 205
-    Height = 628
+    Height = 724
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1037,14 +1037,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 8
+      Left = 12
       Top = 383
-      Width = 42
-      Height = 20
+      Width = 34
+      Height = 16
       Caption = #24133#23485
       Font.Charset = ANSI_CHARSET
       Font.Color = clBlue
-      Font.Height = -20
+      Font.Height = -16
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label22: TLabel
       Left = 144
-      Top = 424
+      Top = 417
       Width = 36
       Height = 22
       Caption = 'g/'#13217
@@ -1142,14 +1142,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label23: TLabel
-      Left = 8
-      Top = 423
-      Width = 42
-      Height = 20
+      Left = 12
+      Top = 414
+      Width = 34
+      Height = 16
       Caption = #20811#37325
       Font.Charset = ANSI_CHARSET
       Font.Color = clBlue
-      Font.Height = -20
+      Font.Height = -16
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -1326,7 +1326,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label28: TLabel
       Left = 18
-      Top = 680
+      Top = 720
       Width = 42
       Height = 20
       Caption = #21253#21495
@@ -1364,11 +1364,37 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = []
       ParentFont = False
     end
+    object Label55: TLabel
+      Left = 8
+      Top = 449
+      Width = 68
+      Height = 16
+      Caption = #25277#26816#38376#24133
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label56: TLabel
+      Left = 7
+      Top = 477
+      Width = 68
+      Height = 16
+      Caption = #25277#26816#20811#37325
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object MJFK: TEdit
       Left = 51
       Top = 377
-      Width = 90
-      Height = 41
+      Width = 86
+      Height = 32
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -32
@@ -1414,7 +1440,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object BTPrint: TButton
       Left = 14
-      Top = 460
+      Top = 500
       Width = 171
       Height = 93
       Caption = #25552#20132
@@ -1479,9 +1505,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJSJKZ: TEdit
       Left = 51
-      Top = 418
-      Width = 90
-      Height = 41
+      Top = 409
+      Width = 86
+      Height = 31
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -32
@@ -1665,8 +1692,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object baoNo: TEdit
-      Left = 65
-      Top = 673
+      Left = 57
+      Top = 721
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1688,8 +1715,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 10
     end
     object Button7: TButton
-      Left = 2
-      Top = 600
+      Left = 18
+      Top = 712
       Width = 171
       Height = 53
       Caption = #25171#21253#26631#31614
@@ -1718,6 +1745,40 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit1Click
       OnKeyPress = MJstr3KeyPress
     end
+    object CheckMF: TEdit
+      Left = 79
+      Top = 440
+      Width = 80
+      Height = 30
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 22
+      OnClick = MJXHClick
+      OnExit = MJStr4Exit
+      OnKeyPress = MJstr3KeyPress
+    end
+    object CheckKZ: TEdit
+      Left = 79
+      Top = 470
+      Width = 80
+      Height = 29
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 23
+      OnClick = MJXHClick
+      OnExit = MJStr4Exit
+      OnKeyPress = MJstr3KeyPress
+    end
   end
   object MovePanel1: TMovePanel
     Left = 634
@@ -1973,7 +2034,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 214
     Top = 87
     Width = 214
-    Height = 628
+    Height = 724
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1982,7 +2043,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 303
+      Height = 399
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2090,7 +2151,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 305
+      Top = 401
       Width = 210
       Height = 28
       Align = alBottom
@@ -2105,7 +2166,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 333
+      Top = 429
       Width = 210
       Height = 293
       Align = alBottom
@@ -2318,7 +2379,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1350
+    Width = 1378
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2506,7 +2567,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1350
+    Width = 1378
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index 6377b1e..c9daba4 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -266,6 +266,10 @@ type
     Label53: TLabel;
     JZL: TEdit;
     Label54: TLabel;
+    Label55: TLabel;
+    Label56: TLabel;
+    CheckMF: TEdit;
+    CheckKZ: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -1037,6 +1041,8 @@ begin
 //      FieldByName('BaoNO').Value := Trim(BaoNO.Text);
       FieldByName('MJTypeOther').Value := Trim(Label9.Caption);
       FieldByName('MJStr1').Value := Trim(Label13.Caption);
+      FieldByName('CheckMF').Value := Trim(CheckMF.Text);
+      FieldByName('CheckKZ').Value := Trim(CheckKZ.Text);
       if Edit12.Text <> '' then
       begin
         FieldByName('DingMaFlag').Value := '����';
@@ -2737,6 +2743,9 @@ begin
   MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
   baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
   baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
+
+  CheckMF.Text := Trim(ADOTmp.fieldbyname('CheckMF').AsString);
+  CheckKZ.Text := Trim(ADOTmp.fieldbyname('CheckKZ').AsString);
   if Trim(ADOTmp.fieldbyname('MJType').AsString) = '��Ʒ' then
   begin
     Edit3.Text := '��';