From e6b38b8e07defd1a51966cde0ca4e73af15c1979 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Tue, 10 Mar 2026 11:33:20 +0800
Subject: [PATCH] 3.10

---
 A00通用窗体/U_CompanySel.pas               | 6 +++---
 A01基础公司管理/U_CustInput.dfm            | 4 ++--
 A01基础公司管理/U_CustInput.pas            | 6 ++++++
 A01基础公司管理/U_Customer.pas             | 3 ++-
 T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm | 1 +
 T02贸易汇总仓库/U_ItemizedListQtyInPut.pas | 6 +++---
 T05贸易门市管理/U_TradeMarketInPut_XY.dfm  | 6 ++++--
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/A00通用窗体/U_CompanySel.pas b/A00通用窗体/U_CompanySel.pas
index 2d3c2e9..ec25718 100644
--- a/A00通用窗体/U_CompanySel.pas
+++ b/A00通用窗体/U_CompanySel.pas
@@ -159,9 +159,9 @@ 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) + '''');
-
+//      if FStores = '����' then
+//        sql.Add(' and A.Stores=''' + Trim(FStores) + '''');
+//      ShowMessage(sql.Text);
       Open;
     end;
 
diff --git a/A01基础公司管理/U_CustInput.dfm b/A01基础公司管理/U_CustInput.dfm
index 7bab10b..62c2334 100644
--- a/A01基础公司管理/U_CustInput.dfm
+++ b/A01基础公司管理/U_CustInput.dfm
@@ -429,8 +429,8 @@ inherited frmCustInput: TfrmCustInput
     end
     object Stores: TcxComboBox
       Tag = 2
-      Left = 951
-      Top = 164
+      Left = 950
+      Top = 160
       Properties.DropDownListStyle = lsFixedList
       Properties.Items.Strings = (
         #26684#32654
diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas
index 62fa5a0..be2a290 100644
--- a/A01基础公司管理/U_CustInput.pas
+++ b/A01基础公司管理/U_CustInput.pas
@@ -632,6 +632,12 @@ begin
     Application.MessageBox('ҵ��Ա����Ϊ��!', '��ʾ', 0);
     Exit;
   end;
+  if Trim(Stores.Text) = '' then
+  begin
+    Application.MessageBox('�ŵ겻��Ϊ��!', '��ʾ', 0);
+    Exit;
+  end;
+
 
   with CDS_LXR do
   begin
diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas
index a12fe94..c320a89 100644
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@@ -17,7 +17,8 @@ uses
   FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param, FireDAC.Stan.Error,
   FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Stan.Async,
   FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Comp.Client, cxContainer,
-  dxScrollbarAnnotations, Vcl.Menus, cxProgressBar;
+  dxScrollbarAnnotations, Vcl.Menus, cxProgressBar, dxSkinsCore,
+  dxSkinsDefaultPainters;
 
 type
   TfrmCustomer = class(TfrmBaseList)
diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
index de776a4..19ec928 100644
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
@@ -69,6 +69,7 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
           Caption = #27611#37325
           DataBinding.FieldName = 'GrossWeight'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Width = 143
         end
diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
index 62bbcda..edbdaf3 100644
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
@@ -493,8 +493,8 @@ begin
   end;
   if CDS_Sub.IsEmpty then
   begin
-    for i := 1 to 50 do
-    begin
+//    for i := 1 to 50 do
+//    begin
       CopyAddRowCDS(CDS_Sub);
       with CDS_Sub do
       begin
@@ -505,7 +505,7 @@ begin
         post;
       end;
 
-    end;
+//    end;
   end;
 
 end;
diff --git a/T05贸易门市管理/U_TradeMarketInPut_XY.dfm b/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
index fc7db52..4c49c99 100644
--- a/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
@@ -9,8 +9,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
   Position = poMainFormCenter
   WindowState = wsMaximized
   OnClose = FormClose
-  ExplicitLeft = -347
-  ExplicitTop = -270
+  ExplicitLeft = -2
   ExplicitWidth = 1556
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -142,6 +141,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
         Height = 509
         Align = alClient
         TabOrder = 0
+        ExplicitLeft = -1
+        ExplicitTop = 5
         object Tv1: TcxGridDBTableView
           OnDblClick = Tv1DblClick
           OnMouseDown = Tv1MouseDown
@@ -426,6 +427,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
             Width = 89
           end
           object Tv1Column23: TcxGridDBColumn
+            Tag = 2
             Caption = #20986#24211#21305#25968
             DataBinding.FieldName = 'SubOutPS'
             DataBinding.IsNullValueType = True