From ab8c46ba828c93a2c6b0a122b3e34aac6174835c Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 11 Apr 2025 16:43:54 +0800
Subject: [PATCH] 11

---
 搴旀敹鏄庣粏SQL.sql | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/搴旀敹鏄庣粏SQL.sql b/搴旀敹鏄庣粏SQL.sql
index 9375b67..0b9f4cb 100644
--- a/搴旀敹鏄庣粏SQL.sql
+++ b/搴旀敹鏄庣粏SQL.sql
@@ -70,7 +70,8 @@ SELECT   A.FID [
   WHEN X.FNAME LIKE '%款到发货%'  THEN DATEADD(DAY, plan1.F_DAY, CK.F_SFSIGNATURETIME)  
  --WHEN X.FNAME LIKE '%款到发货%'  THEN DATEADD(day, plan1.F_DAY,Q.发货日期) 
  -- 注意：销售订单【验收日期】：年后会加这个字段，由PMS系统传输过来 该字段未添加
- ELSE NULL       
+  WHEN   AA.F_XMYSSJ IS NOT NULL THEN  DATEADD(DAY,plan1.F_DAY, AA.F_XMYSSJ)          
+ ELSE null
  END AS '预计到期时间' --销售订单-付款计划-PMS日期#    
  ,plan1.F_RECCONDITIONID,X.FNAME, plan1.F_DAY,plan1.FENTRYID ,AA.FAPPROVEDATE,CK.F_SFSIGNATURETIME
  FROM  
@@ -202,13 +203,14 @@ GROUP BY  F_PaperNumber, FSALEORGID
   (SELECT distinct F_Papercontract,FSALEORGID FROM T_SAL_DELIVERYNOTICE WITH(NOLOCK) WHERE F_SFYFH ='是') AB 
   ON AB.F_PAPERCONTRACT = A.F_contractnumber  AND AB.FSALEORGID=a.FSaleOrgId 
   
- WHERE ( ( A.FSALEORGID = 100302 AND  (                            
-  (ACO.区域 != '碳索智控'  OR  ACO.区域 IS null  )                      
- AND (ACL.区域 != '碳索智控'    OR     ACL.区域 IS null                              )
- AND C.FNAME  NOT IN ('派诺科技（香港）有限公司','武汉派诺科技发展有限公司','客户-样机使用')
- --,'珠海华夏云联技术有限公司','珠海兴诺能源技术有限公司','广东碳索智控科技有限公司')                                      
- AND L.FNAME NOT IN  ('兴诺总','陈智勇')   )) OR   A.FSALEORGID != 100302)    AND A.FDocumentStatus = 'C'                   
- AND  EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid  ) 
+ WHERE ( ( A.FSALEORGID = 100302
+ -- AND  (                            
+ -- (ACO.区域 != '碳索智控'  OR  ACO.区域 IS null  )                      
+ --AND (ACL.区域 != '碳索智控'    OR     ACL.区域 IS null                              )
+ AND C.FNAME  NOT IN ('派诺科技（香港）有限公司','武汉派诺科技发展有限公司','客户-样机使用'
+ ,'珠海华夏云联技术有限公司','珠海兴诺能源技术有限公司','广东碳索智控科技有限公司')                                      
+ AND L.FNAME NOT IN  ('兴诺总','陈智勇')   ) OR   A.FSALEORGID != 100302)    AND A.FDocumentStatus = 'C'                   
+ --AND  EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid  ) 
  ) A
    --where [销售单主键ID]= 102802
    --where  [分摊比例]< 100
@@ -216,11 +218,11 @@ GROUP BY  F_PaperNumber, FSALEORGID
    WHERE [整单订单总额]<>0  AND SUBSTRING([纸质合同号],1,1) != 'Z'  
    ORDER BY A.[销售单主键ID],[销售员ID]
      
-update [ZRP_YingShouMingXi_yuyubo] set [订单总额]=[分摊金额],[累计发货金额]=[整单累计发货金额]*[分摊比例]*0.01
+update [ZRP_YingShouMingXi_yuyubo] set [订单总额]=[整单订单总额]*[分摊比例]*0.01,[累计发货金额]=[整单累计发货金额]*[分摊比例]*0.01
 ,[累计退货金额]=[整单累计退货金额]*[分摊比例]*0.01
 ,[累计开票金额]=[整单累计开票金额]*[分摊比例]*0.01
 ,[累计到款金额]=[整单累计到款金额]*[分摊比例]*0.01
-,[应收款合计]=[分摊金额]-([整单累计退货金额]+[整单累计到款金额])*[分摊比例]*0.01
+,[应收款合计]=ABS([分摊金额])-ABS(([整单累计退货金额]+[整单累计到款金额])*[分摊比例]*0.01)
 ,[未出货总额]=[分摊金额]-[整单累计发货金额]*[分摊比例]*0.01
 ,[未到期金额]=CASE WHEN [预计到期时间] <'1990-01-01' OR [预计到期时间] > GETDATE() THEN ([整单累计发货金额]-[整单累计退货金额]-[整单累计到款金额])*[分摊比例]*0.01*ISNULL([收款条件分摊比例],100)*0.01 ELSE 0 END 
 
@@ -253,6 +255,7 @@ update [ZRP_YingShouMingXi_yuyubo] SET [
    ,[转专责小组时间]=CASE WHEN [转专责小组时间] > '1990-01-01' THEN [转专责小组时间] ELSE NULL END 
    , [账龄月]= ISNULL(  ROUND( DATEDIFF(DAY,[到期时间],GETDATE()) / 30,0) ,0 ) 
 
+TRUNCATE TABLE dbo.ReceivablesDetailsTable;
 
   --update [ReceivablesDetailsTable] set [F_001]=b.[销售单主键ID],[F_002]=b.[销售员],[F_003]=b.[SBU],[F_004]=B.[明细区域],[F_005]=b.[购货单位],[F_006]=b.[公司性质]
   --,[F_007]=[客户信用],[F_008]=[纸质合同号],[F_009]=[项目名称],[F_010]=[订单总额],[F_011]=[签订年份],[F_012]=CONVERT(NVARCHAR(20),[订单日期],23),[F_013]=[收款条件],[F_014]=CONVERT(NVARCHAR(20),[发货日期],23)
@@ -306,3 +309,5 @@ GO
 --EXEC PR_YingShouMingXi_yuyubo
 
 
+--SELECT  TOP 10 * FROM ReceivablesDetailsTable
+