From 6369e4d72d0f72c4fc871f675450c7f0a95085fb Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Thu, 11 Dec 2025 09:43:56 +0800
Subject: [PATCH] ~

---
 应收应付/U_YSYGGJList.pas | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/应收应付/U_YSYGGJList.pas b/应收应付/U_YSYGGJList.pas
index 5a193a3..b622a4b 100644
--- a/应收应付/U_YSYGGJList.pas
+++ b/应收应付/U_YSYGGJList.pas
@@ -163,16 +163,17 @@ 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('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(' 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('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) + ''' ');
@@ -180,6 +181,7 @@ begin
       if cxTabControl1.TabIndex < 2 then
         sql.Add(' and isnull(A.status,0)=''' + inttostr(cxTabControl1.TabIndex) + ''' ');
 //      Sql.add('group by convert(char(10),A.FillTime,120),A.Filler,A.mainID,A.MjTypeOther,C.OrderNo,D.PRTCodeName,C.conNo,C.CustomerNoName,D.PrtColor');
+//    ShowMessage(sql.text);
       Open;
     end;
     SCreateCDS20(ADOQueryMain, CDS_Main);
@@ -499,7 +501,7 @@ begin
           sql.Add(',getdate() ');
           sql.Add(',' + quotedstr(trim(self.Caption)));
           sql.Add(',' + quotedstr(trim('Ô±¹¤¹¤¼Û')));
-          sql.Add(',' + quotedstr(trim('ÐÞ¸ÄÇ°¡úÌõÂë:' + trim(CDS_Main.fieldbyname('CLID').AsString) + ',µ¥¼Û ' + trim(CDS_Main.fieldbyname('GXPrice').AsString) + ',ÊýÁ¿ '+ trim(CDS_Main.fieldbyname('QTY').AsString) + 'Ð޸ĺó£º' + ',µ¥¼Û ' + trim(Edit_GXPrice.Text) + ',ÊýÁ¿ ' + trim(Edit_QTY.text))));
+          sql.Add(',' + quotedstr(trim('ÐÞ¸ÄÇ°¡úÌõÂë:' + trim(CDS_Main.fieldbyname('CLID').AsString) + ',µ¥¼Û ' + trim(CDS_Main.fieldbyname('GXPrice').AsString) + ',ÊýÁ¿ ' + trim(CDS_Main.fieldbyname('QTY').AsString) + 'Ð޸ĺó£º' + ',µ¥¼Û ' + trim(Edit_GXPrice.Text) + ',ÊýÁ¿ ' + trim(Edit_QTY.text))));
           sql.Add(',' + quotedstr(trim('³É¹¦')));
           sql.Add(')');
           if CheckBox4.Checked then
@@ -526,15 +528,15 @@ begin
         end;
 
         Post;
-      end;                                                
+      end;
     end;
     ADOQueryCmd.Connection.CommitTrans;
     Application.MessageBox('²Ù×÷³É¹¦!', 'Ìáʾ', 0);
     Panel2.Visible := false;
     Edit_GXPrice.Text := '';
     Edit_QTY.Text := '';
-     CheckBox4.Checked:=false;
-     CheckBox5.Checked:=false;
+    CheckBox4.Checked := false;
+    CheckBox5.Checked := false;
     Exit;
   except
     ADOQueryCmd.Connection.RollbackTrans;