1

2025-07-15 16:37:56 +08:00 · 2025-07-15 16:37:56 +08:00 · 2d0dc85025
commit 2d0dc85025
parent 21681a1008
11 changed files with 71 additions and 51 deletions
--- a/A00通用方法/U_CustomFun.pas.tmp
+++ b/A00通用方法/U_CustomFun.pas.tmp
--- a/A00通用窗体/U_CompanySel.pas
+++ b/A00通用窗体/U_CompanySel.pas
@ -71,7 +71,7 @@ type
    procedure InitGrid();
    { Private declarations }
  public
-    FCoType, FAuthority: string;
+    FCoType, FAuthority, FStores: string;
    { Public declarations }
  end;

@ -143,6 +143,8 @@ begin
      begin
        sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))');
      end;
+      if FStores = '新余' then
+        sql.Add(' and A.Stores=''' + Trim(FStores) + '''');

      Open;
    end;
@ -190,7 +192,7 @@ end;
 procedure TfrmCompanySel.FormDestroy(Sender: TObject);
 begin
  inherited;
-  frmCompanySel:= nil;
+  frmCompanySel := nil;
 end;

 end.
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@ -131,6 +131,7 @@ type
    procedure SetStatus();
  public
    FAuthority: string;
+    canshu4: string;
  end;

 var
@ -219,6 +220,10 @@ begin
  begin
    SqlStr := SqlStr + ' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))';
  end;
+
+  if Trim(canshu4) = '新余' then
+    SqlStr := SqlStr + ' and  Stores=''新余'' ';
+
  SqlStr := SqlStr + ' ORDER BY CoCode  ';
  InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, FilterStr, 'CoCode');
 end;
@ -282,7 +287,10 @@ procedure TfrmCustomer.FormShow(Sender: TObject);
 begin
  inherited;
  fFlileFlag := UserDataFlag + 'HX';
-  FAuthority := self.fParameters1;
+
+  FAuthority := trim(self.fParameters1);
+  canshu4 := trim(self.fParameters4);
+
  ReadCxGrid(trim(self.caption) + 'Tv1', Tv1, '¿Í»§¹ÜÀí');
  ReadCxGrid(trim(self.caption) + 'Tv2', Tv2, '¿Í»§¹ÜÀí');
  HiddenTVColumn(Tv1, 'COID');
--- a/T02贸易汇总仓库/U_GetDllForm.pas
+++ b/T02贸易汇总仓库/U_GetDllForm.pas
@ -86,6 +86,7 @@ begin
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
    Parameters1 := '管理';
    Parameters2 := '贸易布匹';
+    Parameters4 := '新余';
    DName := 'ADMIN';
    DCode := 'ADMIN';
  end
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
@ -60,15 +60,16 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 101
+        Width = 77
      end
      object v1Column6: TcxGridDBColumn
+        Tag = 7
        Caption = #20837#24211#26465#30721
        DataBinding.FieldName = 'BCIOID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object v1Column2: TcxGridDBColumn
        Caption = #20837#24211#26102#38388
@ -78,7 +79,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.SaveTime = False
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column4: TcxGridDBColumn
        Caption = #20837#24211#31867#22411
@ -93,7 +94,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          #30424#30408#20837#24211
          #26399#21021#20837#24211)
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1FactoryName: TcxGridDBColumn
        Caption = #26469#33258#21333#20301
@ -109,7 +110,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.ReadOnly = True
        Properties.OnButtonClick = v1Column14PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column1: TcxGridDBColumn
        Caption = #23384#25918#21333#20301
@ -124,7 +125,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.ReadOnly = True
        Properties.OnButtonClick = Tv1Column1PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column12: TcxGridDBColumn
        Caption = #37319#36141#21333#21495
@ -132,7 +133,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object Tv1Column4: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
@ -147,7 +148,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.ReadOnly = True
        Properties.OnButtonClick = Tv1Column4PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column14: TcxGridDBColumn
        Caption = #21512#21516#21495
@ -162,7 +163,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.ReadOnly = True
        Properties.OnButtonClick = Tv1Column14PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column8: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
@ -176,7 +177,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          end>
        Properties.OnButtonClick = Tv1Column8PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1SPName: TcxGridDBColumn
        Caption = #21697#21517
@ -190,14 +191,14 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          end>
        Properties.OnButtonClick = v2Column1PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column15: TcxGridDBColumn
        Caption = #33521#25991#21697#21517
        DataBinding.FieldName = 'C_EName'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1SPSpec: TcxGridDBColumn
        Caption = #35268#26684
@ -212,28 +213,28 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.OnButtonClick = v1Column8PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1SPMF: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column8: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #32568#21495
        DataBinding.FieldName = 'FtyPCId'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column9: TcxGridDBColumn
        Caption = #21305#25968
@ -241,7 +242,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v2Column6: TcxGridDBColumn
        Caption = #25968#37327
@ -249,7 +250,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1QtyUnit: TcxGridDBColumn
        Caption = #21333#20301
@ -262,7 +263,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          'Y'
          'Kg')
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column5: TcxGridDBColumn
        Caption = #24211#20301
@ -277,7 +278,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Properties.ReadOnly = False
        Properties.OnButtonClick = v1Column5PropertiesButtonClick
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column7: TcxGridDBColumn
        Caption = #36710#38388
@ -289,77 +290,77 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          #19968#36710#38388
          #20108#36710#38388)
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column3: TcxGridDBColumn
        Caption = #33394#21035
        DataBinding.FieldName = 'C_ColorDepth'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column5: TcxGridDBColumn
        Caption = #30721#23610
        DataBinding.FieldName = 'Yardstick'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column2: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #27454#21495
        DataBinding.FieldName = 'C_StyleNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column10: TcxGridDBColumn
        Caption = #25104#20998
        DataBinding.FieldName = 'C_Composition'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column13: TcxGridDBColumn
        Caption = #25209#21495
        DataBinding.FieldName = 'BatchNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column11: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object v1Column12: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column16: TcxGridDBColumn
        Caption = #33521#25991#39068#33394
        DataBinding.FieldName = 'C_EColor'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
      object Tv1Column17: TcxGridDBColumn
        Caption = #21152#24037#21035
@ -367,7 +368,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object Tv1Column18: TcxGridDBColumn
        Caption = #21518#21152#24037#20013#25991
@ -375,7 +376,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object Tv1Column19: TcxGridDBColumn
        Caption = #21518#21152#24037#33521#25991
@ -383,7 +384,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object Tv1Column20: TcxGridDBColumn
        Caption = #24067#31181
@ -391,7 +392,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 111
+        Width = 77
      end
      object Tv1Column21: TcxGridDBColumn
        Caption = #31867#22411
@ -404,7 +405,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          #21322#25104#21697
          #25104#21697)
        HeaderAlignmentHorz = taCenter
-        Width = 111
+        Width = 77
      end
    end
    object cxGrid1Level1: TcxGridLevel
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
@ -571,14 +571,16 @@ begin
          FieldByName('C_Composition').Value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Composition').AsString);
          FieldByName('C_Width').Value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Width').AsString);
          FieldByName('C_GramWeight').Value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_GramWeight').AsString);
-          Fieldbyname('C_ColorNo').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_ColorNo').AsString);
-          Fieldbyname('C_Color').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Color').AsString);
+
          Fieldbyname('C_Pattern').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Pattern').AsString);

          Fieldbyname('CraftCode').value := frmClothInfoSel.CDS_1.Fieldbyname('CraftCode').value;
          Fieldbyname('CraftName').value := frmClothInfoSel.CDS_1.Fieldbyname('CraftName').value;
          Fieldbyname('CraftEName').value := frmClothInfoSel.CDS_1.Fieldbyname('CraftEName').value;
          Fieldbyname('GC_Name').value := frmClothInfoSel.CDS_1.Fieldbyname('GC_Name').value;
+
+          Fieldbyname('C_ColorNo').value := trim(frmClothInfoSel.CDS_3.Fieldbyname('C_ColorNo').AsString);
+          Fieldbyname('C_Color').value := trim(frmClothInfoSel.CDS_3.Fieldbyname('C_Color').AsString);
        end;

      end;
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@ -8,8 +8,8 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
  Font.Height = -16
  FormStyle = fsMDIChild
  Visible = True
-  ExplicitWidth = 1303
-  ExplicitHeight = 637
+  ExplicitWidth = 1311
+  ExplicitHeight = 645
  PixelsPerInch = 96
  TextHeight = 21
  object ToolBar1: TToolBar [0]
--- a/T05贸易门市管理/U_TradeMarketInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut.dfm
@ -8,8 +8,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
  Font.Height = -16
  Position = poMainFormCenter
  WindowState = wsMaximized
-  ExplicitWidth = 1921
-  ExplicitHeight = 683
+  ExplicitWidth = 1929
+  ExplicitHeight = 691
  PixelsPerInch = 96
  TextHeight = 21
  object ToolBar1: TToolBar [0]
--- a/T05贸易门市管理/U_TradeMarketInPut.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut.pas
@ -197,8 +197,6 @@ begin
    FieldByName('TMSId').Value := Trim(maxno);
    FieldByName('TMSPiece').Value := 0;

-
-
    FieldByName('TMSQty').Value := 0;
    Post;
  end;
@ -358,6 +356,10 @@ begin
    close;
    sql.Clear;
    sql.Add(' select CoCode,CoAbbrName from BS_Company  where CoType=''¿Í»§'' ');
+
+    if Trim(canshu4) = '新余' then
+      sql.Add(' and Stores=''新余'' ');
+
    Open;

    CustName.Properties.LookupItems.Clear;
@ -413,7 +415,7 @@ begin
  begin
    Close;
    sql.Clear;
-    sql.Add('  SELECT C_GYSNAME FROM BS_Cloth_Info_GYSCP');
+    sql.Add('  SELECT C_GYSNAME FROM BS_Cloth_Info_GYSCP ');
    Open;
  end;
  with ADO_DanWei do
@ -1081,12 +1083,14 @@ begin
    with frmCompanySel do
    begin
      FCoType := '¿Í»§';
+      FStores := Trim(canshu4);
      if ShowModal = 1 then
      begin
        self.CustName.Hint := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
        self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
        self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString);
        self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('PhoneNumber').AsString);
+
      end;
    end;

--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@ -9,8 +9,8 @@ inherited frmTradeMarketList: TfrmTradeMarketList
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
-  ExplicitWidth = 1799
-  ExplicitHeight = 625
+  ExplicitWidth = 1807
+  ExplicitHeight = 633
  PixelsPerInch = 96
  TextHeight = 21
  object ToolBar1: TToolBar [0]
--- a/T05贸易门市管理/U_TradeMarketList.pas
+++ b/T05贸易门市管理/U_TradeMarketList.pas
@ -266,6 +266,8 @@ begin
  SqlStr := SqlStr + ' ,@StkPosition= ' + QuotedStr(Trim(canshu2));
  if canshu1 = 'Â¼Èë' then
    SqlStr := SqlStr + ' ,@Filler= ' + QuotedStr(Trim(DName));
+
+  SqlStr := SqlStr + ' ,@Stores= ' + QuotedStr(Trim(canshu4));
  case cxTabControl1.TabIndex of
    0:
      begin
@ -499,7 +501,7 @@ begin
  inherited;
  canshu1 := trim(self.fParameters1);
  canshu2 := trim(self.fParameters2);
-  canshu4 := trim(self.canshu4);
+  canshu4 := trim(self.fParameters4);
  fFlileFlag := UserDataFlag + 'HX';
  cxTabControl1.TabIndex := 0;
  InitForm();