23

Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs

@@ -617,7 +617,7 @@ namespace Pilot.Report.Exploitation.SpecialDetails
             on B.FENTRYID = H7.FSID
             --ES、W、SX、CW、D、CY
             Where D.FNUMBER not in ('P','E','C','S')
-            AND A.F_YKQC_CheckBox_qtr1 = 1 AND B.FQTY >= 0
+            AND (A.F_YKQC_CHECKBOX_QTR1 = 1  OR a.F_GROSSMARGIN1='<35%') AND B.FQTY >= 0
             AND A.FDocumentStatus = 'C' AND A.FBusinessType = 'NORMAL' AND A.FMANUALCLOSE = '0'
             AND A.FID in (Select * From #TABLEXYX)
             AND A.F_contractnumber NOT LIKE 'Z%'

应收明细SQL.sql

@@ -349,6 +349,9 @@ WHERE T0.FREDBLUE=0   AND aa1.fid=
  THEN  ([整单正数订单总额]-[整单累计退货金额])*[分摊比例]*0.01*[收款条件分摊比例]*0.01 - [收款条件累计核销金额]*[分摊比例]*0.01 +[运杂费]  ELSE 0 END ;
 
  
+    UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [预计到期时间]=NULL
+   WHERE [未到期金额] < 0
+
 update [ZRP_YingShouMingXi_yuyubo] set 
 [到期时间]=CASE WHEN  [预计到期时间] IS NOT  NULL AND  [预计到期时间] <= GETDATE() AND [预计到期时间] >'1990-01-01' AND [订单总额]>0  AND [未到期金额] <> 0 THEN [预计到期时间] ELSE NULL END 
 ,[到期金额]=CASE WHEN  [预计到期时间] IS NOT NULL AND   [预计到期时间] <= GETDATE() AND [预计到期时间] >'1990-01-01' AND [订单总额]>0