diff --git a/坯布仓库/BPCK.dof b/坯布仓库/BPCK.dof
index 658b7f5..5cde5e0 100644
--- a/坯布仓库/BPCK.dof
+++ b/坯布仓库/BPCK.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\����\�����ֿ�\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7FZaideng\�����ֿ�\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/坯布仓库/U_Bpkclist.pas b/坯布仓库/U_Bpkclist.pas
index d9882df..906c7e7 100644
--- a/坯布仓库/U_Bpkclist.pas
+++ b/坯布仓库/U_Bpkclist.pas
@@ -9,7 +9,20 @@ uses
   cxButtonEdit, cxDropDownEdit, cxGridLevel, cxGridCustomTableView,
   cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
   cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator;
+  cxLookAndFeels, cxLookAndFeelPainters, 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
   TfrmBpkclist = class(TForm)
@@ -136,11 +149,11 @@ end;
 
 procedure TfrmBpkclist.InitGrid();
 begin
-  try                                                   
-    with adoqueryTmp do                                    
-    begin                                                         
-      close;                         
-      sql.Clear;                  
+  try
+    with adoqueryTmp do
+    begin
+      close;
+      sql.Clear;
 //      sql.Add('select A.*,B.cust,B.factoryName from BP_KC A');
 //      sql.Add('inner join BP_inout B on B.KCID=A.KCID and B.CRFlag=''���'' ');
 //      sql.Add('where 1=1');        sum(([dbo].[Get_ShuZi](defstr3))   sum((cast(ISNULL(defstr2,0) as float))
@@ -148,17 +161,14 @@ begin
       SQL.Add('SELECT count(A.mxid) as RollNum,sum(A.kcqty2) as qty,B.cust,B.factoryName,B.CRTime,B.CRType,B.P_CodeName,B.P_SPEC,B.P_Color,B.gangNo,B.P_KZ,B.P_MF,B.QtyUnit,B.ckName ');
       SQL.Add(',PreBPqty=(select sum(([dbo].[Get_ShuZi](defstr2))*(isnull(prtorderqty,0))) from JYOrder_Sub X inner join KH_Zdy_CPCB M on M.ZdyCode=X.PRTCode left join JYOrder_Main N on N.mainid=X.mainid ');
       SQL.Add(' where M.defstr1=B.P_CodeName and  M.CBColor=X.prtcolor and left(SOrddefstr5,1)=''A''   and N.Status=''0'')');  // M.CBColor in (B.P_Color)
-//         SQL.Add(' where M.defstr1=B.P_CodeName and  M.CBColor=B.P_Color and left(SOrddefstr5,1)=''A''   and N.Status=''0'')');
       SQL.Add('+(select  sum(([dbo].[Get_ShuZi](defstr3))*(isnull(prtorderqty,0)))from JYOrder_Sub X  inner join KH_Zdy_CPCB M on M.ZdyCode=X.PRTCode left join JYOrder_Main N on N.mainid=X.mainid  ');
       SQL.Add(' where M.defstr1=B.P_CodeName and  M.CBColor=X.prtcolor and left(SOrddefstr5,1)=''C''  and N.Status=''0'' )');   //and  M.CBColor=B.P_Color
-//              sql.Add('FROM CK_SXPB_CRMX A inner join BP_InOut  B  on  A.crno=B.crno and B.crid=A.crid');
       sql.Add('FROM CK_SXPB_CRMX A inner join BP_InOut  B  on  A.crnos=B.crnos ');
       sql.Add(' where A.crzt=''���'' ');
