仓库调整

基础资料维护(BaseInfo.dll)/BaseInfo.dpr

@@ -3,7 +3,7 @@ library BaseInfo;
 uses
   SysUtils,
   classes,
-  forms,
+  forms,                                        
   WinTypes,
   WinProcs,
   U_DataLink in 'U_DataLink.pas' {DataLink_BaseInfo: TDataModule},

基础资料维护(BaseInfo.dll)/U_MLXXList.dfm

@@ -1,7 +1,7 @@
 object frmMLXXList: TfrmMLXXList
   Left = 588
   Top = 307
-  Width = 1075
+  Width = 1165
   Height = 629
   Caption = #36741#26009#20449#24687#31649#29702
   Color = clBtnFace
@@ -19,7 +19,7 @@ object frmMLXXList: TfrmMLXXList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1059
+    Width = 1149
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 113
@@ -77,7 +77,6 @@ object frmMLXXList: TfrmMLXXList
       Top = 0
       Caption = #25552#21462'Excel'#25968#25454
       ImageIndex = 106
-      Visible = False
       OnClick = ToolButton5Click
     end
     object ToolButton1: TToolButton
@@ -100,7 +99,7 @@ object frmMLXXList: TfrmMLXXList
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1059
+    Width = 1149
     Height = 39
     Align = alTop
     BevelInner = bvRaised
@@ -167,7 +166,7 @@ object frmMLXXList: TfrmMLXXList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 70
-    Width = 1059
+    Width = 1149
     Height = 520
     Align = alClient
     TabOrder = 2
@@ -318,6 +317,48 @@ object frmMLXXList: TfrmMLXXList
         Options.Sorting = False
         Width = 188
       end
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'GYS'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column2: TcxGridDBColumn
+        Caption = #36741#26009#32534#21495
+        DataBinding.FieldName = 'MLBH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #35268#26684
+        DataBinding.FieldName = 'MJgg'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #25104#20154#29992#37327
+        DataBinding.FieldName = 'Adultamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column5: TcxGridDBColumn
+        Caption = #20799#31461#29992#37327
+        DataBinding.FieldName = 'childamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column6: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'Price'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column7: TcxGridDBColumn
+        Caption = #21512#35745
+        DataBinding.FieldName = 'Total'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv2
@@ -340,8 +381,8 @@ object frmMLXXList: TfrmMLXXList
     Connection = DataLink_BaseInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 949
+    Left = 717
-    Top = 225
+    Top = 209
   end
   object RM1: TRMGridReport
     ThreadPrepareReport = True

基础资料维护(BaseInfo.dll)/U_MLXXList.pas

@@ -77,6 +77,13 @@ type
     v2Mrate: TcxGridDBColumn;
     v2Column14: TcxGridDBColumn;
     v2Column15: TcxGridDBColumn;
+    Tv2Column1: TcxGridDBColumn;
+    Tv2Column2: TcxGridDBColumn;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column4: TcxGridDBColumn;
+    Tv2Column5: TcxGridDBColumn;
+    Tv2Column6: TcxGridDBColumn;
+    Tv2Column7: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -94,7 +101,7 @@ type
     procedure InitGrid();
   public
     fkhType: string;
-    dFdDy: array[0..20] of FdDy; //客户端连接数组
+    dFdDy: array[0..200] of FdDy; //客户端连接数组
   end;
 
 var
@@ -153,7 +160,7 @@ begin
   if Trim(CDS_HZ.fieldbyname('MLID').AsString) <> '' then
   begin
     with ADOQueryCmd do
-    begin                                         
+    begin
       Close;
       SQL.Clear;
       sql.Add('delete KH_Zdy_MLXX where MLID=''' + Trim(CDS_HZ.fieldbyname('MLID').AsString) + '''');
@@ -261,57 +268,74 @@ begin
     begin
       if trim(excelApp.Cells[1, i].value) = '' then
         break;
-      if trim(excelApp.Cells[1, i].value) = '产品编号' then
+      if trim(excelApp.Cells[1, i].value) = '辅料名称' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'ZdyCode';
+        dFdDy[k].FDdys := 'MLName';
-        dFdDy[k].FdDysName := '产品编号';
+        dFdDy[k].FdDysName := '辅料名称';
-      end;
-
-      if trim(excelApp.Cells[1, i].value) = '产品名称' then
-      begin
-        dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'ZdyName';
-        dFdDy[k].FdDysName := '产品名称';
-      end;
-
-      if trim(excelApp.Cells[1, i].value) = '中文名称' then
-      begin
-        dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'defNote3';
-        dFdDy[k].FdDysName := '中文名称';
       end;
 
       if trim(excelApp.Cells[1, i].value) = '颜色' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'DEFstr3';
+        dFdDy[k].FDdys := 'Color';
         dFdDy[k].FdDysName := '颜色';
       end;
-      if trim(excelApp.Cells[1, i].value) = '中文颜色' then
+
+      if trim(excelApp.Cells[1, i].value) = '备注' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'DEFstr6';
+        dFdDy[k].FDdys := 'Note';
-        dFdDy[k].FdDysName := '中文颜色';
+        dFdDy[k].FdDysName := '备注';
       end;
 
       if trim(excelApp.Cells[1, i].value) = '类型' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'DEFstr5';
+        dFdDy[k].FDdys := 'Type';
         dFdDy[k].FdDysName := '类型';
       end;
+      if trim(excelApp.Cells[1, i].value) = '供应商' then
+      begin
+        dFdDy[k].inc := i;
+        dFdDy[k].FDdys := 'GYS';
+        dFdDy[k].FdDysName := '供应商';
+      end;
+      if trim(excelApp.Cells[1, i].value) = '辅料标签' then
+      begin
+        dFdDy[k].inc := i;
+        dFdDy[k].FDdys := 'MLBH';
+        dFdDy[k].FdDysName := '辅料标签';
+      end;
       if trim(excelApp.Cells[1, i].value) = '规格' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'DEFstr1';
+        dFdDy[k].FDdys := 'MLgg';
         dFdDy[k].FdDysName := '规格';
       end;
-      if trim(excelApp.Cells[1, i].value) = '成份' then
+      if trim(excelApp.Cells[1, i].value) = '成人用量' then
       begin
         dFdDy[k].inc := i;
-        dFdDy[k].FDdys := 'DEFstr2';
+        dFdDy[k].FDdys := 'Adultamount';
-        dFdDy[k].FdDysName := '成份';
+        dFdDy[k].FdDysName := '成人用量';
+      end;
+      if trim(excelApp.Cells[1, i].value) = '儿童用量' then
+      begin
+        dFdDy[k].inc := i;
+        dFdDy[k].FDdys := 'childamount';
+        dFdDy[k].FdDysName := '儿童用量';
+      end;
+      if trim(excelApp.Cells[1, i].value) = '单价' then
+      begin
+        dFdDy[k].inc := i;
+        dFdDy[k].FDdys := 'Price';
+        dFdDy[k].FdDysName := '单价';
+      end;
+      if trim(excelApp.Cells[1, i].value) = '合计' then
+      begin
+        dFdDy[k].inc := i;
+        dFdDy[k].FDdys := 'Total';
+        dFdDy[k].FdDysName := '合计';
       end;
       k := k + 1;
     end;
@@ -322,7 +346,7 @@ begin
   try
     for i := 2 to ExcelRowCount do
     begin
-      if GetLSNo(ADOQueryCmd, maxId, 'AT', 'KH_Zdy_Attachment', 4, 1) = False then
+      if GetLSNo(ADOQueryCmd, maxId, 'ML', 'KH_Zdy_MLXX', 4, 1) = False then
       begin
         ADOQueryCmd.Connection.RollbackTrans;
         Application.MessageBox('取最大号失败！', '提示', 0);
@@ -333,19 +357,20 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('select * from KH_Zdy_Attachment where 1=2');
+        sql.Add('select * from KH_Zdy_MLXX where 1=2');
         open;
       end;
       ADOQueryCmd.Append;
-      for j := 0 to k - 1 do                
+      for j := 0 to k - 1 do
-      begin                                 
+      begin
         ADOQueryCmd.fieldbyname(dFdDy[j].FDdys).Value := excelApp.Cells[i, dFdDy[j].inc].Value;
       end;
-      ADOQueryCmd.FieldByName('ATID').Value := Trim(maxId);
+      ADOQueryCmd.FieldByName('MLID').Value := Trim(maxId);
-      ADOQueryCmd.FieldByName('zdyCode').Value := Trim(maxId);
+//      ADOQueryCmd.FieldByName('zdyCode').Value := Trim(maxId);
-      ADOQueryCmd.FieldByName('khType').Value := Trim(fkhType);
+//      ADOQueryCmd.FieldByName('khType').Value := Trim(fkhType);
-      ADOQueryCmd.FieldByName('Type').Value := 'CP';
+      ADOQueryCmd.FieldByName('Type').Value := '辅料';
       ADOQueryCmd.FieldByName('Filler').Value := Trim(DName);
+      ADOQueryCmd.FieldByName('FillTime').Value := SGetServerDateTime(ADOQueryTemp);
       ADOQueryCmd.Post;
 
     end;

基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm

@@ -221,15 +221,6 @@ object frmMLXXListSel: TfrmMLXXListSel
         Options.Sorting = False
         Width = 94
       end
-      object Tv2Column1: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'Ssel'
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        Properties.ImmediatePost = True
-        Properties.NullStyle = nssUnchecked
-        HeaderAlignmentHorz = taCenter
-        Width = 60
-      end
       object v2Column6: TcxGridDBColumn
         Caption = #36741#26009#21517#31216
         DataBinding.FieldName = 'MLName'
@@ -280,6 +271,43 @@ object frmMLXXListSel: TfrmMLXXListSel
         VisibleForCustomization = False
         Width = 74
       end
+      object v2Mrate: TcxGridDBColumn
+        Caption = #35745#21010#32553#29575'(%)'
+        DataBinding.FieldName = 'Mrate'
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Sorting = False
+        VisibleForCustomization = False
+        Width = 80
+      end
+      object v2Column13: TcxGridDBColumn
+        Caption = #24037#33402
+        DataBinding.FieldName = 'defNote2'
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Sorting = False
+        VisibleForCustomization = False
+        Width = 100
+      end
+      object v2Column9: TcxGridDBColumn
+        Caption = #38376#24133
+        DataBinding.FieldName = 'DEFstr7'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Sorting = False
+        VisibleForCustomization = False
+        Width = 73
+      end
+      object v2Column7: TcxGridDBColumn
+        Caption = #20811#37325
+        DataBinding.FieldName = 'DEFstr8'
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Sorting = False
+        VisibleForCustomization = False
+        Width = 61
+      end
       object v2Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
@@ -302,6 +330,56 @@ object frmMLXXListSel: TfrmMLXXListSel
         Options.Sorting = False
         Width = 188
       end
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'GYS'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column2: TcxGridDBColumn
+        Caption = #36741#26009#32534#21495
+        DataBinding.FieldName = 'MLBH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #35268#26684
+        DataBinding.FieldName = 'MJgg'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #25104#20154#29992#37327
+        DataBinding.FieldName = 'Adultamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column5: TcxGridDBColumn
+        Caption = #20799#31461#29992#37327
+        DataBinding.FieldName = 'childamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column6: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'Price'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column7: TcxGridDBColumn
+        Caption = #21512#35745
+        DataBinding.FieldName = 'Total'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv2Column8: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'ssel'
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.NullStyle = nssUnchecked
+        Width = 60
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv2
@@ -354,7 +432,6 @@ object frmMLXXListSel: TfrmMLXXListSel
     Top = 180
   end
   object cxGridPopupMenu2: TcxGridPopupMenu
-    Grid = cxGrid2
     PopupMenus = <>
     Left = 888
     Top = 224

基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas

@@ -50,31 +50,42 @@ type
     RMDB_Main: TRMDBDataSet;
     Label3: TLabel;
     ZdyName: TEdit;
-    cxGrid2: TcxGrid;
-    Tv2: TcxGridDBTableView;
-    cxGridLevel1: TcxGridLevel;
     cxGridPopupMenu2: TcxGridPopupMenu;
     DS_HZ: TDataSource;
     CDS_HZ: TClientDataSet;
     ToolButton3: TToolButton;
-    v2Column6: TcxGridDBColumn;
-    v2Column1: TcxGridDBColumn;
-    v2Column2: TcxGridDBColumn;
-    v2Column3: TcxGridDBColumn;
-    v2Column4: TcxGridDBColumn;
-    v2Column5: TcxGridDBColumn;
     Label1: TLabel;
     ZdyCode: TEdit;
     ToolButton4: TToolButton;
     Label2: TLabel;
     DEFstr5: TComboBox;
-    v2Column11: TcxGridDBColumn;
     OpenDialog1: TOpenDialog;
     ToolButton5: TToolButton;
+    ToolButton6: TToolButton;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    v2Column2: TcxGridDBColumn;
+    v2Column6: TcxGridDBColumn;
+    v2Column5: TcxGridDBColumn;
+    v2Column11: TcxGridDBColumn;
+    v2Column3: TcxGridDBColumn;
+    v2Column4: TcxGridDBColumn;
+    v2Mrate: TcxGridDBColumn;
+    v2Column13: TcxGridDBColumn;
+    v2Column9: TcxGridDBColumn;
+    v2Column7: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
     v2Column14: TcxGridDBColumn;
     v2Column15: TcxGridDBColumn;
     Tv2Column1: TcxGridDBColumn;
-    ToolButton6: TToolButton;
+    Tv2Column2: TcxGridDBColumn;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column4: TcxGridDBColumn;
+    Tv2Column5: TcxGridDBColumn;
+    Tv2Column6: TcxGridDBColumn;
+    Tv2Column7: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    Tv2Column8: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm

@@ -1,6 +1,6 @@
 object frmMLXXinput: TfrmMLXXinput
-  Left = 617
+  Left = 495
-  Top = 377
+  Top = 376
   Width = 1171
   Height = 370
   Caption = #36741#26009#20449#24687#24405#20837
@@ -22,7 +22,7 @@ object frmMLXXinput: TfrmMLXXinput
     Width = 1155
     Height = 31
     ButtonHeight = 30
-    ButtonWidth = 59
+    ButtonWidth = 83
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_BaseInfo.ThreeImgList
@@ -43,21 +43,28 @@ object frmMLXXinput: TfrmMLXXinput
     object ToolButton1: TToolButton
       Left = 63
       Top = 0
+      AutoSize = True
       Caption = #22686#34892
       ImageIndex = 103
-      Visible = False
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 122
+      Left = 126
       Top = 0
+      AutoSize = True
       Caption = #21024#34892
       ImageIndex = 107
-      Visible = False
       OnClick = ToolButton2Click
     end
+    object ToolButton4: TToolButton
+      Left = 189
+      Top = 0
+      Caption = #25171#24320#25991#20214
+      ImageIndex = 5
+      OnClick = ToolButton4Click
+    end
     object TBClose: TToolButton
-      Left = 181
+      Left = 272
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -122,6 +129,52 @@ object frmMLXXinput: TfrmMLXXinput
       object v2Column11: TcxGridDBColumn
         Caption = #31867#22411
         DataBinding.FieldName = 'Type'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.Items.Strings = (
+          #36741#26009
+          #38754#26009)
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'GYS'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #36741#26009#32534#21495
+        DataBinding.FieldName = 'MLBH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #35268#26684
+        DataBinding.FieldName = 'MLgg'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #25104#20154#29992#37327
+        DataBinding.FieldName = 'Adultamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #20799#31461#29992#37327
+        DataBinding.FieldName = 'childamount'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'Price'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21512#35745
+        DataBinding.FieldName = 'Total'
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
@@ -192,4 +245,14 @@ object frmMLXXinput: TfrmMLXXinput
     Left = 696
     Top = 128
   end
+  object OpenDialog1: TOpenDialog
+    Left = 386
+    Top = 170
+  end
+  object CDS_LM: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 232
+    Top = 240
+  end
 end

基础资料维护(BaseInfo.dll)/U_MLXXinput.pas

@@ -26,7 +26,7 @@ uses
   dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
   dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
   dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, ComObj;
 
 type
   TfrmMLXXinput = class(TForm)
@@ -50,6 +50,16 @@ type
     ToolButton1: TToolButton;
     ToolButton2: TToolButton;
     Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    ToolButton4: TToolButton;
+    OpenDialog1: TOpenDialog;
+    CDS_LM: TClientDataSet;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -62,6 +72,7 @@ type
     procedure Tv2Column1PropertiesEditValueChanged(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -122,16 +133,16 @@ procedure TfrmMLXXinput.FormShow(Sender: TObject);
 begin
   ReadCxGrid('产品资料录入1', Tv1, '客户自定义');
   InitGrid();
-  if Trim(FMLID) = '' then
+//  if Trim(FMLID) = '' then
-  begin
+//  begin
-    with CDS_HZ do
+//    with CDS_HZ do
-    begin
+//    begin
-      Edit;
+//      Edit;
-      FieldByName('type').Value := '面料';
+//      FieldByName('type').Value := '面料';
-      Post;
+//      Post;
-    end;
+//    end;
-
+//
-  end;
+//  end;
 end;
 
 procedure TfrmMLXXinput.TBRafreshClick(Sender: TObject);
@@ -143,79 +154,95 @@ function TfrmMLXXinput.SaveData(): Boolean;
 var
   maxId, CRID: string;
 begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  ADOQueryCmd.Connection.BeginTrans;
   try
-    ADOQueryCmd.Connection.BeginTrans;
-    if Trim(FMLID) = '' then
-    begin
-      if GetLSNo(ADOQueryCmd, maxId, 'ML', 'KH_Zdy_MLXX', 4, 1) = False then
-      begin
-        Result := False;
-        ADOQueryCmd.Connection.RollbackTrans;
-        Application.MessageBox('取最大号失败！', '提示', 0);
-        Exit;
-      end;
-    end
-    else
-    begin
-      maxId := Trim(FMLID);
-    end;
-
-    with ADOQueryCmd do
-    begin
-      Close;
-      SQL.Clear;
-      sql.Add('select * from KH_Zdy_MLXX where MLID=''' + Trim(FMLID) + '''');
-      Open;
-    end;
-    with ADOQueryCmd do
-    begin
-      if Trim(FMLID) = '' then
-      begin
-        Append;
-        FieldByName('Filler').Value := Trim(DName);
-      end
-      else
-      begin
-        Edit;
-        FieldByName('Editer').Value := Trim(DName);
-        FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
-      end;
-      FieldByName('MLID').Value := Trim(maxId);
-
-      RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_HZ, 'KH_Zdy_MLXX', 0);
-//      FieldByName('ZdyName').Value := Trim(CDS_HZ.fieldbyname('ZdyName').AsString);
-      FieldByName('Filler').Value := Trim(DName);
-      FieldByName('Filltime').Value := SGetServerDateTime(ADOQueryTemp);
-      Post;
-    end;
-
-    with ADOQueryCmd do
-    begin
-      Close;
-      sql.Clear;
-      sql.Add('select * from KH_Zdy_MLXX where MLName=''' + Trim(CDS_HZ.fieldbyname('MLName').AsString) + ''' and  color=''' + Trim(CDS_HZ.fieldbyname('color').AsString) + '''');
-//      sql.Add(' and Type=''CP'' ');
-      Open;
-    end;
-    if ADOQueryCmd.RecordCount > 1 then
-    begin
-      ADOQueryCmd.Connection.RollbackTrans;
-      Application.MessageBox('产品编号不能重复!', '提示', 0);
-      Exit;
-    end;
     with CDS_HZ do
     begin
-      Edit;
+      first;
-      FieldByName('MLID').Value := Trim(maxId);
+      while not eof do
-      Post;
+      begin
+        if (CDS_HZ.FieldByName('MLName').asstring = '') then
+        begin
+          Next;
+        end
+        else
+        begin
+          if Trim(CDS_HZ.fieldbyname('MLid').AsString) = '' then
+          begin
+            if GetLSNo(ADOQueryCmd, maxId, 'ML', 'KH_Zdy_MLXX', 4, 1) = False then
+            begin
+              Result := False;
+              ADOQueryCmd.Connection.RollbackTrans;
+              Application.MessageBox('取最大号失败！', '提示', 0);
+              Exit;
+            end;
+          end
+          else
+          begin
+            maxId := Trim(FMLID);
+          end;
+
+          with ADOQueryCmd do
+          begin
+            Close;
+            SQL.Clear;
+            sql.Add('select * from KH_Zdy_MLXX where MLID=''' + Trim(CDS_HZ.fieldbyname('MLid').AsString) + '''');
+            Open;
+          end;
+          with ADOQueryCmd do
+          begin
+            if Trim(CDS_HZ.fieldbyname('MLid').AsString) = '' then
+            begin
+              Append;
+              FieldByName('Filler').Value := Trim(DName);
+            end
+            else
+            begin
+              Edit;
+              FieldByName('Editer').Value := Trim(DName);
+              FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
+            end;
+            FieldByName('MLID').Value := Trim(maxId);
+            FieldByName('Filler').Value := Trim(DName);
+            FieldByName('Filltime').Value := SGetServerDateTime(ADOQueryTemp);
+            RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_HZ, 'KH_Zdy_MLXX', 0);
+            Post;
+            with ADOQueryCmd do
+            begin
+              Close;
+              sql.Clear;
+              sql.Add('select * from KH_Zdy_MLXX where MLName=''' + Trim(CDS_HZ.fieldbyname('MLName').AsString) + ''' and  color=''' + Trim(CDS_HZ.fieldbyname('color').AsString) + '''');
+              Open;
+            end;
+            if ADOQueryCmd.RecordCount > 1 then
+            begin
+              ADOQueryCmd.Connection.RollbackTrans;
+              Application.MessageBox('产品编号不能重复!', '提示', 0);
+              Exit;
+            end;
+            with CDS_HZ do
+            begin
+              Edit;
+              FieldByName('MLID').Value := Trim(maxId);
+              Post;
+            end;
+          end;
+          next;
+        end;
+      end;                     
     end;
+
     ADOQueryCmd.Connection.CommitTrans;
-    Result := True;
+                                                                                                         
+    application.MessageBox('保存成功！', '提示');
+    Modalresult := 1;
   except
-    Result := True;
     ADOQueryCmd.Connection.RollbackTrans;
-    Application.MessageBox('保存异常!', '提示', 0);
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
   end;
+
 end;
 
 procedure TfrmMLXXinput.ToolButton3Click(Sender: TObject);
@@ -230,10 +257,10 @@ begin
     Application.MessageBox('保存成功!', '提示', 0);
 //    ModalResult := 1;
   end;
-  try
+ { try
     ADOQueryMain.DisableControls;
     with ADOQueryMain do
-    begin                              
+    begin
       Filtered := False;
       Close;
       SQL.Clear;
@@ -253,7 +280,7 @@ begin
       FieldByName('Type').Value := '面料';
       Post;
     end;
-  end;
+  end;  }
 end;
 
 procedure TfrmMLXXinput.v2Column6PropertiesEditValueChanged(Sender: TObject);
@@ -358,6 +385,7 @@ begin
   with CDS_HZ do
   begin
     Edit;
+    FieldByName('MLID').Value := '';
     FieldByName('note').Value := '';
     Post;
   end;
@@ -383,5 +411,100 @@ begin
   CDS_HZ.Delete;
 end;
 
+procedure TfrmMLXXinput.ToolButton4Click(Sender: TObject);
+var
+  excelApp, WorkBook: Variant;
+  i, j, k, LX, ExcelRowCount: integer;
+  maxId, FCPID, FCPName, t1, t2, t3, FFID: string;
+begin
+  with CDS_LM do
+  begin
+    FieldDefs.Clear;
+    FieldDefs.Add('LXH', ftInteger, 0);
+    FieldDefs.Add('lCode', ftString, 40);
+    FieldDefs.Add('LName', ftString, 40);
+    close;
+    CreateDataSet;
+  end;
+  try
+    excelApp := CreateOleObject('Excel.Application');
+    openDialog1.Filter := '*.CSV;*.xls';
+    if opendialog1.Execute then
+    begin
+      WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName);
+    end
+    else
+      exit;
+    excelApp.Visible := false;
+    ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count;
+  except
+    application.MessageBox('加载EXCEL错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  CDS_LM.EmptyDataSet;
+
+  for j := 0 to Tv1.ColumnCount - 1 do
+  begin
+    with CDS_LM do
+    begin
+      Append;
+      FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+      FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+      Post;
+    end;
+  end;
+
+  try
+    for i := 1 to 50 do
+    begin
+      if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then
+        continue;
+      if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then
+      begin
+        with CDS_LM do
+        begin
+          Edit;
+          FieldByName('LXH').Value := i;
+          Post;
+        end;
+      end;
+    end;
+  except
+    application.MessageBox('加载数组错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  try
+    for i := 2 to ExcelRowCount do
+    begin
+      with CDS_HZ do
+      begin
+        Append;
+        CDS_LM.First;
+        while not CDS_LM.Eof do
+        begin
+          if (CDS_LM.FieldByName('LXH').AsInteger > 0) then
+            CDS_HZ.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value;
+          CDS_LM.Next;
+        end;
+
+        Post;
+      end;
+    end;
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+  except
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+    exit;
+  end;
+
+end;
+
 end.
 

基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas

@@ -816,6 +816,10 @@ begin
             cds1.Append;
             cds1.FieldByName('DEFstr1').Value := trim(CDS_HZ.fieldbyname('MLName').AsString);
             cds1.FieldByName('CBColor').Value := trim(CDS_HZ.fieldbyname('Color').AsString);
+            cds1.FieldByName('defstr4').Value := trim(CDS_HZ.fieldbyname('GYS').AsString);
+            cds1.FieldByName('defstr2').Value := trim(CDS_HZ.fieldbyname('Adultamount').AsString);
+            cds1.FieldByName('defstr3').Value := trim(CDS_HZ.fieldbyname('childamount').AsString);
+            cds1.FieldByName('CBdj').Value := trim(CDS_HZ.fieldbyname('Price').AsString);
             cds1.post;
           end;
 

基础资料维护(BaseInfo.dll)/U_ZdyAttachCP10.pas

@@ -531,7 +531,7 @@ end;
 procedure TfrmZdyAttachCP10.TBCBClick(Sender: TObject);
 begin
   if cds_hz.IsEmpty then
-    exit;
+    exit;                            
   try
     frmZdyAttInputCP_CB := TfrmZdyAttInputCP_CB.Create(Application);
     with frmZdyAttInputCP_CB do

应收应付/U_YSYGGJList.dfm

@@ -1,6 +1,6 @@
 object frmYSYGGJList: TfrmYSYGGJList
-  Left = 639
+  Left = 416
-  Top = 399
+  Top = 337
   Width = 1333
   Height = 598
   Caption = #21592#24037#24037#20215#20449#24687
@@ -61,17 +61,16 @@ object frmYSYGGJList: TfrmYSYGGJList
       ImageIndex = 59
       OnClick = TBFindClick
     end
-    object tbdel: TToolButton
+    object ToolButton1: TToolButton
       Left = 126
       Top = 0
       AutoSize = True
-      Caption = #21024#38500
+      Caption = ' '#20462#25913' '
-      ImageIndex = 17
+      ImageIndex = 54
-      Visible = False
+      OnClick = ToolButton1Click
-      OnClick = tbdelClick
     end
     object Tch: TToolButton
-      Left = 189
+      Left = 201
       Top = 0
       AutoSize = True
       Caption = #23457#26680
@@ -80,7 +79,7 @@ object frmYSYGGJList: TfrmYSYGGJList
       OnClick = TchClick
     end
     object Tnoch: TToolButton
-      Left = 252
+      Left = 264
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
@@ -88,8 +87,16 @@ object frmYSYGGJList: TfrmYSYGGJList
       Visible = False
       OnClick = TnochClick
     end
+    object tbdel: TToolButton
+      Left = 351
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 17
+      OnClick = tbdelClick
+    end
     object TBExport: TToolButton
-      Left = 339
+      Left = 414
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -97,7 +104,7 @@ object frmYSYGGJList: TfrmYSYGGJList
       OnClick = TBExportClick
     end
     object TBPrint: TToolButton
-      Left = 402
+      Left = 477
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -105,7 +112,7 @@ object frmYSYGGJList: TfrmYSYGGJList
       Visible = False
     end
     object TBClose: TToolButton
-      Left = 465
+      Left = 540
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -366,7 +373,9 @@ object frmYSYGGJList: TfrmYSYGGJList
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
-      OptionsData.Editing = False
+      OptionsData.Deleting = False
+      OptionsData.DeletingConfirmation = False
+      OptionsData.Inserting = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       Styles.Inactive = DataLink_YSYF.SHuangSe
@@ -376,6 +385,9 @@ object frmYSYGGJList: TfrmYSYGGJList
       object Tv1Column5: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.NullStyle = nssUnchecked
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
@@ -595,6 +607,87 @@ object frmYSYGGJList: TfrmYSYGGJList
     ClientRectRight = 1317
     ClientRectTop = 19
   end
+  object Panel2: TPanel
+    Left = 406
+    Top = 200
+    Width = 307
+    Height = 217
+    Color = clSkyBlue
+    TabOrder = 6
+    Visible = False
+    object Label19: TLabel
+      Left = 37
+      Top = 41
+      Width = 42
+      Height = 14
+      Caption = #21333'  '#20215
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -14
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+    end
+    object Label20: TLabel
+      Left = 37
+      Top = 83
+      Width = 49
+      Height = 14
+      Caption = #25968'   '#37327
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -14
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+    end
+    object Button4: TButton
+      Left = 170
+      Top = 150
+      Width = 60
+      Height = 25
+      Caption = #20851#38381
+      TabOrder = 0
+      OnClick = Button4Click
+    end
+    object Edit_GXPrice: TEdit
+      Left = 100
+      Top = 39
+      Width = 121
+      Height = 20
+      TabOrder = 1
+    end
+    object Edit_QTY: TEdit
+      Left = 100
+      Top = 81
+      Width = 121
+      Height = 20
+      TabOrder = 2
+    end
+    object CheckBox4: TCheckBox
+      Left = 12
+      Top = 41
+      Width = 20
+      Height = 17
+      TabOrder = 3
+    end
+    object CheckBox5: TCheckBox
+      Left = 12
+      Top = 83
+      Width = 20
+      Height = 17
+      TabOrder = 4
+    end
+    object Button9: TButton
+      Left = 33
+      Top = 150
+      Width = 60
+      Height = 25
+      Caption = #20462#25913
+      TabOrder = 5
+      OnClick = Button9Click
+    end
+  end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_YSYF.ADOLink
     Parameters = <>

应收应付/U_YSYGGJList.pas

@@ -1,7 +1,7 @@
 unit U_YSYGGJList;
 
 interface
-                             
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
@@ -23,7 +23,7 @@ uses
   dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
   dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
   dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, cxCheckBox;
 
 type
   TfrmYSYGGJList = class(TForm)
@@ -92,6 +92,16 @@ type
     Tnoch: TToolButton;
     cxTabControl1: TcxTabControl;
     Tv1Column5: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    Panel2: TPanel;
+    Label19: TLabel;
+    Label20: TLabel;
+    Button4: TButton;
+    Edit_GXPrice: TEdit;
+    Edit_QTY: TEdit;
+    CheckBox4: TCheckBox;
+    CheckBox5: TCheckBox;
+    Button9: TButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -111,6 +121,9 @@ type
     procedure TchClick(Sender: TObject);
     procedure TnochClick(Sender: TObject);
     procedure tbdelClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure Button4Click(Sender: TObject);
+    procedure Button9Click(Sender: TObject);
   private
     FLeft, FTop: Integer;
     procedure InitGrid();
@@ -447,5 +460,87 @@ begin
 
 end;
 
+procedure TfrmYSYGGJList.ToolButton1Click(Sender: TObject);
+begin
+  Panel2.Left := (self.Width - Panel2.Width) div 2;
+  Panel2.Visible := True;
+end;
+
+procedure TfrmYSYGGJList.Button4Click(Sender: TObject);
+begin
+  Panel2.Visible := False;
+end;
+
+procedure TfrmYSYGGJList.Button9Click(Sender: TObject);
+begin
+  if (trim(Edit_GXPrice.Text) = '') and checkbox4.Checked then
+  begin
+    application.MessageBox('单价不能为空！', '提示信息', 0);
+    exit;
+  end;
+  if (trim(Edit_QTY.Text) = '') and checkbox5.Checked then
+  begin
+    application.MessageBox('数量不能为空！', '提示信息', 0);
+    exit;
+  end;
+
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_Main do
+    begin
+      while CDS_Main.Locate('SSel', True, []) do
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          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(CDS_Main.fieldbyname('CLID').AsString) + ',单价 ' + trim(CDS_Main.fieldbyname('GXPrice').AsString) + ',数量 '+ trim(CDS_Main.fieldbyname('QTY').AsString) + '修改后：' + ',单价 ' + trim(Edit_GXPrice.Text) + ',数量 ' + trim(Edit_QTY.text))));
+          sql.Add(',' + quotedstr(trim('成功')));
+          sql.Add(')');
+          if CheckBox4.Checked then
+          begin
+            sql.Add('update JyOrder_Yield SET GXPrice=''' + trim(Edit_GXPrice.Text) + ''' where CLID=''' + trim(CDS_Main.fieldbyname('CLID').AsString) + ''' ');
+          end;
+          if CheckBox5.Checked then
+          begin
+            sql.Add('update JyOrder_Yield SET QTY=''' + trim(Edit_QTY.Text) + ''' where CLID=''' + trim(CDS_Main.fieldbyname('CLID').AsString) + ''' ');
+          end;
+
+          ExecSQL;
+        end;
+        Edit;
+        FieldByName('SSel').Value := False;
+
+        if CheckBox4.Checked then
+        begin
+          FieldByName('GXPrice').Value := Trim(Edit_GXPrice.Text);
+        end;
+        if CheckBox5.Checked then
+        begin
+          FieldByName('QTY').Value := Trim(Edit_QTY.Text);
+        end;
+
+        Post;
+      end;                                                
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+    Application.MessageBox('操作成功!', '提示', 0);
+    Panel2.Visible := false;
+    Edit_GXPrice.Text := '';
+    Edit_QTY.Text := '';
+     CheckBox4.Checked:=false;
+     CheckBox5.Checked:=false;
+    Exit;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('操作异常!', '提示', 0);
+  end;
+end;
+
 end.
 

成品仓库/CPCK.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\徐加艳项目代码\项目代码\艾登\成品仓库\testDll.exe
+HostApplication=D:\Dp7Repo\项目代码\D7FZaideng\成品仓库\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

成品仓库/CPCK.dpr

@@ -4,7 +4,7 @@ uses
   SysUtils,
   classes,
   forms,
-  WinTypes,
+  WinTypes,                     
   WinProcs,
   U_DataLink in 'U_DataLink.pas' {CPCK_DataLink: TDataModule},
   U_GetDllForm in 'U_GetDllForm.pas',
@@ -15,7 +15,7 @@ uses
   U_BpJylist in 'U_BpJylist.pas' {frmBpJylist},
   U_CPRk in 'U_CPRk.pas' {frmCPRk},
   U_ProductOrderNewList in 'U_ProductOrderNewList.pas' {frmProductOrderNewList},
-  U_CpCk in 'U_CpCk.pas' {frmCpCk},
+  U_CpCkWF in 'U_CpCkWF.pas' {frmCpCkWF},
   U_BpSmCk in 'U_BpSmCk.pas' {frmBpSmCk},
   U_CPRklist in 'U_CPRklist.pas' {frmCPRklist},
   U_ZdyAttachment in 'U_ZdyAttachment.pas' {frmZdyAttachment},

成品仓库/U_CpCk.pas

@@ -167,8 +167,7 @@ type
     procedure ToolButton7Click(Sender: TObject);
     procedure Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure v1Column1PropertiesButtonClick(Sender: TObject;
+    procedure v1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
   private
     procedure InitGrid();
     procedure Initsub();
@@ -184,7 +183,7 @@ type
   public
     fkeyNO, FCodeName, FCode, FDRCKNO, FDRCKName: string;
     FType: integer;
-    fCKName: string;
+    fCKName, Fname: string;
     { Public declarations }
   end;
 
@@ -670,6 +669,7 @@ begin
     sql.Add('select * from KH_ZDY where Type=''CPCK'' ');
     if trim(fCKName) <> '' then
       sql.Add('and zdyName=' + quotedstr(trim(fCKName)));
+ 
     open;
     while not eof do
     begin
@@ -2030,7 +2030,7 @@ end;
 
 procedure TfrmCpCk.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
-  try                                                       
+  try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
     with frmZDYHelp do
     begin
@@ -2048,10 +2048,9 @@ begin
   end;
 end;
 
-procedure TfrmCpCk.v1Column1PropertiesButtonClick(Sender: TObject;
+procedure TfrmCpCk.v1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
-     frmZdyCMZ_sel := TfrmZdyCMZ_sel.create(self);
+  frmZdyCMZ_sel := TfrmZdyCMZ_sel.create(self);
   with frmZdyCMZ_sel do
   begin
     if showmodal = 1 then

成品仓库/U_CpCklistWF.pas

@@ -0,0 +1,676 @@
+unit U_CpCklistWF;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ComCtrls, ToolWin, StdCtrls, ExtCtrls, cxStyles, cxCustomData,
+  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData,
+  cxButtonEdit, cxDropDownEdit, cxGridLevel, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
+  cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, RM_Common,
+  RM_Class, RM_e_Xls, RM_GridReport, RM_System, RM_Dataset, cxTextEdit,
+  cxCheckBox, cxPC, cxLookAndFeels, 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
+  TfrmCpCklistWF = class(TForm)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    TBAdd: TToolButton;
+    TBEdit: TToolButton;
+    TBDel: TToolButton;
+    TBExport: TToolButton;
+    TBPrint: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    Label1: TLabel;
+    BegDate: TDateTimePicker;
+    EndDate: TDateTimePicker;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1P_CodeName: TcxGridDBColumn;
+    v1P_SPEC: TcxGridDBColumn;
+    v1P_MF: TcxGridDBColumn;
+    v1P_KZ: TcxGridDBColumn;
+    v1RollNum: TcxGridDBColumn;
+    v1Qty: TcxGridDBColumn;
+    v1Note: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    v1CRType: TcxGridDBColumn;
+    v1CRTime: TcxGridDBColumn;
+    v1CRNO: TcxGridDBColumn;
+    v1CRID: TcxGridDBColumn;
+    v1Filler: TcxGridDBColumn;
+    v1FillTime: TcxGridDBColumn;
+    Label2: TLabel;
+    Label3: TLabel;
+    Label4: TLabel;
+    P_CodeName: TEdit;
+    P_Color: TEdit;
+    CRType: TComboBox;
+    Label5: TLabel;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryTmp: TADOQuery;
+    DataSource1: TDataSource;
+    CDS_Main: TClientDataSet;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    v1MJID: TcxGridDBColumn;
+    v1MJXH: TcxGridDBColumn;
+    v1CPTYPE: TcxGridDBColumn;
+    ckName: TComboBox;
+    Label6: TLabel;
+    v1P_Color: TcxGridDBColumn;
+    ADOPrint: TADOQuery;
+    RMDB_MD: TRMDBDataSet;
+    RMGridReport1: TRMGridReport;
+    RMXLSExport1: TRMXLSExport;
+    v1P_Code1: TcxGridDBColumn;
+    v1inoutNO: TcxGridDBColumn;
+    TBsmADD: TToolButton;
+    inoutNo: TEdit;
+    Label7: TLabel;
+    v1custName: TcxGridDBColumn;
+    v1TocustName: TcxGridDBColumn;
+    TbPrint1: TToolButton;
+    v1Column1: TcxGridDBColumn;
+    v1Column2: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    v1Column4: TcxGridDBColumn;
+    v1Column5: TcxGridDBColumn;
+    v1Column6: TcxGridDBColumn;
+    v1Column7: TcxGridDBColumn;
+    v1Column8: TcxGridDBColumn;
+    v1Column9: TcxGridDBColumn;
+    v1Column10: TcxGridDBColumn;
+    ADOPrint1: TADOQuery;
+    RMDB_Main: TRMDBDataSet;
+    v1Column11: TcxGridDBColumn;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
+    cxStyle2: TcxStyle;
+    cxStyle_gridRow: TcxStyle;
+    cxStyle_gridFoot: TcxStyle;
+    cxStyle_gridHead: TcxStyle;
+    cxStyle_gridGroupBox: TcxStyle;
+    cxStyle_yellow: TcxStyle;
+    cxStyle_Red: TcxStyle;
+    cxStyle_fontBlack: TcxStyle;
+    cxStyle_fontclFuchsia: TcxStyle;
+    cxStyle_fontclPurple: TcxStyle;
+    cxStyle_fontclGreen: TcxStyle;
+    cxStyle_fontclBlue: TcxStyle;
+    cxStyle_fontclTeal: TcxStyle;
+    cxStyle_fontclOlive: TcxStyle;
+    Label8: TLabel;
+    custName: TEdit;
+    v1validName: TcxGridDBColumn;
+    v1Column12: TcxGridDBColumn;
+    v1Column13: TcxGridDBColumn;
+    cxTabControl1: TcxTabControl;
+    TBcdel: TToolButton;
+    v1Column14: TcxGridDBColumn;
+    v1Column15: TcxGridDBColumn;
+    orderNo: TEdit;
+    Label9: TLabel;
+    P_Code: TEdit;
+    defstr1: TEdit;
+    Label10: TLabel;
+    Label11: TLabel;
+    Tv1Column1: TcxGridDBColumn;
+    DataSource2: TDataSource;
+    CDS_Sub: TClientDataSet;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    TV2Column1: TcxGridDBColumn;
+    TV2Column14: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
+    TV2Column3: TcxGridDBColumn;
+    TV2Column4: TcxGridDBColumn;
+    TV2Column5: TcxGridDBColumn;
+    TV2Column6: TcxGridDBColumn;
+    TV2Column7: TcxGridDBColumn;
+    TV2Column8: TcxGridDBColumn;
+    TV2Column9: TcxGridDBColumn;
+    TV2Column10: TcxGridDBColumn;
+    TV2Column11: TcxGridDBColumn;
+    TV2Column12: TcxGridDBColumn;
+    TV2Column13: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    ADOQuerySub: TADOQuery;
+    TV2Column15: TcxGridDBColumn;
+    TV2Column16: TcxGridDBColumn;
+    TV2Column17: TcxGridDBColumn;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBAddClick(Sender: TObject);
+    procedure P_CodeNameChange(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure TBEditClick(Sender: TObject);
+    procedure TBDelClick(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure TBPrintClick(Sender: TObject);
+    procedure TBExportClick(Sender: TObject);
+    procedure TBsmADDClick(Sender: TObject);
+    procedure TbPrint1Click(Sender: TObject);
+    procedure v1Column6CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure TBcdelClick(Sender: TObject);
+    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+  private
+    procedure InitGrid();
+    procedure InitSub();
+    procedure SetComboBox();
+    procedure SetStatus();
+    { Private declarations }
+  public
+    fCKName, fName: string;
+    { Public declarations }
+  end;
+
+var
+  frmCpCklistWF: TfrmCpCklistWF;
+
+implementation
+
+uses
+  U_DataLink, U_Fun10, U_ZDYHelp, U_CpCkWF, U_BpSmCk;
+{$R *.dfm}
+
+procedure TfrmCpCklistWF.SetStatus();
+begin
+  TBedit.Visible := false;
+  Tbdel.Visible := false;
+  tbcdel.Visible := false;
+  case cxTabControl1.TabIndex of
+    0:
+      begin
+        TBedit.Visible := true;
+        Tbdel.Visible := true;
+      end;
+    1:
+      begin
+        tbcdel.Visible := true;
+      end;
+  end;
+end;
+
+procedure TfrmCpCklistWF.SetComboBox();
+begin
+  ckName.Items.Clear;
+  with adoQueryTmp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('select * from KH_ZDY where Type=''CPCK'' ');
+    if trim(fCKName) <> '' then
+      sql.Add('and zdyName=' + quotedstr(trim(fCKName)));
+    open;
+    while not eof do
+    begin
+      ckName.Items.Add(trim(fieldbyname('zdyName').AsString));
+      next;
+    end;
+  end;
+  if ckName.Items.Count > 0 then
+    ckName.ItemIndex := 0;
+
+  CRType.Items.Clear;
+  CRType.Items.Add('');
+  with adoQueryTmp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('select * from KH_ZDY where Type=''CPCKTYPE''');
+    if trim(fCKName) <> '' then
+      sql.Add('and note=' + quotedstr(trim(fCKName)));
+    open;
+    while not eof do
+    begin
+      CRType.Items.Add(trim(fieldbyname('zdyName').AsString));
+      next;
+    end;
+  end;
+  if CRType.Items.Count > 0 then
+    CRType.ItemIndex := 0;
+end;
+
+procedure TfrmCpCklistWF.InitGrid();
+begin
+  try
+    with adoqueryTmp do
+    begin
+      close;
+      sql.Clear;
+      sql.Add(' exec P_Get_CP_CK ''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''',''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''',''' + inttostr(cxTabControl1.TabIndex) + ''' ');
+//      sql.Add('select A.*, ');
+//      sql.Add('SMoney=PackFee+YbFee+OtherFee+(select SUM(money) from CP_InOut X where X.CRNO=A.CRNO), ');
+//      sql.Add('orderNo=(select Top 1 orderNo from JYOrder_Main X where X.MainID=A.MainID ),');
+//      sql.Add('validName=case when valid=''N'' then ''已作废'' else ''未作废'' end ');
+//      sql.Add('from  CP_InOut A');
+//      sql.Add('where CRTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
+//      sql.Add('and CRTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
+//      sql.Add('and CRFlag=''出库'' ');
+//      if trim(FckName) <> '' then
+//        sql.Add('and ckName=' + quotedstr(trim(FckName)));
+//      if cxTabControl1.TabIndex = 0 then
+//        sql.Add('and valid=''Y'' ');
+//      if cxTabControl1.TabIndex = 1 then
+//        sql.Add('and valid=''N'' ');
+      open;
+    end;
+    SCreateCDS20(adoqueryTmp, CDS_Main);
+    SInitCDSData20(adoqueryTmp, CDS_Main);
+  finally
+  end;
+end;
+
+procedure TfrmCpCklistWF.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  writeCxGrid(self.Caption + '1', Tv1, '成品仓库');
+  Action := cafree;
+end;
+
+procedure TfrmCpCklistWF.FormDestroy(Sender: TObject);
+begin
+  frmCpCklistWF := nil;
+end;
+
+procedure TfrmCpCklistWF.TBAddClick(Sender: TObject);
+begin
+  frmCpCkWF := TfrmCpCkWF.create(self);
+  with frmCpCkWF do
+  begin
+    fkeyNo := '';
+    fType := 0;
+    fckName := self.fckName;
+    if showmodal = 1 then
+    begin
+      TBRafresh.Click;
+      self.CDS_Main.Locate('crNo', trim(fkeyNo), []);
+    end;
+    free;
+  end;
+end;
+
+procedure TfrmCpCklistWF.P_CodeNameChange(Sender: TObject);
+begin
+  if ADOQueryTmp.Active = False then
+    Exit;
+  SDofilter(ADOQueryTmp, SGetFilters(Panel1, 1, 2));
+  SCreateCDS20(ADOQueryTmp, CDS_Main);
+  SInitCDSData20(ADOQueryTmp, CDS_Main);
+end;
+
+procedure TfrmCpCklistWF.FormShow(Sender: TObject);
+begin
+  readCxGrid(self.Caption + '1', Tv1, '成品仓库');
+  SetComboBox();
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmCpCklistWF.FormCreate(Sender: TObject);
+begin
+  BegDate.Date := DServerDate - 7;
+  EndDate.Date := DServerDate;
+  cxGrid1.Align := alclient;
+
+end;
+
+procedure TfrmCpCklistWF.TBCloseClick(Sender: TObject);
+begin
+  close;
+end;
+
+procedure TfrmCpCklistWF.TBEditClick(Sender: TObject);
+begin
+  if cds_main.IsEmpty then
+    exit;
+
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YF_Money_CR A');
+    SQL.Add('where A.mainid=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+    sQL.Add('and A.hxNum<>0 ');
+    Open;
+  end;
+  if not ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('此单已经产生核销数据，不能修改！', '提示', 0);
+    Exit;
+  end;
+
+
+ { with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from BP_InOut A');
+    SQL.Add('where A.kcid='''+Trim(CDS_Main.fieldbyname('kcid').AsString)+''' ');
+    sQL.Add('and A.CRFlag=''出库''');
+    Open;
+  end;
+  if not ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('已产生出库数据，不能修改！','提示',0);
+    Exit;
+  end;  }
+
+  frmCpCkWF := TfrmCpCkWF.create(self);
+  with frmCpCkWF do
+  begin
+    fkeyNo := self.cds_main.fieldbyname('CRNO').AsString;
+    FCode := self.cds_main.fieldbyname('P_Code').AsString;
+    FCodeName := self.cds_main.fieldbyname('P_Codename').AsString;
+    FDRCKNO := self.cds_main.fieldbyname('DRCKNO').AsString;
+    FDRCKName := self.cds_main.fieldbyname('DRCKName').AsString;
+    fType := 1;
+    fckName := self.fckName;
+    if showmodal = 1 then
+    begin
+
+    end;
+    free;
+  end;
+  TBRafresh.Click;
+
+end;
+
+procedure TfrmCpCklistWF.TBDelClick(Sender: TObject);
+var
+  YFID, CRID: string;
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+ { if Trim(CDS_Main.fieldbyname('Filler').AsString)<>Trim(DName) then
+  begin
+    Application.MessageBox('不能操作他人的数据!','提示',0);
+    Exit;
+  end; }
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YF_Money_CR A');
+    SQL.Add('where A.mainid=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+    sQL.Add('and A.hxNum<>0 ');
+    Open;
+  end;
+  if not ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('此单已经产生核销数据，不能删除！', '提示', 0);
+    Exit;
+  end;
+
+  if Application.MessageBox('确定要作废数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+
+  try
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('update  CP_InOut SET valid=''N'' ');
+      SQL.Add('where  CRNO=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+      sql.Add('delete from YF_Money_CR ');
+      SQL.Add('where mainID=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+      sql.Add('Update YF_Money_KC Set KCMoney=(select isnull(Sum(Money*QtyFlag),0) from YF_Money_CR A where A.CRID=YF_Money_KC.CRID)');
+      sql.Add(',KCBBMoney=(select isnull(Sum(BBMoney*QtyFlag),0) from YF_Money_CR A where A.CRID=YF_Money_KC.CRID)');
+      execsql;
+    end;
+    TBRafresh.Click;
+  except
+    Application.MessageBox('数据删除失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmCpCklistWF.TBRafreshClick(Sender: TObject);
+begin
+  initGrid();
+end;
+
+procedure TfrmCpCklistWF.TBPrintClick(Sender: TObject);
+var
+  filepath: string;
+begin
+  if CDS_Main.IsEmpty then
+    exit;
+
+  with AdoPrint do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('select A.* from CP_InOut A');
+    sql.Add('where inoutNO=' + quotedstr(trim(CDS_Main.fieldbyname('inoutNO').AsString)));
+    open;
+  end;
+
+  with AdoPrint1 do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('exec P_Print_cpCkMd ');
+    sql.Add('@inoutNo=' + quotedstr(trim(CDS_Main.fieldbyname('inoutNO').AsString)));
+    sql.Add(',@flag=' + quotedstr(trim('')));
+    open;
+  end;
+
+  try
+    filepath := ExtractFilePath(Application.ExeName) + 'report\出库码单.rmf';
+    if not FileExists(Pchar(filepath)) then
+    begin
+      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+      exit;
+    end;
+    RMVariables['dtxz'] := FormatDateTime('yyyy-mm-dd', date());
+    RMVariables['zdr'] := trim(DName);
+    RMVariables['Filler'] := trim(CDS_Main.fieldbyname('Filler').AsString);
+    RMGridReport1.LoadFromFile(filepath);
+    RMGridReport1.ShowReport;
+  finally
+
+  end;
+
+end;
+
+procedure TfrmCpCklistWF.TBExportClick(Sender: TObject);
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+  TcxGridToExcel(self.Caption, cxgrid1);
+end;
+
+procedure TfrmCpCklistWF.TBsmADDClick(Sender: TObject);
+begin
+  frmbpsmck := Tfrmbpsmck.create(self);
+  with frmbpsmck do
+  begin
+    fkeyNo := '';
+    fType := 0;
+    fckName := self.fckName;
+    if showmodal = 1 then
+    begin
+      TBRafresh.Click;
+   //   self.CDS_Main.Locate('crNo',trim(fkeyNo),[]) ;
+    end;
+    TBRafresh.Click;
+    free;
+  end;
+end;
+
+procedure TfrmCpCklistWF.TbPrint1Click(Sender: TObject);
+var
+  filepath: string;
+begin
+  if CDS_Main.IsEmpty then
+    exit;
+
+  with AdoPrint do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('select * from CP_INout A ');
+    sql.Add('where A.inoutNo=' + quotedstr(trim(CDS_Main.fieldbyname('inoutNO').AsString)));
+    open;
+  end;
+
+  try
+    filepath := ExtractFilePath(Application.ExeName) + 'report\发货单.rmf';
+    if not FileExists(Pchar(filepath)) then
+    begin
+      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+      exit;
+    end;
+    RMVariables['dtxz'] := FormatDateTime('yyyy-mm-dd', date());
+    RMVariables['zdr'] := trim(DName);
+    RMVariables['Filler'] := trim(CDS_Main.fieldbyname('Filler').AsString);
+    RMGridReport1.LoadFromFile(filepath);
+    RMGridReport1.ShowReport;
+  finally
+
+  end;
+
+end;
+
+procedure TfrmCpCklistWF.v1Column6CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+var
+  colIdx0, colIdx1: integer;
+begin
+  colIdx0 := tv1.GetColumnByFieldName('CRNO').Index;
+//  colIdx1:= tv1.GetColumnByFieldName('colorname').Index;
+  if (ARow1.Values[colIdx0] = ARow2.Values[colIdx0]) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+
+end;
+
+procedure TfrmCpCklistWF.ToolButton1Click(Sender: TObject);
+var
+  YFID, CRID: string;
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+ { if Trim(CDS_Main.fieldbyname('Filler').AsString)<>Trim(DName) then
+  begin
+    Application.MessageBox('不能操作他人的数据!','提示',0);
+    Exit;
+  end; }
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from YF_Money_CR A');
+    SQL.Add('where A.mainid=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+    sQL.Add('and A.hxNum<>0 ');
+    Open;
+  end;
+  if not ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('此单已经产生核销数据，不能删除！', '提示', 0);
+    Exit;
+  end;
+
+  if Application.MessageBox('确定要作废数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+
+  try
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('update  CP_InOut SET valid=''N'' ');
+      SQL.Add('where  CRNO=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+      sql.Add('delete from YF_Money_CR ');
+      SQL.Add('where mainID=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+      sql.Add('Update YF_Money_KC Set KCMoney=(select isnull(Sum(Money*QtyFlag),0) from YF_Money_CR A where A.CRID=YF_Money_KC.CRID)');
+      sql.Add(',KCBBMoney=(select isnull(Sum(BBMoney*QtyFlag),0) from YF_Money_CR A where A.CRID=YF_Money_KC.CRID)');
+      execsql;
+    end;
+    TBRafresh.Click;
+  except
+    Application.MessageBox('数据作废失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmCpCklistWF.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+begin
+//  IF  AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('validName').Index]='已作废' then
+//  ACanvas.Font.Color:=clred;
+end;
+
+procedure TfrmCpCklistWF.cxTabControl1Change(Sender: TObject);
+begin
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmCpCklistWF.TBcdelClick(Sender: TObject);
+begin
+  if CDS_Main.IsEmpty then
+    exit;
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('delete from CP_InOut where  CRNO=''' + Trim(CDS_Main.fieldbyname('CRNO').AsString) + ''' ');
+      execsql;
+    end;
+    TBRafresh.Click;
+  except
+    Application.MessageBox('数据删除失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmCpCklistWF.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+begin
+  initsub();
+end;
+
+procedure TfrmCpCklistWF.InitSub();
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+  try
+    with ADOQuerySub do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('exec P_Get_CP_CK_MX ''' + Cds_main.fieldbyname('P_CodeName').AsString + ''' ,''' + Cds_main.fieldbyname('P_Code').AsString + ''',''' + Cds_main.fieldbyname('CRNO').AsString + ''' ');
+      sql.Add(' ,''' + cds_main.fieldbyname('DRCKNO').AsString + ''' ,''' + cds_main.fieldbyname('DRCKName').AsString + ''' ');
+//     ShowMessage(SQL.text);
+      open;
+    end;
+    SCreateCDS20(ADOQuerySub, CDS_Sub);
+    SInitCDSData20(ADOQuerySub, CDS_Sub);
+  finally
+  end;
+end;
+
+end.
+

成品仓库/U_GetDllForm.pas

@@ -16,7 +16,8 @@ implementation
 
 uses
   U_DataLink, U_getDogServer, U_BpRklist, U_CPRklist, U_Bpcklist, U_Bpkclist,
-  U_ZDYHelp, U_CPKWListSel, U_BpckXjList, U_Bpkclist_HZ, U_CpCklist;
+  U_ZDYHelp, U_CPKWListSel, U_BpckXjList, U_Bpkclist_HZ, U_CpCklist,
+  U_CpCklistWF;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -202,6 +203,26 @@ begin
        //句柄
         mnewHandle := frmCpCklist.Handle;
       end;
+    2011:  //³ÉÆ·³ö¿â  Íâ·¢
+      begin
+        if frmCpCklistWF = nil then
+        begin
+          frmCpCklistWF := TfrmCpCklistWF.Create(application.MainForm);
+          with frmCpCklistWF do
+          begin
+            caption := Trim(Title);
+            fCkName := trim(Parameters1);
+            FormStyle := mstyle;
+            windowState := mstate;
+            BorderStyle := mborderstyle;
+           //show;
+          end;
+        end
+        else
+          frmCpCklistWF.BringToFront;
+       //¾ä±ú
+        mnewHandle := frmCpCklistWF.Handle;
+      end;
     201:  //成品出库（原本）
       begin
         if frmBpCklist = nil then