Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm

非C#代码文件/收款单核销流水存储过程.sql

@@ -37,14 +37,14 @@ ORDER BY FDATE
 	   SELECT @fid2=0,@fid3=0;
 	   SELECT @fid2=FID FROM dbo.T_AutoWrireRecordEntry2  WHERE FBILLNO3=@FBILLNO
 	   IF(@fid2>0)
-	   begin
+	   BEGIN
 		SELECT @FDATE=ISNULL(F_YeWuDate,FCREATEDATE),@fid3=FID  FROM  T_AutoWrireRecord  
 		WHERE FID=@fid2 AND  FDOCUMENTSTATUS='C'  
 		IF(@fid3>0)
 		BEGIN   
 		  SELECT @hexiao=1;
 		  IF((SELECT COUNT(1) FROM T_AutoWrireRecordEntry2 WHERE fid=@fid2)<2)
-		  begin
+		  BEGIN
 			INSERT INTO [dbo].[ZZZ_HeXiaoBook]
 			([XiaoShouFid]
 			,[XiaoShouBillNo]
@@ -140,16 +140,20 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 			   ,[ShouKuanFDate]
 			   ,[BenCiHeXiao]
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
-			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',@fid3
+			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',@fid3
 			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0  ,@remark
 			   FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID			 
 				 LEFT JOIN
-				 (SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM  T_AR_receivable c 
+				 (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT SUM(FALLAMOUNTFOR) FROM T_AR_RECEIVABLEENTRY akk 
+				 where akk.FID=ak.FID)				 
+				 FALLAMOUNTFOR_D
+				 
+				 FROM  T_AR_receivable c 
 				 LEFT JOIN T_AR_RECEIVABLEENTRY ak ON  c.FID=ak.FID
-				 GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID
+				 GROUP BY c.FSALEORGID,ak.FORDERNUMBER ,c.FID,ak.FID
 				 ) c
-				 ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID
+				 ON c.FORDERNUMBER=a.FBILLNO AND c.FSALEORGID=a.FSALEORGID
 				 LEFT JOIN #temp2 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable'
 			     WHERE a.FSALEORGID=@FSALEORGID  AND d.FBILLFORMID='AR_receivable')
 	END
@@ -274,7 +278,7 @@ WHERE a.FMATCHMETHODID=30
   LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID 
   WHERE FBILLFORMID='AR_RECEIVEBILL' 
   )
-ORDER BY a.FVERIFYSEQ
+ORDER BY a.FVERIFYSEQ;
 
              INSERT INTO [dbo].[ZZZ_HeXiaoBook]
 			   ([XiaoShouFid]
@@ -286,16 +290,18 @@ ORDER BY a.FVERIFYSEQ
 			   ,[BenCiHeXiao]
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
 			   ( 
-			   SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,0,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,a.FSALEORGID,'<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>տ',FVERIFYSEQ
+			   SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,0,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,a.FSALEORGID,'<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>տ',FVERIFYSEQ
 			   ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,1  ,''
 			   FROM T_SAL_ORDER a
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID			 
 				 INNER JOIN
-				 (SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM  T_AR_receivable c 
+				 (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT SUM(FALLAMOUNTFOR) FROM T_AR_RECEIVABLEENTRY akk 
+				 where akk.FID=ak.FID)	 FALLAMOUNTFOR_D
+				 FROM  T_AR_receivable c 
 				 LEFT JOIN T_AR_RECEIVABLEENTRY ak ON  c.FID=ak.FID
-				 GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID
+				 GROUP BY c.FSALEORGID,ak.FORDERNUMBER ,c.FID,ak.FID
 				 ) c
-				 ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID
+				 ON c.FORDERNUMBER=a.FBILLNO AND c.FSALEORGID=a.FSALEORGID
 				 INNER JOIN #temp222 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable'
 			     WHERE   d.FBILLFORMID='AR_receivable'  AND a.FDOCUMENTSTATUS='C'
 				 )

非C#代码文件/特价明细表SQL22.sql

@@ -559,6 +559,9 @@ FROM #PLChongDianZhuangHeTong ;
     ) H7
         ON B.FENTRYID = H7.FSID   AND   1=1   ;
 
+
+
+
 UPDATE  #tempDaBiao SET TotalSpread=TotalSpread-b.TotalSpreadYiBiao,CurrentSettledUpset2=CurrentSettledUpset2-b.TotalSpreadYiBiao
 FROM (SELECT SUM(a.CurrentSettledUpset1*a.Quantity) AS TotalSpreadYiBiao,a.AFBILLNO FROM #tempDaBiao a
 WHERE TableName='#XNChongDianZhuangHeTong'