diff --git a/成品仓库/U_Bpkclist.pas b/成品仓库/U_Bpkclist.pas
index ffaa072..fbc89a6 100644
--- a/成品仓库/U_Bpkclist.pas
+++ b/成品仓库/U_Bpkclist.pas
@@ -11,21 +11,20 @@ uses
   cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox,
   IdFTP, ShellAPI, strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, RM_System, RM_Dataset, Menus,
-  MovePanel, cxContainer, cxTextEdit, cxCurrencyEdit, dxSkinsCore,
-  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
-  dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
-  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
-  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
-  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  MovePanel, cxContainer, cxTextEdit, cxCurrencyEdit, 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;
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;
 
 type
   TfrmBpkclist = class(TForm)
@@ -184,8 +183,6 @@ type
     procedure Button1Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
-
- 
   private
     procedure InitGrid();
     procedure InitSub();
@@ -244,7 +241,7 @@ begin
     end;
   end;
   if CRType.Items.Count > 0 then
-    CRType.ItemIndex := 0;                          
+    CRType.ItemIndex := 0;
 end;
 
 procedure TfrmBpkclist.InitGrid();
@@ -294,7 +291,7 @@ begin
     SCreateCDS20(ADOQueryYck, CDS_Yck);
     SInitCDSData20(ADOQueryYck, CDS_Yck);
   finally
-  end;                                               
+  end;
 end;
 
 procedure TfrmBpkclist.FormClose(Sender: TObject; var Action: TCloseAction);
@@ -384,7 +381,7 @@ begin
   sqlstr := '';
   i := 0;
   MovePanel2.Visible := True;
-  with CDS_Main do                               
+  with CDS_Main do
   begin
     First;
     while CDS_Main.Locate('SSel', true, []) do
@@ -464,7 +461,7 @@ begin
   MovePanel2.Visible := False;
 
 end;
-//begin                                        
+//begin
 //  if CDS_Main.IsEmpty then
 //    Exit;
 //  TcxGridToExcel(self.Caption, cxgrid1);
@@ -539,7 +536,7 @@ begin
 end;
 
 procedure TfrmBpkclist.N1Click(Sender: TObject);
-begin                                                            
+begin
   SelOKNo(CDS_Main, True);
 end;
 
@@ -574,15 +571,17 @@ begin
         if CDS_Main.FieldByName('SSel').AsBoolean = True then
         begin
           with ADOQueryCmd do
-          begin
-            Close;
+          begin                          
+            Close;                     
             sql.Clear;
             sql.Add('Update CP_inout Set DRCKNO=''' + trim(Edit1.Text) + ''' ');
             sql.Add('where P_CodeName=''' + Trim(CDS_Main.fieldbyname('P_CodeName').AsString) + '''');
             sql.Add('and  P_Code=''' + Trim(CDS_Main.fieldbyname('P_Code').AsString) + '''');
             sql.Add('and DRCKNO=''' + Trim(CDS_Main.fieldbyname('DRCKNO').AsString) + '''');
             sql.Add('and DRCKName=''' + Trim(CDS_Main.fieldbyname('DRCKName').AsString) + '''');
-//            sql.add('where AA.P_CodeName='FAIRY' and AA.P_Code='1505-C'  and isnull(DRCKNO,'')='101' and isnull(DRCKName,'')='�������²�'');
+            sql.Add('and mainid=''' + Trim(CDS_Main.fieldbyname('mainid').AsString) + '''');
+            sql.Add('and subid=''' + Trim(CDS_Main.fieldbyname('subid').AsString) + '''');
+  //            sql.add('where AA.P_CodeName='FAIRY' and AA.P_Code='1505-C'  and isnull(DRCKNO,'')='101' and isnull(DRCKName,'')='�������²�'');
             ExecSQL;
           end;
         end;
@@ -664,6 +663,5 @@ begin
   Panel2.Visible := true;
 end;
 
-
 end.