From 4cbe32486af023e6ba6e5a28f63c8b2717ee4a69 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Sat, 13 Dec 2025 16:34:49 +0800
Subject: [PATCH] ~

---
 应收应付/U_YSYGGJList.dfm |  5 +++++
 应收应付/U_YSYGGJList.pas | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/应收应付/U_YSYGGJList.dfm b/应收应付/U_YSYGGJList.dfm
index fa0b59d..b93ba96 100644
--- a/应收应付/U_YSYGGJList.dfm
+++ b/应收应付/U_YSYGGJList.dfm
@@ -472,6 +472,11 @@ object frmYSYGGJList: TfrmYSYGGJList
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #35746#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        Width = 60
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
diff --git a/应收应付/U_YSYGGJList.pas b/应收应付/U_YSYGGJList.pas
index b622a4b..9769b38 100644
--- a/应收应付/U_YSYGGJList.pas
+++ b/应收应付/U_YSYGGJList.pas
@@ -102,6 +102,7 @@ type
     CheckBox4: TCheckBox;
     CheckBox5: TCheckBox;
     Button9: TButton;
+    Tv1Column6: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -163,18 +164,18 @@ procedure TfrmYSYGGJList.InitGrid();
 begin
   try
     ADOQueryMain.DisableControls;
-    with ADOQueryMain do                              
+    with ADOQueryMain do
     begin
       Close;
-      sql.Clear;                                         
+      sql.Clear;
       Filtered := False;
-      sql.Add('select A.*,B.PRTCodeName,B.prtcode,B.PRTColor,B.SOrddefstr5,');
+      sql.Add('select A.*,B.PRTCodeName,B.prtcode,B.PRTColor,B.SOrddefstr5,C.OrderNo,');
       sql.Add(' isnull((A.GxPrice ),0)  as  gxdj ,isnull(((A.GxPrice)*qty ),0) as gxmoney ');
 //      sql.Add('gxdj=case when  A.qty<=30 then isnull((select (A.GxPrice)*2 from JyOrder_Yield B where A.CLID=B.clid ),0)');
 //      SQL.Add('else isnull((A.GxPrice ),0) end, ');
 //      sql.Add('gxmoney=case when  A.qty<=30 then isnull((select ((A.GxPrice)*2)*B.qty from JyOrder_Yield B where A.CLID=B.clid ),0)');
 //      SQL.Add(' else isnull(((A.GxPrice)*qty ),0) end ');
-      sql.Add('from JyOrder_Yield A ');
+      sql.Add('from JyOrder_Yield A  inner join JYOrder_Main C on A.mainid=C.mainid');
       sql.Add('left join JYOrder_Sub  B on  A.mainid=B.mainid and A.subid=B.subid');
       sql.Add('where A.filltime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
       sql.Add(' and A.filltime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
@@ -434,16 +435,17 @@ begin
       First;
       while not eof do
       begin
-        if Fieldbyname('ssel').AsBoolean then
+        if Fieldbyname('ssel').AsBoolean then                      
         begin
           with ADOQueryCmd do
           begin
             Close;
             sql.Clear;
-            sql.add('insert into JyOrder_Yield_Del select * from WFB_MJJY where mjid=''' + trim(CDS_Main.fieldbyname('CLID').AsString) + ''' ');
+            sql.add('insert into JyOrder_Yield_Del select * from JyOrder_Yield where CLID=''' + trim(CDS_Main.fieldbyname('CLID').AsString) + ''' ');
             sql.Add('update JyOrder_Yield_Del Set DelTime=Getdate(),Deler=''' + trim(DName) + ''' where CLID=''' + trim(CDS_Main.fieldbyname('CLID').AsString) + ''' ');
-            sql.Add('delete JyOrder_Yield  where MJID=''' + Trim(CDS_Main.fieldbyname('CLID').AsString) + '''');
-            ExecSQL;
+            sql.Add('delete JyOrder_Yield  where CLID=''' + Trim(CDS_Main.fieldbyname('CLID').AsString) + '''');
+//            ShowMessage(sql.text);
+            ExecSQL;                                       
           end;
           CDS_Main.Delete;
         end;