From 912a9ff6ef0a3dd701050760bc72caf244a36d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”>
Date: Sat, 19 Apr 2025 15:55:10 +0800
Subject: [PATCH] 111

---
 B02基础纱线仓库/U_YarnOutEdit.dfm  |  2 --
 B02基础纱线仓库/U_YarnStkHZSel.dfm |  2 +-
 B02基础纱线仓库/U_YarnStkHZSel.pas | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/B02基础纱线仓库/U_YarnOutEdit.dfm b/B02基础纱线仓库/U_YarnOutEdit.dfm
index a51b21f..1ab6a6b 100644
--- a/B02基础纱线仓库/U_YarnOutEdit.dfm
+++ b/B02基础纱线仓库/U_YarnOutEdit.dfm
@@ -10,7 +10,6 @@ inherited frmYarnOutEdit: TfrmYarnOutEdit
   Font.Name = #23435#20307
   Position = poMainFormCenter
   OnClose = FormClose
-  ExplicitLeft = -8
   ExplicitWidth = 1422
   ExplicitHeight = 793
   PixelsPerInch = 96
@@ -406,7 +405,6 @@ inherited frmYarnOutEdit: TfrmYarnOutEdit
         Font.Style = []
         ParentFont = False
         TabOrder = 1
-        ExplicitLeft = -1
         object TV2: TcxGridDBTableView
           OnDblClick = TV2DblClick
           Navigator.Buttons.CustomButtons = <>
diff --git a/B02基础纱线仓库/U_YarnStkHZSel.dfm b/B02基础纱线仓库/U_YarnStkHZSel.dfm
index f0cca6b..500778d 100644
--- a/B02基础纱线仓库/U_YarnStkHZSel.dfm
+++ b/B02基础纱线仓库/U_YarnStkHZSel.dfm
@@ -162,8 +162,8 @@ inherited frmYarnStkHZSel: TfrmYarnStkHZSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitLeft = -1
     object Tv1: TcxGridDBTableView
+      OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
diff --git a/B02基础纱线仓库/U_YarnStkHZSel.pas b/B02基础纱线仓库/U_YarnStkHZSel.pas
index fb5e21b..708e63b 100644
--- a/B02基础纱线仓库/U_YarnStkHZSel.pas
+++ b/B02基础纱线仓库/U_YarnStkHZSel.pas
@@ -69,6 +69,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
     procedure ToolButton2Click(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -108,9 +109,12 @@ begin
       Filtered := False;
       Close;
       sql.Clear;
-      sql.Add(' select A.* ');
-      sql.Add(' from BS_Yarn_IO A where  A.IOFlag=''���'' and  isnull(STkQty,0)>0   ');
-      sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + '''');
+      sql.Add(' select FromCoNo,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition');
+      sql.Add(' from BS_Yarn_IO A where');
+      sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + '''');
+      sql.Add('GROUP BY FromCoNo,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition');
+      SQL.Add('HAVING sum(ioqtyflag*qty)>0');
+      sql.Add('order by StkCoName,Brand,Y_Name');
       Open;
     end;
     SCreateCDS(ADOQueryMain, CDS_Main);
@@ -203,5 +207,10 @@ begin
   ModalResult := 1;
 end;
 
+procedure TfrmYarnStkHZSel.Tv1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
 end.