11

Pilot_KD_Parino/SQL/SqlManage_yuyubo.cs

@@ -150,6 +150,12 @@ GROUP BY  F_PaperNumber, FSALEORGID
 	             C.FBILLALLAMOUNT as 'FALLAMOUNTY',
                  ISNULL(A.F_AMOUNT,0) as 'FYAMOUNT',
                  C.FBILLALLAMOUNT-A.F_AMOUNT as 'FDAMOUNT2',
+   	     (SELECT TOP 1
+        (fin.FBillAllAmount+bb.F_expenses-bb.F_AMOUNT) AS XiaoFamount     
+        FROM dbo.T_SAL_ORDER bb    
+        INNER JOIN dbo.T_SAL_ORDERFIN fin ON bb.FID=fin.FID
+        WHERE a.F_PAPERCONTRACT=bb.F_CONTRACTNUMBER AND a.FSALEORGID=bb.FSALEORGID ) AS FDAMOUNT2222,
+
 	             C.FSETTLECURRID as 'FCurr',
                  case when  DATEDIFF(MONTH, A.FDATE, GETDATE())<3 then 'True' else 'False' end as 'FIs30'   ,
                  '发货通知单' as 'FTYPE',
@@ -182,7 +188,9 @@ GROUP BY  F_PaperNumber, FSALEORGID
                  AND A.FDOCUMENTSTATUS = 'C' AND ISNULL(A.F_Papercontract,'')!=''    
                  AND (A.F_AMOUNT < C.FBILLALLAMOUNT
                  or A.F_AMOUNT IS NULL)   {where}             
-             ) A   ORDER BY  A.FCUSTID,a.FID desc ");
+             ) A 
+   WHERE a.FDAMOUNT2 <= a.FDAMOUNT2222
+    ORDER BY  A.FCUSTID,a.FID desc ");
             return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null);
         }