From ef52eaac7fbaebcdb04ffcf4ffeab96e7ca1c35f Mon Sep 17 00:00:00 2001
From: ZhangQingYue <375354874@qq.com>
Date: Mon, 9 Jun 2025 14:44:15 +0800
Subject: [PATCH] Revert "123456789"

This reverts commit b467e112c1616129aa71072e7e3bb9885f2f7232.
---
 A00通用窗体/U_SalesContract_ZZDSXSel.dfm      | 28 ++++++++++---------
 A00通用窗体/U_SalesContract_ZZDSXSel.pas      |  5 ++--
 B04采购计划管理/U_YarnPurchasePlanPut_ZZD.dfm |  6 ++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/A00通用窗体/U_SalesContract_ZZDSXSel.dfm b/A00通用窗体/U_SalesContract_ZZDSXSel.dfm
index 51e6187..3658ce7 100644
--- a/A00通用窗体/U_SalesContract_ZZDSXSel.dfm
+++ b/A00通用窗体/U_SalesContract_ZZDSXSel.dfm
@@ -2,7 +2,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
   Left = 372
   Top = 106
   Caption = #21512#21516#32433#32447#36873#25321
-  ClientHeight = 548
+  ClientHeight = 558
   ClientWidth = 1540
   Color = clWhite
   Font.Charset = GB2312_CHARSET
@@ -10,9 +10,9 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
-  ExplicitLeft = -689
+  ExplicitLeft = -551
   ExplicitWidth = 1556
-  ExplicitHeight = 587
+  ExplicitHeight = 597
   PixelsPerInch = 96
   TextHeight = 12
   object ToolBar1: TToolBar [0]
@@ -37,6 +37,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
     ParentFont = False
     ShowCaptions = True
     TabOrder = 0
+    ExplicitTop = 5
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -71,6 +72,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
+    ExplicitTop = 32
     object Label1: TLabel
       Left = 18
       Top = 15
@@ -124,12 +126,12 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
     Left = 0
     Top = 82
     Width = 1540
-    Height = 466
+    Height = 476
     Align = alClient
     BorderStyle = cxcbsNone
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitHeight = 476
+    ExplicitTop = 88
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -314,6 +316,14 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
         Options.Editing = False
         Width = 100
       end
+      object TV1Column16: TcxGridDBColumn
+        Caption = #32433#32447#24211#23384
+        DataBinding.FieldName = 'KCQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
       object TV1Column4: TcxGridDBColumn
         Caption = #24050#39046#29992#25968#37327
         DataBinding.FieldName = 'LYQty'
@@ -323,14 +333,6 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
         HeaderAlignmentHorz = taCenter
         Width = 99
       end
-      object TV1Column16: TcxGridDBColumn
-        Caption = #32433#32447#24211#23384
-        DataBinding.FieldName = 'KCQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 100
-      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = TV1
diff --git a/A00通用窗体/U_SalesContract_ZZDSXSel.pas b/A00通用窗体/U_SalesContract_ZZDSXSel.pas
index 0a4c86d..defd307 100644
--- a/A00通用窗体/U_SalesContract_ZZDSXSel.pas
+++ b/A00通用窗体/U_SalesContract_ZZDSXSel.pas
@@ -168,12 +168,13 @@ begin
 
       SQL.Add('SELECT A.*,B.*,C.*');
       SQL.Add('  ,SXQty=round(OrdQty*C.MeterQty/1000,2)');
-      SQL.Add('  ,LYQTY = (SELECT SUM(QTY) FROM Bs_Yarn_IO X ');
-      SQL.Add('WHERE X.ToOrdNo = A.OrderNo AND IOFlag = ''����'')');
       SQL.Add('  ,SQQty=(select Sum(Y.Qty) from Pur_YarnPlan_Main X ');
       SQL.Add('INNER JOIN Pur_YarnPlan_Sub Y on X.PurMId =Y.PurMId ');
       SQL.Add('where isnull(X.LX,'''') = ''֯�쵥'' and X.OrderNo =A.OrderNo and ');
       SQL.Add('isnull(X.status,''0'')=''-1'') ');
+
+
+
       sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.Mainid=B.MainId');
       sql.Add(' inner join Tat_Plan_Yarn C on A.Mainid=C.MainId');
       SQL.Add('WHERE A.Status = ''9'' and C.Y_Code <> '''' ');
diff --git a/B04采购计划管理/U_YarnPurchasePlanPut_ZZD.dfm b/B04采购计划管理/U_YarnPurchasePlanPut_ZZD.dfm
index 8bdaed4..312a65b 100644
--- a/B04采购计划管理/U_YarnPurchasePlanPut_ZZD.dfm
+++ b/B04采购计划管理/U_YarnPurchasePlanPut_ZZD.dfm
@@ -10,7 +10,6 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -572
   ExplicitWidth = 1540
   ExplicitHeight = 690
   PixelsPerInch = 96
@@ -116,6 +115,7 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
     Align = alClient
     BorderStyle = cxcbsNone
     TabOrder = 2
+    ExplicitLeft = -6
     ExplicitTop = 183
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
@@ -569,8 +569,8 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
     end
     object OrderNo: TcxButtonEdit
       Tag = 2
-      Left = 803
-      Top = 6
+      Left = 801
+      Top = 5
       Properties.Buttons = <
         item
           Default = True