diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof
index 4bee290..c3ad600 100644
--- a/打卷检验管理/TradeManage.dof
+++ b/打卷检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\��ɯ\����������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJyesha\����������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/打卷检验管理/U_DataLink.pas b/打卷检验管理/U_DataLink.pas
index e53b287..4c58cd6 100644
--- a/打卷检验管理/U_DataLink.pas
+++ b/打卷检验管理/U_DataLink.pas
@@ -4,7 +4,21 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs,
+  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;
 type
   TMyThread = class(TThread)
   protected
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index d45aa54..48f4dd9 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -10,7 +10,21 @@ uses
   cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
-  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI;
+  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI,
+  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
   TfrmMJManageNewFDNewSF = class(TForm)
@@ -883,7 +897,7 @@ var
 begin
 
   result := false;
-  if PState = 1 then
+  if PState = 1 then                                      
     FMJID := ''
   else if PState = 2 then
     FMJID := Trim(CDS_MJID.fieldbyname('MJID').AsString)
@@ -1258,7 +1272,7 @@ begin
         Close;
         SQL.Clear;
         sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A  ');
-        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  A.subid=''' + Trim(FsubId) + '''  and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' order by MJXH Desc');
         Open;
       end;
@@ -1323,7 +1337,7 @@ begin
       begin
         Close;
         sql.Clear;
-        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.subid=''' + Trim(FsubId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1');
         Open;
       end;