11

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

@@ -43,6 +43,8 @@ ORDER BY FDATE
 		IF(@fid3>0)
 		BEGIN   
 		  SELECT @hexiao=1;
+		  IF((SELECT COUNT(1) FROM T_AutoWrireRecordEntry2 WHERE fid=@fid2)<2)
+		  begin
 			INSERT INTO [dbo].[ZZZ_HeXiaoBook]
 			([XiaoShouFid]
 			,[XiaoShouBillNo]
@@ -63,6 +65,29 @@ ORDER BY FDATE
 		    LEFT JOIN T_AutoWrireRecord head ON b.FID=head.FID
 			WHERE b.FID=@fid2   AND c.FBILLNO3=@FBILLNO  )
 		END
+        ELSE
+		BEGIN
+			INSERT INTO [dbo].[ZZZ_HeXiaoBook]
+				([XiaoShouFid]
+				,[XiaoShouBillNo]
+				,[XiaoShouHeTong]
+				,[ShouKuanFid]
+				,[ShouKuanBillNo]
+				,[ShouKuanFDate]
+				,[BenCiHeXiao]
+				,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
+				( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE
+				,c.FALLAMOUNT33
+				,@FSALEORGID,'<EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',@fid2,dd.FExchangeRate,FSettleCurrId,FLocalCurrId,0
+				,head.F_NOTE
+				FROM T_SAL_ORDER a
+				LEFT JOIN T_AutoWrireRecordEntry  b ON a.FBILLNO=b.FBILLNO2
+				LEFT JOIN T_AutoWrireRecordEntry2 c  ON b.FID=c.FID
+				LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
+				LEFT JOIN T_AutoWrireRecord head ON b.FID=head.FID
+				WHERE b.FID=@fid2   AND c.FBILLNO3=@FBILLNO  )
+        END
+		END
 		end
 	   ------<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֪ͨ<EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>--------------
 	     SELECT @fid2=0,@fid3=0,@F_contractnumber='',@amount=0;
@@ -190,9 +215,9 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE  b.FSRCBILLNO=@FBILLN
 			   ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
 			   ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'<EFBFBD><EFBFBD>ʷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0   ,@remark
 			   FROM T_SAL_ORDER a
-			    LEFT JOIN VRYF_t_Cust_Entry100021 c ON a.F_CONTRACTNUMBER=c.F_ORDERNO 
+			    RIGHT JOIN VRYF_t_Cust_Entry100021 c ON a.F_CONTRACTNUMBER=c.F_ORDERNO 
 			     LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
-			     WHERE a.FSALEORGID=@FSALEORGID  AND c.F_Receiptnumber=@FBILLNO )
+			     WHERE (a.FSALEORGID=100302  OR a.fid IS NULL )  AND c.F_Receiptnumber=@FBILLNO )
 	   END
 
 	   -- <20><>ȡ<EFBFBD><C8A1>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>¼