diff --git a/打卷检验管理/TradeManage.dpr b/打卷检验管理/TradeManage.dpr
index 5ff5452..38f5bca 100644
--- a/打卷检验管理/TradeManage.dpr
+++ b/打卷检验管理/TradeManage.dpr
@@ -3,7 +3,7 @@ uses
   SysUtils,
   classes,
   forms,                                
-  WinTypes,
+  WinTypes,                            
   WinProcs,
   U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule},
   U_GetDllForm in 'U_GetDllForm.pas',                                                                   
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_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index 973f79e..1208979 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -1623,11 +1623,12 @@ begin
       Open;
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥����') then
+  if (trim(ComboBox1.Text) = '�����뵥����') or (trim(ComboBox1.Text) = '�����뵥(����ɫ��)')
+   or (trim(ComboBox1.Text) = '�����뵥(���ų���)') or (trim(ComboBox1.Text) = '�����뵥(���ų���)') then
   begin
-    with ADOQueryTemp do
+    with ADOQueryTemp do             
     begin
-      Close;
+      Close;                                 
       sql.Clear;
       sql.add('exec P_Print_CKMDYDL_B ');
       sql.add('@DName=' + quotedstr(Trim(DCode)));
@@ -1647,7 +1648,8 @@ begin
       Open;
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(����)') or (trim(ComboBox1.Text) = '�����뵥(����)') then
+  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(����)')
+   or (trim(ComboBox1.Text) = '�����뵥(����)')  then
   begin
     with ADOQueryTemp do
     begin
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index a3c163c..f5d0cbf 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -376,7 +376,7 @@ var
   Makebar: TMakebar;
   Mixtext: TMixtext;
   i: Integer;
-begin
+begin                                   
   if CDS_MJID.IsEmpty then
     exit;
   CDS_MJID.First;
@@ -392,6 +392,7 @@ begin
     sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
     sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
     sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
+    sql.Add('PRTcodename=DBO.F_Get_Order_SubStr(BaoID,''BNPRTcodename''),Sorddefstr5=DBO.F_Get_Order_SubStr(BaoID,''BNPSorddefstr5''),');
     sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), ');
     sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), ');
     SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen');
@@ -593,7 +594,7 @@ end;
 procedure TfrmMJManageNewFDNewSF.InitJTXX();
 begin
   with ADOQueryMain do
-  begin                              
+  begin
     Close;
     SQL.Clear;
     sql.Add('select count(mjid) JTjs,sum(mjlen) JTcd,sum(mjqty4) as JTzl from WFB_MJJY  where filler=''' + Trim(DName) + '''  and filltime>convert(char(10),getdate(),120)   ');
@@ -2853,6 +2854,7 @@ begin
     sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
     sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
     sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
+    sql.Add('PRTcodename=DBO.F_Get_Order_SubStr(BaoID,''BNPRTcodename''),Sorddefstr5=DBO.F_Get_Order_SubStr(BaoID,''BNPSorddefstr5''),');
     sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), ');
     sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), ');
     SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen');