~

2025-10-18 13:33:22 +08:00 · 2025-10-18 13:33:22 +08:00 · 32d50dcf81
commit 32d50dcf81
parent 5768595615
5 changed files with 91 additions and 21 deletions
--- a/A01基础公司管理/U_CustInput.dfm
+++ b/A01基础公司管理/U_CustInput.dfm
@ -520,6 +520,7 @@ inherited frmCustInput: TfrmCustInput
          Navigator.Buttons.Delete.Visible = False
          ScrollbarAnnotations.CustomAnnotations = <>
          DataController.DataSource = DSLXR
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
          DataController.Summary.DefaultGroupSummaryItems = <>
          DataController.Summary.FooterSummaryItems = <
            item
--- a/A01基础公司管理/U_CustInput.pas
+++ b/A01基础公司管理/U_CustInput.pas
@ -641,26 +641,31 @@ begin
      if Trim(FieldByName('Contacts').AsString) = '' then
      begin
        Application.MessageBox('联系人不能为空!', '提示', 0);
+        EnableControls;
        Exit;
      end;
      if Trim(FieldByName('PhoneNumber').AsString) = '' then
      begin
        Application.MessageBox('手机号不能为空!', '提示', 0);
+        EnableControls;
        Exit;
      end;
      if Trim(FieldByName('Telephone').AsString) = '' then
      begin
        Application.MessageBox('联系电话不能为空!', '提示', 0);
+        EnableControls;
        Exit;
      end;
      if Trim(FieldByName('mxaddress').AsString) = '' then
      begin
        Application.MessageBox('地址不能为空!', '提示', 0);
+        EnableControls;
        Exit;
      end;
      if Trim(FieldByName('mxarea').AsString) = '' then
      begin
        Application.MessageBox('区域不能为空!', '提示', 0);
+        EnableControls;
        Exit;
      end;
      Next;
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
@ -2,7 +2,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
  Left = 67
  Top = 126
  Caption = #38754#26009#20837#24211#30331#35760
-  ClientHeight = 762
+  ClientHeight = 548
  ClientWidth = 1453
  Font.Charset = GB2312_CHARSET
  Font.Height = -16
@ -10,7 +10,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
  WindowState = wsMaximized
  OnClose = FormClose
  ExplicitWidth = 1469
-  ExplicitHeight = 801
+  ExplicitHeight = 587
  PixelsPerInch = 96
  TextHeight = 21
  object cxGrid1: TcxGrid [0]
@ -18,9 +18,12 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
    Left = 0
    Top = 30
    Width = 1453
-    Height = 732
+    Height = 518
    Align = alClient
    TabOrder = 0
+    ExplicitLeft = 152
+    ExplicitTop = 36
+    ExplicitHeight = 732
    object Tv1: TcxGridDBTableView
      OnMouseDown = Tv1MouseDown
      Navigator.Buttons.CustomButtons = <>
@ -199,6 +202,21 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        HeaderAlignmentHorz = taCenter
        Width = 77
      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxLookupComboBoxProperties'
+        Properties.KeyFieldNames = 'C_ColorNo'
+        Properties.ListColumns = <
+          item
+            FieldName = 'C_ColorNo'
+          end>
+        Properties.ListSource = DS_YS
+        Properties.OnEditValueChanged = Tv1Column6PropertiesEditValueChanged
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
      object Tv1Column15: TcxGridDBColumn
        Caption = #33521#25991#21697#21517
        DataBinding.FieldName = 'C_EName'
@ -319,13 +337,6 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        HeaderAlignmentHorz = taCenter
        Width = 77
      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 77
-      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #27454#21495
        DataBinding.FieldName = 'C_StyleNo'
@ -576,4 +587,16 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
    Left = 644
    Top = 447
  end
+  object ADO_YS: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 702
+    Top = 441
+  end
+  object DS_YS: TDataSource
+    DataSet = ADO_YS
+    Left = 764
+    Top = 443
+  end
 end
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
@ -71,6 +71,8 @@ type
    GeMeiOutputSel: TToolButton;
    ADO_PM: TADOQuery;
    DS_PM: TDataSource;
+    ADO_YS: TADOQuery;
+    DS_YS: TDataSource;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBAddClick(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
@ -91,6 +93,7 @@ type
    procedure GeMeiOutputSelClick(Sender: TObject);
    procedure v1SPNamePropertiesEditValueChanged(Sender: TObject);
    procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+    procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
  private
    { Private declarations }
    function SaveData(MSaveType: string): Boolean;
@ -374,6 +377,14 @@ begin
    sql.Add('  SELECT C_Code,C_Name FROM Bs_Cloth_Info  ');
    Open;
  end;
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.add(' SELECT distinct B.C_Color,B.C_ColorNo  FROM   BS_Cloth_Info_Sub B ');
+ //    showmessage(sql.text);
+    Open;
+  end;
 end;

 procedure TfrmTradeClothTotalInInput.GeMeiOutputSelClick(Sender: TObject);
@ -645,6 +656,26 @@ begin
  end;
 end;

+procedure TfrmTradeClothTotalInInput.Tv1Column6PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+begin
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+  mvalue := TcxTextEdit(Sender).EditingText;
+
+  with CDS_Sub do
+  begin
+    Edit;
+    FieldByName(FFieldName).Value := Trim(mvalue);
+    Post;
+    ADO_YS.Locate('C_ColorNo', mvalue, []);
+    Edit;
+    FieldByName('C_Color').Value := ADO_YS.FieldByName('C_Color').Value;
+//    FieldByName('C_Code').Value := ADO_pm.FieldByName('C_Code').Value;
+    Post;
+  end;
+end;
+
 procedure TfrmTradeClothTotalInInput.Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
  try
@ -820,8 +851,18 @@ begin
    ADO_pm.Locate('C_Name', mvalue, []);
    Edit;
    FieldByName('C_Name').Value := ADO_pm.FieldByName('C_Name').Value;
+    FieldByName('C_Code').Value := ADO_pm.FieldByName('C_Code').Value;
    Post;
  end;
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT DISTINCT A.C_Code,B.C_Color,B.C_ColorNo FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+    sql.Add(' where A.C_Code= ' + QuotedStr(CDS_Sub.FieldByName('C_Code').AsString));
+    SQL.ADD(' order by B.C_ColorNo');
+    Open;
+  end;
 end;

 end.
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@ -20,7 +20,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    Height = 30
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 99
+    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clSkyBlue
    Images = DataLink_TradeTotalClothStk.cxImageList_bar
@ -37,7 +37,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBRafreshClick
    end
    object TBFind: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -46,7 +46,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBFindClick
    end
    object TBAdd: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #20837#24211
@ -54,7 +54,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBAddClick
    end
    object TBEdit: TToolButton
-      Left = 213
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #20462#25913
@ -62,7 +62,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBEditClick
    end
    object TBDel: TToolButton
-      Left = 284
+      Left = 252
      Top = 0
      AutoSize = True
      Caption = #21024#38500
@ -70,7 +70,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBDelClick
    end
    object ToolButton2: TToolButton
-      Left = 355
+      Left = 315
      Top = 0
      AutoSize = True
      Caption = #25171#21360
@ -78,7 +78,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = ToolButton2Click
    end
    object ToolButton3: TToolButton
-      Left = 426
+      Left = 378
      Top = 0
      AutoSize = True
      Caption = #38468#20214
@ -86,7 +86,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = ToolButton3Click
    end
    object TBExport: TToolButton
-      Left = 497
+      Left = 441
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -94,7 +94,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBExportClick
    end
    object ToolButton1: TToolButton
-      Left = 568
+      Left = 504
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -102,7 +102,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 671
+      Left = 591
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -110,7 +110,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnClick = TBCloseClick
    end
    object btn1: TToolButton
-      Left = 742
+      Left = 654
      Top = 0
      AutoSize = True
      Caption = #26126#32454#20837#24211