diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index dab8ee5..6980a2e 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -315,10 +315,10 @@ else FROM ( SELECT DISTINCT [销售单主键ID],hh.收款条件主键ID,F_036 FROM [ReceivablesDetailsTable] hh where {wheresql} ) a ) ,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 - , null, null, null, null, null + , null, null, null, null, null,'',1 [HuiLv],SUM([DingDanZongE_YuanBi]),'' [ZeRenRen],0 [XinYongEDu],'' [客户编码],SUM([DaoKuanJinE_YuanBi]) ,SUM([YingShouHeJi_YuanBi]),SUM([YunZaFei]),SUM([LeiJiTuiHuoJinE_YuanBi]) From (select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025, - 0 as F_027,0 F_036 from + 0 as F_027,0 F_036 ,[BiBie] ,[DingDanZongE_YuanBi] ,[DaoKuanJinE_YuanBi] ,[YingShouHeJi_YuanBi] ,[YunZaFei], [LeiJiTuiHuoJinE_YuanBi] from [ReceivablesDetailsTable] where {wheresql} ) a )) W Order by W.F_001"); @@ -639,6 +639,24 @@ else this.View.Model.SetValue("F_067", item["F_067"], indexi); //68 this.View.Model.SetValue("F_068", item["F_068"], indexi); + //结算币别 + this.View.Model.SetValue("FBiBie", item["BiBie"], indexi); + //汇率 + this.View.Model.SetValue("FHuiLv", item["HuiLv"], indexi); + //订单总额(原币) + this.View.Model.SetValue("FDingDanZongE_YuanBi", item["DingDanZongE_YuanBi"], indexi); + //责任人 + this.View.Model.SetValue("FZeRenRen", item["ZeRenRen"], indexi); + //客户信用额度 + this.View.Model.SetValue("FXinYongEDu", item["XinYongEDu"], indexi); + //累计到款金额(原币) + this.View.Model.SetValue("FDaoKuanJinE_YuanBi", item["DaoKuanJinE_YuanBi"], indexi); + //应收款合计(原币) + this.View.Model.SetValue("FYingShouHeJi_YuanBi", item["YingShouHeJi_YuanBi"], indexi); + //运杂费 + this.View.Model.SetValue("FYunZaFei", item["YunZaFei"], indexi); + //累计退货金额(原币) + this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", item["LeiJiTuiHuoJinE_YuanBi"], indexi); //【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重 if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString())) @@ -651,7 +669,12 @@ else this.View.Model.SetValue("F_021", null, indexi); this.View.Model.SetValue("F_022", null, indexi); this.View.Model.SetValue("F_025", null, indexi); - + this.View.Model.SetValue("FLeiJiTuiHuoJinE_YuanBi", null, indexi); + this.View.Model.SetValue("FDaoKuanJinE_YuanBi", null, indexi); + this.View.Model.SetValue("FYingShouHeJi_YuanBi", null, indexi); + this.View.Model.SetValue("FXinYongEDu", null, indexi); + this.View.Model.SetValue("FDingDanZongE_YuanBi", null, indexi); + } else dicList.Add(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString(), 0); diff --git a/应收明细SQL.sql b/应收明细SQL.sql index 0201543..3b2bcb6 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -24,7 +24,7 @@ BEGIN [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],[ܶ],[Ӧձ],[ۼƷ] ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶],[տ̯],[տ̯],[ܶ],[տۼƺ] - ,[ұ],[ұID],[],[ͻö],[ͻ] ) + ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)] ,[ӷ]) SELECT [۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], @@ -33,14 +33,14 @@ SELECT [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],0 [ܶ],[Ӧձ], 0 [ۼƷ] ,0 [ۼ˻],0 [ۼƿƱ],0 [Ӧտϼ],0 [δܶ],0 [δڽ],NULL [ʱ],0 [ڽ],0 [ʵѳӦտϼ],NULL [Ŀ׶],NULL [տ],0 [ۼƵ], NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-׶],NULL [],[֯ID],[],[۶],[տ̯],[տ̯],[ܶ] -,[տۼƺ] ,[ұ],[ұID],[],[ͻö],[ͻ] +,[տۼƺ] ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)],[ӷ] FROM ( SELECT A.FID [۵ID] ,ISNULL(O.fid,l.fid) [ԱID] ,ISNULL(w.FENTRYID,0) [տID], ISNULL(w.FNAME,'') AS [տ], W.F_RecConditionId -,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WITH(NOLOCK) WHERE FF.FID = A.FID ) AS [ܶ],w.FRECADVANCEAMOUNT [տ̯],ISNULL(w.FRECADVANCERATE,100) [տ̯] +,(SELECT SUM(FBillAllAmount) FROM T_SAL_ORDERFIN FF WITH(NOLOCK) WHERE FF.FID = A.FID ) AS [ܶ],w.FRECADVANCEAMOUNT [տ̯],ISNULL(w.FRECADVANCERATE,100) [տ̯] ,ISNULL(O.FNAME,L.FNAME) AS [Ա],CONVERT(DECIMAL(18,2),ISNULL(n.FSHARERATE,100)) AS [̯] -,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBillAllAmount_LC )) [̯] +,CONVERT(DECIMAL(18,6),fin.FBillAllAmount*ISNULL(n.FSHARERATE,100)*0.01 ) [̯] ,ISNULL(ACO.,ACL.) AS [SBU] , ISNULL (ACO.[ϸ] , ACL.ϸ) AS [ϸ],c.FNAME AS [λ] ,ISNULL(K.FDATAVALUE,'') AS [˾] ,P.FDATAVALUE AS [ͻ],A.F_contractnumber AS [ֽʺͬ] , G.FNAME AS [Ŀ] ,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [ǩ],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS [] @@ -54,14 +54,14 @@ SELECT A.FID [ --WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'') ,[]=NULL - ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) + ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0) ,[Ʊ]=NULL --,[Ʊ]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T.Ʊ ELSE T.ûкɫĿƱ END ),'') --,[Ʊ]=T.Ʊ ,[ۼ˻]=ISNULL(( - SELECT SUM(B.FBillAllAmount_LC) AS 'ۼ˻' + SELECT SUM(B.FBillAllAmount) AS 'ۼ˻' FROM T_SAL_RETURNSTOCK AA WITH(NOLOCK) INNER JOIN T_SAL_RETURNSTOCKFIN B WITH(NOLOCK) ON AA.FID =B.FID WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID @@ -151,14 +151,15 @@ SELECT A.FID [ ,A.FSALEORGID AS '֯ID' ,W.F_DAY AS '' ,a.FBILLNO [۶] - ,[ܶ]=ISNULL((SELECT SUM(FAllAmount_LC) FROM T_SAL_ORDERENTRY_F aa WHERE aa.FID=a.FID AND aa.FAllAmount_LC>0),0) + ,[ܶ]=ISNULL((SELECT SUM(FAllAmount) FROM T_SAL_ORDERENTRY_F aa WHERE aa.FID=a.FID AND aa.FAllAmount>0),0) ,[տۼƺ]=w.F_MBBA_DECIMAL_UKY ,(SELECT ll.FNAME FROM dbo.T_BD_CURRENCY_L ll WITH(NOLOCK) where ll.FCURRENCYID=fin.FSettleCurrId ) AS [ұ] ,fin.FSettleCurrId [ұID] , fin.FExchangeRate [] , (0) [ͻö] ,Cccc.FNUMBER AS [ͻ] - + ,0 [ۼƵ(ԭ)],0 [Ӧտϼ(ԭ)] + ,ISNULL(a.F_expenses,0) [ӷ] -----------------from -------- FROM T_SAL_ORDER A WITH(NOLOCK) @@ -210,7 +211,7 @@ SELECT A.FID [ -- ) T ON T.F_PaperNumber = A.F_contractnumber AND T.FSALEORGID=a.FSALEORGID LEFT JOIN V_ASSISTANTDATA U WITH(NOLOCK) ON U.FENTRYID = A.F_Ordercategory LEFT JOIN - ( +( SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS 'Ʊܽ' FROM ( SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAXFOR @@ -232,7 +233,7 @@ GROUP BY F_PaperNumber, FSALEORGID -- (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 ) @@ -274,21 +275,21 @@ GROUP BY F_PaperNumber, FSALEORGID update [ZRP_YingShouMingXi_yuyubo] set [ܶ]=[ܶ]*[̯]*0.01 ,[ۼƷ]=[ۼƷ]*[̯]*0.01 -,[տۼƺ]=[տۼƺ]*[̯]*0.01 ,[ۼ˻]=[ۼ˻]*[̯]*0.01 ,[ۼƿƱ]=[ۼƿƱ]*[̯]*0.01 ,[ۼƵ]=[ۼƵ]*[̯]*0.01 ,[տ̯]=ISNULL([տ̯],100) +,[ӷ]=[ӷ]*[̯]*0.01*ISNULL([տ̯],100)*0.01 --UPDATE [ZRP_YingShouMingXi_yuyubo] set [̯]=[ܶ]; UPDATE [ZRP_YingShouMingXi_yuyubo] set -[Ӧտϼ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS(([ۼ˻]+[ۼƵ])*[̯]*0.01) ELSE 0 end -,[δܶ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS([ۼƷ]*[̯]*0.01)ELSE 0 end +[Ӧտϼ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS(([ۼ˻]+[ۼƵ])*[̯]*0.01) +[ӷ] ELSE 0 end +,[δܶ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS([ۼƷ]*[̯]*0.01) ELSE 0 end --,[ʱ]='2022-01-01' --,[ʱ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN [ԤƵʱ] ELSE NULL END --,[ڽ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01*ISNULL([տ̯],100)*0.01 ELSE 0 END -,[ʵѳӦտϼ]=CASE WHEN [ܶ] >0 THEN ([ۼƷ]-[ۼ˻]- [ۼƵ] )*[̯]*0.01 ELSE 0 end +,[ʵѳӦտϼ]=CASE WHEN [ܶ] >0 THEN ([ۼƷ]-[ۼ˻]- [ۼƵ] )*[̯]*0.01 ELSE 0 end ,[տ]=CASE WHEN []>12 THEN 'תӦרС' ELSE [Ա] END ,[Ŀ׶]= CASE WHEN [Ŀʱ]>='1990-01-01' AND [Ŀʱ] IS NOT NULL THEN '' @@ -301,7 +302,7 @@ WHEN ISNULL( [ update [ZRP_YingShouMingXi_yuyubo] set [ʱ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN [ԤƵʱ] ELSE NULL END ,[ڽ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 - THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END; + THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01+[ӷ] ELSE 0 END; --WHERE [۵ID]=110181; @@ -318,18 +319,29 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET THEN '1-2' WHEN []>=25 AND []<=36 THEN '2-3' WHEN []>=37 AND []<=48 THEN '3-4' WHEN []>=49 THEN '5' ELSE '' END --,[]=CASE WHEN []>=1 AND []<=6 THEN '' WHEN []>=7 AND []<=12 THEN '߿' WHEN []>=13 AND []<=18 --THEN 'ʦ' WHEN []>=19 THEN '' ELSE '' END - ,[1-6]=CASE WHEN []>=1 AND []<=6 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END - ,[7-12]=CASE WHEN []>=7 AND []<=12 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END - ,[1-2]=CASE WHEN []>=13 AND []<=24 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END - ,[2-3]=CASE WHEN []>=25 AND []<=36 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END - ,[4-5]=CASE WHEN []>=37 AND []<=60 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END - ,[5]=CASE WHEN []> 60 THEN (([ܶ]-[ۼ˻])*[տ̯]*0.01 -[տۼƺ])*[̯]*0.01 ELSE 0 END + ,[1-6]=CASE WHEN []>=1 AND []<=6 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] ELSE 0 END + ,[7-12]=CASE WHEN []>=7 AND []<=12 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] ELSE 0 END + ,[1-2]=CASE WHEN []>=13 AND []<=24 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01+[ӷ] ELSE 0 END + ,[2-3]=CASE WHEN []>=25 AND []<=36 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] ELSE 0 END + ,[4-5]=CASE WHEN []>=37 AND []<=60 THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] ELSE 0 END + ,[5]=CASE WHEN []> 60 THEN (([ܶ]-[ۼ˻])*[տ̯]*0.01 -[տۼƺ])*[̯]*0.01 +[ӷ] ELSE 0 END update [ZRP_YingShouMingXi_yuyubo] SET [ԤƵʱ]=CASE WHEN [ԤƵʱ] > '1990-01-01' AND [ԤƵʱ] >GETDATE() THEN [ԤƵʱ] ELSE NULL END ,[δڽ]=CASE WHEN (([ԤƵʱ] <'1990-01-01'OR ([ԤƵʱ] IS NULL AND [ʱ] IS null)) OR [ԤƵʱ] > GETDATE()) AND [ܶ]>0 - THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 ELSE 0 END + THEN ([ܶ]-[ۼ˻])*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] ELSE 0 END ,[Ƿת]=CASE WHEN [] > 12 THEN '' ELSE '' END ; + + --, fin.FExchangeRate [] + -- , (0) [ͻö] + -- ,Cccc.FNUMBER AS [ͻ] + -- ,0 [ۼƵ(ԭ)],0 [Ӧտϼ(ԭ)] [ܶ(ԭ)] + -- ,ISNULL(a.F_expenses,0) [ӷ] + update [ZRP_YingShouMingXi_yuyubo] SET [ۼƵ(ԭ)]=[ۼƵ],[Ӧտϼ(ԭ)]=[Ӧտϼ], [ܶ(ԭ)]= [ܶ],[ۼ˻(ԭ)]=[ۼ˻]; + + update [ZRP_YingShouMingXi_yuyubo] SET [ۼƵ]=[ۼƵ]*[],[Ӧտϼ]=[Ӧտϼ]*[], [ܶ]= [ܶ]*[] + ,ۼƷ=ۼƷ*[],[ۼ˻]=[ۼ˻]*[] ; + -- 1.ֶΡǷ񼯲ĿΪ󡱡̵ءʱ򡰿ͻáȡǷĿֶΡ಻ --2.ֶΡλΪ --ͨ㶫ҵ޹˾ @@ -387,7 +399,7 @@ WHERE bb.FNUMBER=[ drop table ReceivablesDetailsTableBack; end - SELECT [۵ID],[ԱID],[տID],[F_061],[F_054],[F_055],[F_056],[F_060],[F_057],[F_058] + SELECT [۵ID],[ԱID],[տID],[F_061],[F_054],[F_055],[F_056],[F_060],[F_057],[F_058] ,[F_048] INTO ReceivablesDetailsTableBack FROM ReceivablesDetailsTable WHERE ISNULL([F_061],'')!='' OR ISNULL([F_054],'')!='' OR ISNULL([F_055],0)!=0 OR ISNULL([F_056],'')!=''OR ISNULL([F_060],'')!='' @@ -400,7 +412,15 @@ WHERE bb.FNUMBER=[ ( [F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020] ,[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040], [F_041],[F_042] ,[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_059],[F_000] ,[F_062],[F_063],[۵ID],[ԱID],[տID],[EditTime],[IfManualEdit] - ,[F_064],[F_065],[F_066],[F_067],[F_068]) + ,[F_064],[F_065],[F_066],[F_067],[F_068] ,[BiBie] + ,[HuiLv] + ,[DingDanZongE_YuanBi] + ,[ZeRenRen] + ,[XinYongEDu] + ,[ͻ] + ,[DaoKuanJinE_YuanBi] + ,[YingShouHeJi_YuanBi] + ,[YunZaFei],[LeiJiTuiHuoJinE_YuanBi]) SELECT [۵ID],[Ա],[SBU],[ϸ],[λ],[˾],[ͻ] ,[ֽʺͬ],[Ŀ],[ܶ],[ǩ],CONVERT(NVARCHAR(20),[],23),[տ] ,[2] @@ -413,9 +433,10 @@ WHERE bb.FNUMBER=[ ,[ڽ],[տ],[Ŀ׶],[Ŀ],[Ŀʱ],[Ŀʱ],[ʱ],CONVERT(NVARCHAR(20),[ʱʱ],23),[Ƿǰ],[],[-׶],[1-6],[7-12],[13-18],[19] ,[1],[],[],[],CONVERT(NVARCHAR(20),[תרСʱ],23),[Ƿת],[Ƿ黹],[],[÷],[ȡֵ],[Ƿ],[ǷԤ] ,[ͬ] ,[֯ID],[Ƿ񼯲Ŀ],[] - ,[۵ID],[ԱID],[տID],GETDATE(),0,[1-2],[2-3],[3-4],[4-5],[5] + ,[۵ID],[ԱID],[տID],GETDATE(),0,[1-2],[2-3],[3-4],[4-5],[5],[ұ],[],[ܶ(ԭ)],[],[ͻö] ,[ͻ] + ,[ۼƵ(ԭ)],[Ӧտϼ(ԭ)],A.ӷ,[ۼ˻(ԭ)] FROM [ZRP_YingShouMingXi_yuyubo] A - WHERE ([ܶ]-[ۼ˻])>[ۼƵ] + WHERE ([ܶ]-[ۼ˻(ԭ)])>[ۼƵ(ԭ)] ORDER BY A.[۵ID],[ԱID],[տID]; update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056 @@ -439,3 +460,14 @@ GO --SELECT TOP 10 * FROM ReceivablesDetailsTable + --SELECT a.FID,b.FID,a.F_AMOUNT,b.F_MBBA_DECIMAL_UKY FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERPLAN b + --ON a.FID=b.FID WHERE a.F_AMOUNT 0) cc ON [۵ID]=a.FID WHERE (ISNULL(a.F_Amount,0) > 0 AND [ܶ]-ISNULL(a.F_Amount,0) -[ۼ˻]>0) AND (a.FID=@saleOrderId OR @saleOrderId=0) @@ -25,8 +25,8 @@ ORDER BY a.fid,wfid OPEN cursor_name; DECLARE @rowId INT=0,@amount DECIMAL(18,4)=0 -- 3. ѭȡ -DECLARE @F_AMOUNT DECIMAL(18,2), @F_MBBA_Decimal_uky DECIMAL(18,2),@FBILLNO NVARCHAR(200),@FSALEORGID INT ,@F_contractnumber NVARCHAR(500) ,@fid INT ,@wfid INT,@FRecAdvanceAmount DECIMAL(18,2); -FETCH NEXT FROM cursor_name INTO @F_AMOUNT, @F_MBBA_Decimal_uky,@FBILLNO,@FSALEORGID,@F_contractnumber,@fid,@wfid,@FRecAdvanceAmount; +DECLARE @F_AMOUNT DECIMAL(18,2), @F_MBBA_Decimal_uky DECIMAL(18,2),@FBILLNO NVARCHAR(200),@FSALEORGID INT ,@F_contractnumber NVARCHAR(500) ,@fid INT ,@wfid INT,@FRecAdvanceAmount DECIMAL(18,2),@F_EXPENSES DECIMAL(18,6) ; +FETCH NEXT FROM cursor_name INTO @F_AMOUNT, @F_MBBA_Decimal_uky,@FBILLNO,@FSALEORGID,@F_contractnumber,@fid,@wfid,@FRecAdvanceAmount,@F_EXPENSES; WHILE @@FETCH_STATUS = 0 BEGIN @@ -35,7 +35,7 @@ BEGIN -- տ IF(@rowId !=@fid) BEGIN - SELECT @rowId=@fid,@amount=@F_AMOUNT; + SELECT @rowId=@fid,@amount=@F_AMOUNT-@F_EXPENSES; END IF(@amount>=@FRecAdvanceAmount) @@ -55,7 +55,7 @@ BEGIN END -- ȡһ¼ - FETCH NEXT FROM cursor_name INTO @F_AMOUNT, @F_MBBA_Decimal_uky,@FBILLNO,@FSALEORGID,@F_contractnumber,@fid,@wfid,@FRecAdvanceAmount; + FETCH NEXT FROM cursor_name INTO @F_AMOUNT, @F_MBBA_Decimal_uky,@FBILLNO,@FSALEORGID,@F_contractnumber,@fid,@wfid,@FRecAdvanceAmount,@F_EXPENSES; END; -- 4. رα diff --git a/销售单核销历史收款记录20250423.sql b/销售单核销历史收款记录20250423.sql new file mode 100644 index 0000000..324db4e --- /dev/null +++ b/销售单核销历史收款记录20250423.sql @@ -0,0 +1,15 @@ +SELECT F_OrderNo,* FROM VRYF_t_Cust_Entry100021 +WHERE fid=100011 +--WHERE F_OrderNo LIKE '%%' + + +--SELECT * FROM VRYF_t_Cust100013 + +--SELECT * INTO T_SAL_ORDER_back202504231951 FROM T_SAL_ORDER +BEGIN TRAN +UPDATE T_SAL_ORDER SET F_Amount=bb.F_Amount +FROM ( +SELECT a.fid,a.F_Amount AS dddd,b.F_Amount FROM dbo.T_SAL_ORDER a +INNER JOIN VRYF_t_Cust_Entry100021 b ON a.F_contractnumber=b.F_ORDERNO +WHERE a.F_SALEORGID=100302 AND ISNULL(a.F_Amount,0)=0 AND b.fid=100011 AND b.F_Amount<>0) bb +WHERE T_SAL_ORDER.F_SALEORGID=100302 AND ISNULL(T_SAL_ORDER.F_Amount,0)=0 \ No newline at end of file