-//      SQL.Add('and   exists(select crno from BP_KC   d where  D.crno=A.crno)');
       SQL.Add('and   exists(select crnoS from BP_KC   d where  D.crnos=A.crnos)');
       if begdate.Checked then
         sql.Add('and B.CRTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
-      if enddate.Checked then                                                                             
+      if enddate.Checked then
         sql.Add('and B.CRTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
 //      if not CheckBox1.Checked then
 //        sql.Add('and (A.RollNum<>0 or A.qty<>0 ) ');
@@ -225,7 +235,7 @@ end;
 procedure TfrmBpkclist.TBRafreshClick(Sender: TObject);
 begin
 
-  initGrid();          
+  initGrid();
 end;
 
 procedure TfrmBpkclist.TBPrintClick(Sender: TObject);
diff --git a/坯布仓库/U_DataLink.pas b/坯布仓库/U_DataLink.pas
index 07a8ad5..4b7be8e 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, ExtCtrls, AppEvnts, cxClasses;
+  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, AppEvnts, cxClasses,
+  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;
 
 var
   DConString: string;   {ȫ�������ַ���}
diff --git a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
index 59346ac..a252080 100644
--- a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
+++ b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
@@ -617,6 +617,16 @@ object frmZdyAttInputCP_CB: TfrmZdyAttInputCP_CB
               HeaderAlignmentHorz = taCenter
               Width = 66
             end
+            object TV1Column4: TcxGridDBColumn
+              Caption = #31867#22411
+              DataBinding.FieldName = 'BLtype'
+              PropertiesClassName = 'TcxComboBoxProperties'
+              Properties.Items.Strings = (
+                #38754#26009
+                #36741#26009)
+              HeaderAlignmentHorz = taCenter
+              Width = 60
+            end
           end
           object cxGrid1Level1: TcxGridLevel
             GridView = TV1
diff --git a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
index 0929a7e..4415263 100644
--- a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
+++ b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
@@ -23,7 +23,7 @@ uses
   dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
   dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
   dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
-  dxSkinXmas2008Blue, dxSkinscxPCPainter;
+  dxSkinXmas2008Blue, dxSkinscxPCPainter, cxDropDownEdit;
 
 type
   TfrmZdyAttInputCP_CB = class(TForm)
@@ -160,6 +160,7 @@ type
     TV5Column1: TcxGridDBColumn;
     TV5Column2: TcxGridDBColumn;
     CYColorno: TEdit;
+    TV1Column4: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -323,7 +324,7 @@ begin
     with cds1 do
     begin
       First;
-      while not eof do
+      while not eof do                 
       begin
         ADOQueryCmd.Append;
         ADOQueryCmd.FieldByName('CBID').Value := trim(FATID) + 'MF' + inttostr(recno);
@@ -337,11 +338,13 @@ begin
         ADOQueryCmd.FieldByName('defstr4').Value := trim(fieldbyname('defstr4').AsString);
         ADOQueryCmd.FieldByName('DefFlt4').Value := fieldbyname('DefFlt4').AsFloat;
         ADOQueryCmd.FieldByName('DefFlt5').Value := fieldbyname('DefFlt5').AsFloat;
+
         ADOQueryCmd.fieldbyname('DefFlt1').Value := strtofloatdef(trim(DefFlt1.Text), 0);
         ADOQueryCmd.fieldbyname('DefFlt2').Value := strtofloatdef(trim(DefFlt2.Text), 0);
         ADOQueryCmd.fieldbyname('CBdj').Value := fieldbyname('CBdj').AsFloat;
         ADOQueryCmd.fieldbyname('Cbsh').Value := fieldbyname('cbsh').AsFloat;
         ADOQueryCmd.fieldbyname('CBColor').Value := trim(fieldbyname('CBColor').AsString);
+        ADOQueryCmd.fieldbyname('BLtype').Value := trim(fieldbyname('BLtype').AsString);
         ADOQueryCmd.Post;
         next;
       end;
diff --git a/应收应付/U_YSYGGJList.dfm b/应收应付/U_YSYGGJList.dfm
index b2b19cd..e87aef9 100644
--- a/应收应付/U_YSYGGJList.dfm
+++ b/应收应付/U_YSYGGJList.dfm
@@ -371,6 +371,7 @@ object frmCKJYList: TfrmCKJYList
       end
       object v1Column1: TcxGridDBColumn
         Caption = #23610#30721
+        DataBinding.FieldName = 'SOrddefstr5'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 110
@@ -420,6 +421,12 @@ object frmCKJYList: TfrmCKJYList
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'PRTColor'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
diff --git a/应收应付/U_YSYGGJList.pas b/应收应付/U_YSYGGJList.pas
index 64cf87a..190dc8a 100644
--- a/应收应付/U_YSYGGJList.pas
+++ b/应收应付/U_YSYGGJList.pas
@@ -10,7 +10,21 @@ uses
   cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, MovePanel, cxButtonEdit, cxCalendar, cxPC, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu;
+  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, 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
   TfrmCKJYList = class(TForm)
@@ -73,6 +87,7 @@ type
     Tv1Column3: TcxGridDBColumn;
     Label4: TLabel;
     Prtcode: TEdit;
+    Tv1Column4: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -97,7 +112,7 @@ type
     { Public declarations }
   end;
 
-var                                               
+var
   frmCKJYList: TfrmCKJYList;
 
 implementation
@@ -130,10 +145,10 @@ begin
     ADOQueryMain.DisableControls;                 
     with ADOQueryMain do
     begin
-      Close;
+      Close;                               
       sql.Clear;
       Filtered := False;
-      sql.Add('select A.*,B.PRTCodeName,B.prtcode,');
+      sql.Add('select A.*,B.PRTCodeName,B.prtcode,B.PRTColor,B.SOrddefstr5,');
       sql.Add('gxdj=case when  A.qty<=30 then isnull((select (A.GxPrice)*2 from JyOrder_Yield B where A.CLID=B.clid ),0)');
       SQL.Add('else isnull((A.GxPrice ),0) end, ');
       sql.Add('gxmoney=case when  A.qty<=30 then isnull((select ((A.GxPrice)*2)*B.qty from JyOrder_Yield B where A.CLID=B.clid ),0)');
diff --git a/应收应付/YSYF.dof b/应收应付/YSYF.dof
index 5cf936b..d883e8c 100644
--- a/应收应付/YSYF.dof
+++ b/应收应付/YSYF.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\����\Ӧ��Ӧ��\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7FZaideng\Ӧ��Ӧ��\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/艾登贸易管理/U_GetDllForm.pas b/艾登贸易管理/U_GetDllForm.pas
index 14a4522..a48e67f 100644
--- a/艾登贸易管理/U_GetDllForm.pas
+++ b/艾登贸易管理/U_GetDllForm.pas
@@ -187,7 +187,7 @@ begin
             BorderStyle := mborderstyle;
            //show;
           end;
-        end
+        end                                            
         else
           frmContractListNX.BringToFront;
        //���
diff --git a/艾登贸易管理/U_ProductOrderNewList.dfm b/艾登贸易管理/U_ProductOrderNewList.dfm
index 5174c84..9c81dde 100644
--- a/艾登贸易管理/U_ProductOrderNewList.dfm
+++ b/艾登贸易管理/U_ProductOrderNewList.dfm
@@ -126,36 +126,36 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       AutoSize = True
       Caption = #25351#31034#21333#38468#20214
       ImageIndex = 57
-      Wrap = True
       OnClick = TFJClick
     end
     object TBPrint: TToolButton
-      Left = 0
-      Top = 30
+      Left = 753
+      Top = 0
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = TBPrintClick
     end
     object ToolButton4: TToolButton
-      Left = 63
-      Top = 30
+      Left = 816
+      Top = 0
       AutoSize = True
       Caption = #21512#24182#25171#21360
       ImageIndex = 12
       OnClick = ToolButton4Click
     end
     object ToolButton7: TToolButton
-      Left = 150
-      Top = 30
+      Left = 903
+      Top = 0
       AutoSize = True
       Caption = #35746#21333#21512#24182
       ImageIndex = 16
+      Wrap = True
       Visible = False
       OnClick = ToolButton7Click
     end
     object ToolButton8: TToolButton
-      Left = 237
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #21462#28040#21512#24182
@@ -164,31 +164,31 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton8Click
     end
     object ToolButton6: TToolButton
-      Left = 324
+      Left = 87
       Top = 30
       AutoSize = True
       Caption = #29983#20135#25171#21360
       ImageIndex = 12
       OnClick = ToolButton6Click
     end
-    object ToolButton9: TToolButton
-      Left = 411
+    object TWC: TToolButton
+      Left = 174
       Top = 30
       AutoSize = True
       Caption = #35746#21333#23436#25104
       ImageIndex = 41
-      OnClick = ToolButton9Click
+      OnClick = TWCClick
     end
-    object ToolButton10: TToolButton
-      Left = 498
+    object Tnowc: TToolButton
+      Left = 261
       Top = 30
       AutoSize = True
       Caption = #25764#38144#23436#25104
       ImageIndex = 99
-      OnClick = ToolButton10Click
+      OnClick = TnowcClick
     end
     object ToolButton11: TToolButton
-      Left = 585
+      Left = 348
       Top = 30
       AutoSize = True
       Caption = #26631#31614#35774#32622
@@ -196,7 +196,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton11Click
     end
     object ToolButton12: TToolButton
-      Left = 672
+      Left = 435
       Top = 30
       AutoSize = True
       Caption = #26631#31614#25171#21360
@@ -204,7 +204,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton12Click
     end
     object ToolButton13: TToolButton
-      Left = 759
+      Left = 522
       Top = 30
       AutoSize = True
       Caption = #26631#31614#35774#32622#29305#27530
@@ -212,7 +212,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton13Click
     end
     object ToolButton14: TToolButton
-      Left = 870
+      Left = 633
       Top = 30
       AutoSize = True
       Caption = #20986#24211
@@ -221,13 +221,29 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       OnClick = ToolButton14Click
     end
     object TBClose: TToolButton
-      Left = 933
+      Left = 696
       Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
       OnClick = TBCloseClick
     end
+    object Tchk: TToolButton
+      Left = 759
+      Top = 30
+      AutoSize = True
+      Caption = #23457#26680
+      ImageIndex = 56
+      OnClick = TchkClick
+    end
+    object Tnochk: TToolButton
+      Left = 822
+      Top = 30
+      AutoSize = True
+      Caption = #25764#38144#23457#26680
+      ImageIndex = 57
+      OnClick = TnochkClick
+    end
   end
   object Panel1: TPanel
     Left = 0
@@ -723,7 +739,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 634
+    Top = 401
     Width = 1334
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
@@ -896,9 +912,10 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     TabOrder = 7
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 2
     Properties.Tabs.Strings = (
-      #26410#23436#25104
+      #26410#23457#26680
+      #24050#23457#26680
       #24050#23436#25104
       #20840#37096)
     OnChange = cxTabControl1Change
@@ -908,7 +925,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object Panel3: TPanel
     Left = 0
-    Top = 401
+    Top = 409
     Width = 1334
     Height = 233
     Align = alBottom
diff --git a/艾登贸易管理/U_ProductOrderNewList.pas b/艾登贸易管理/U_ProductOrderNewList.pas
index 37ae298..b4af4c7 100644
--- a/艾登贸易管理/U_ProductOrderNewList.pas
+++ b/艾登贸易管理/U_ProductOrderNewList.pas
@@ -131,8 +131,8 @@ type
     prtcode: TEdit;
     ADOQuery1: TADOQuery;
     cxTabControl1: TcxTabControl;
-    ToolButton9: TToolButton;
-    ToolButton10: TToolButton;
+    TWC: TToolButton;
+    Tnowc: TToolButton;
     Panel3: TPanel;
     cxGrid2: TcxGrid;
     TV2: TcxGridDBTableView;
@@ -175,6 +175,8 @@ type
     TV3Column8: TcxGridDBColumn;
     TV2Column3: TcxGridDBColumn;
     ToolButton14: TToolButton;
+    Tchk: TToolButton;
+    Tnochk: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -213,8 +215,8 @@ type
     procedure ToolButton6Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
-    procedure ToolButton9Click(Sender: TObject);
-    procedure ToolButton10Click(Sender: TObject);
+    procedure TWCClick(Sender: TObject);
+    procedure TnowcClick(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure TV2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
     procedure ToolButton12Click(Sender: TObject);
@@ -223,6 +225,8 @@ type
     procedure ToolButton11Click(Sender: TObject);
     procedure ToolButton13Click(Sender: TObject);
     procedure ToolButton14Click(Sender: TObject);
+    procedure TchkClick(Sender: TObject);
+    procedure TnochkClick(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -232,14 +236,15 @@ type
     procedure InitSub();
     procedure CJEWMS();
     procedure CJEWM(FMainid: string; FSubid: string);
-    procedure InitImageYS(fwbid: string);                          
+    procedure InitImageYS(fwbid: string);
+    procedure SetStatus();
     { Private declarations }
   public
     FFInt, FCloth: Integer;
                                                                
     { Public declarations }
   end;
-                                              
+
 var
   frmProductOrderNewList: TfrmProductOrderNewList;
   dFdDy: array[0..120] of FdDy;
@@ -250,9 +255,41 @@ uses
   U_DataLink, U_OrderInPut, U_Fun, U_LabelList, U_LabelListts, U_FjList_RZ;
 
 {$R *.dfm}
+procedure TfrmProductOrderNewList.SetStatus();
+begin
+  Tchk.Visible := false;
+  tNochk.Visible := false;
+  TWC.Visible := false;
+  Tnowc.Visible := false;
+  TBEdit.Enabled := false;
+  TBDel.Enabled := false;
+  case cxTabControl1.TabIndex of
+    0:
+      begin
+        TBEdit.Enabled := true;
+        TBDel.Enabled := true;
+        Tchk.Visible := true;
+
+      end;
+    1:
+      begin
+
+        tNochk.Visible := true;
+        TWC.Visible := true;
+      end;
+    2:
+      begin
+
+        TNOWC.Visible := true;
+      end;
+
+  end;
+
+end;
+
 procedure TfrmProductOrderNewList.InitSub();
 begin
-//  ADOQuerySub.Close;                                     
+//  ADOQuerySub.Close;
   if Order_Main.IsEmpty then
     exit;
   with ADOQuerySub do
@@ -261,7 +298,7 @@ begin
     sql.Clear;
     sql.Add('select stuff((select '',''+ (select isnull(X.DRCKName,'''')  from CP_InOut X where X.subid=A.subid for xml path(''''))),1,1,'''' ) as prtKW');
     sql.Add(',prttxm=(select    DEFstr2 from  KH_Zdy_CPCB  X   where X.cbType=''CPCBCM'' and X.ZdyName=A.PRTCodeName  and  X.Zdycode=A.PRTCode and X.defstr1=a.SOrddefstr5)');
-     sql.Add(' ,A.*  from JYOrder_sub A   ');
+    sql.Add(' ,A.*  from JYOrder_sub A   ');
     sql.Add('where A.mainID =' + quotedstr((Order_Main.fieldbyname('mainID').AsString)));
 //    ShowMessage(sql.text);
     open;
@@ -1090,13 +1127,13 @@ begin
     with ADOQueryCmd do
     begin
       Close;
-      sql.Clear;                        
+      sql.Clear;
       sql.Add('exec P_Get_Order_DR ''' + trim(DName) + ''' ');
       ExecSQL;
     end;
 
     with ADOQueryTemp do
-    begin                                  
+    begin
       Close;
       sql.Clear;
       sql.add('select * from jyorder_sub where subid in (select subid from jyorder_Main_DR)');
@@ -1508,7 +1545,7 @@ begin
   Panel2.Visible := false;
 end;
 
-procedure TfrmProductOrderNewList.ToolButton9Click(Sender: TObject);
+procedure TfrmProductOrderNewList.TWCClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -1517,7 +1554,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('update  JYOrder_Main SET status=''1'' ');
+      sql.Add('update  JYOrder_Main SET status=''9'' ');
       sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
       sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
       sql.Add(' ' + quotedstr(trim(DName)));
@@ -1536,7 +1573,7 @@ begin
   end;
 end;
 
-procedure TfrmProductOrderNewList.ToolButton10Click(Sender: TObject);
+procedure TfrmProductOrderNewList.TnowcClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -1545,7 +1582,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('update  JYOrder_Main SET status=''0'' ');
+      sql.Add('update  JYOrder_Main SET status=''2'' ');
       sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
       sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
       sql.Add(' ' + quotedstr(trim(DName)));
@@ -1566,7 +1603,7 @@ end;
 
 procedure TfrmProductOrderNewList.cxTabControl1Change(Sender: TObject);
 begin
-
+  SetStatus();
   InitGrid();
 end;
 
@@ -1607,8 +1644,8 @@ begin
 //  if Trim(Order_Main.fieldbyname('LBName').AsString) = '' then
 //  begin
 //    Exit;
-//  end;                                                       
-  panel5.Visible := True;                              
+//  end;
+  panel5.Visible := True;
 end;
 
 procedure TfrmProductOrderNewList.Button4Click(Sender: TObject);
@@ -1682,7 +1719,7 @@ begin
     Open;
   end;
 //  SCreateCDS20(ADOQueryPrint, CDS_Print2);
-  SCreateCDS20(ADOQueryPrint, CDS_Print1);                    
+  SCreateCDS20(ADOQueryPrint, CDS_Print1);
   SInitCDSData20(ADOQueryPrint, CDS_Print1);
   fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + CDS_Print1.fieldbyname('LBName').AsString + '.rmf';
 
@@ -1797,11 +1834,11 @@ end;
 
 procedure TfrmProductOrderNewList.ToolButton14Click(Sender: TObject);
 begin
-    with ADOQuery1 do
+  with ADOQuery1 do
   begin
     Close;
     sql.Clear;
-    sql.Add('exec P_Do_JYCRK  ''' +Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
+    sql.Add('exec P_Do_JYCRK  ''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
 //    sql.Add(',''' + trim(Edit2.Text) + ''' ');
 //    showmessage(sql.Text);
     Open;
@@ -1809,5 +1846,69 @@ begin
 
 end;
 
+procedure TfrmProductOrderNewList.TchkClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  JYOrder_Main SET status=''2'' ');
+      sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('�������')));
+      sql.Add(',' + quotedstr(trim('�����ţ�' + trim(Order_Main.FieldByName('OrderNO').AsString))));
+      sql.Add(',' + quotedstr(trim('�ɹ�')));
+      sql.Add(')');
+      execsql;
+    end;
+    application.MessageBox('����ˣ�', '��ʾ��Ϣ', 0);
+    TBRafresh.Click;
+  except
+    application.MessageBox('δ��ˣ�', '��ʾ��Ϣ', 0);
+  end;
+  with ADOQuery1 do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('exec P_Do_MLCK  ''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');     //���ϳ���
+    sql.add(',@DName=' + quotedstr(Trim(DCode)));
+    ExecSQL;
+  end;
+end;
+
+procedure TfrmProductOrderNewList.TnochkClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  JYOrder_Main SET status=''0'' ');
+      sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('�����������')));
+      sql.Add(',' + quotedstr(trim('�����ţ�' + trim(Order_Main.FieldByName('orderNO').AsString))));
+      sql.Add(',' + quotedstr(trim('�ɹ�')));
+      sql.Add(')');
+      execsql;
+    end;
+    application.MessageBox('����������˳ɹ���', '��ʾ��Ϣ');
+    TBRafresh.Click;
+  except
+    application.MessageBox('�����������ʧ�ܣ�', '��ʾ��Ϣ', 0);
+  end;
+end;
+
 end.