Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom

DDWFHMX.cs

@@ -73,6 +73,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH
             header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal);
             header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal);
             header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal);
+            header.AddChild("整单价税合计", new LocaleValue("整单价税合计"), SqlStorageType.SqlDecimal);
             header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal);
             header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal);
             header.AddChild("未发货数量", new LocaleValue("未发货数量"), SqlStorageType.SqlDecimal);

HKBaoBiao/回款报表服务器插件.py

@@ -123,18 +123,18 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
 
 	if customFiler["F_SDate"] != None and customFiler["F_SDate"].ToString() != "":
 		if RQLX == "1":
-			SKRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
+			HXRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
 			strFilter += " AND (ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> >= '{0}' OR ISNULL(ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_SDate"].ToString("yyyy-MM-dd")))
 		if RQLX == "2":
 			strFilter += " AND (<28><><EFBFBD><EFBFBD> >= '{0}' OR ISNULL(<28><><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_SDate"].ToString("yyyy-MM-dd")))
-			HXRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
+			SKRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
 	if customFiler["F_EDate"] != None and customFiler["F_EDate"].ToString() != "":
 		if RQLX == "1":
 			strFilter += " AND (ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <= '{0}' OR ISNULL(ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_EDate"].ToString("yyyy-MM-dd")))
-			SKRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
+			HXRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
 		if RQLX == "2":
 			strFilter += " AND (<28><><EFBFBD><EFBFBD> <= '{0}' OR ISNULL(<28><><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_EDate"].ToString("yyyy-MM-dd")))
-			HXRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
+			SKRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
 	if customFiler["F_contractnumber"] != None and customFiler["F_contractnumber"].ToString() != "":
 		strFilter += " AND <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '{0}'".format(str(customFiler["F_contractnumber"].ToString()))
 	if customFiler["F_Currency"] != None and customFiler["F_Currency"].ToString() != "":
@@ -162,7 +162,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
 	WHERE T1.FID IN (SELECT XiaoShouFid FROM ZZZ_HeXiaoBook)
 	AND T1.FDOCUMENTSTATUS = 'C'
 	--AND (T1.FSALEORGID = {4} OR {4} = 0)
-	--AND (T1.FCUSTID = {5} OR {5} = 0)
+	AND (T1.FCUSTID = {5} OR {5} = 0)
 
 	/*ץȡ<D7A5>տ<D5BF><EEB5A5>Ӧ<EFBFBD><D3A6>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
 	SELECT T1.FID,FORMAT(T1.FDATE,'yyyy-MM-dd')  AS '<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',T1.FRECAMOUNT AS '<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
@@ -274,7 +274,8 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
 	,T1.Remark AS '<EFBFBD><EFBFBD>ע'
 	,T1.ZhangLing AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
 	,CAST('' AS VARCHAR(500)) AS '<EFBFBD>ұ<EFBFBD>'
-	,CASE T1.ShouKuanType WHEN 1 THEN 3 WHEN 2 THEN 4 END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
+	--,CASE T1.ShouKuanType WHEN 1 THEN 3 WHEN 2 THEN 4 END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
+	,3 '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
 	FROM ZZZ_HeXiaoBook T1
 	INNER JOIN #TEMP1 T2 ON T1.XiaoShouFid = T2.FID
 	WHERE T1.ShouKuanType IN (1,2)
@@ -345,6 +346,10 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
 	FROM  (SELECT DISTINCT ACO22.<2E><><EFBFBD><EFBFBD>,ACO22.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,ACO22.<2E><><EFBFBD><EFBFBD> FROM  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b 
 	WHERE <20><><EFBFBD><EFBFBD>Ա=b.<2E><><EFBFBD><EFBFBD>
 
+	/*<2A><><EFBFBD><EFBFBD>Ա'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'ʱ<EFBFBD><EFBFBD>SBU<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'*/
+	UPDATE #TEMP3 SET SBU=<3D><><EFBFBD><EFBFBD>Ա,[<5B><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>]=<3D><><EFBFBD><EFBFBD>Ա 
+	WHERE <20><><EFBFBD><EFBFBD>Ա='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
+
 	/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>β<EFBFBD><CEB2>*/
 	UPDATE T1 SET <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> = ISNULL(T1.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)+(ISNULL(T1.<2E><><EFBFBD><EFBFBD>,0)-ISNULL(T2.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) FROM #TEMP3 T1
 	INNER JOIN(SELECT ShouKuanFid,SUM(ISNULL(<28><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> FROM #TEMP3 GROUP BY ShouKuanFid) T2 ON T1.ShouKuanFid = T2.ShouKuanFid

YSZKDZBaoBiao/AccountsReceivableReport.cs

@@ -156,10 +156,11 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             ", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH,SFQJFWDZ);
 
             sql += string.Format(@"
-            INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount,    
+            INSERT INTO YingShouZhanKuanJY_GZTH(FID,Number,OrderAmount,ShipmentsAmount,FBillAllAmount,    
             FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets
             ,[K3发货数量],[K3发货金额],[K3退货数量],[K3退货金额],[星空发货数量],[星空发货金额],[星空退货数量],[星空退货金额],PPFALLAmountFor,ZPFALLAmountFor,[K3专票金额],[K3普票金额])      
             Select
+            999998,
             '合计',      
             SUM(OrderAmount) as OrderAmount,      
             SUM(ShipmentsAmount) as ShipmentsAmount,      
@@ -244,7 +245,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
                 {
                     fState = "未完结订单";
                 }
-
+                //是否月结客户
+                var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString();
                 //这里是报表页面的标识
                 reportTitles.AddTitle("FState", fGROUP == null ? "" : fState);
                 reportTitles.AddTitle("FClient", fClientList == null ? "" : fClientList);
@@ -253,6 +255,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
                 reportTitles.AddTitle("FProject", fProjectList == null ? "" : string.Join(",", fProjectList));
                 reportTitles.AddTitle("F_ZZHTH", ZZHTH == null ? "" : ZZHTH);
                 reportTitles.AddTitle("F_XSY", XSYFID == null ? "" : XSYFID);
+                reportTitles.AddTitle("F_SFYJKH", SFQJFWDZ == null ? "" : SFQJFWDZ);
             }
             return reportTitles;
         }

YSZKDZBaoBiao/AccountsReceivableReport2.cs

@@ -90,9 +90,9 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             header.AddChild("星空退货金额", new LocaleValue("星空退货金额"), SqlStorageType.SqlDecimal);
             header.AddChild("ReturnNum", new LocaleValue("总退货数量"), SqlStorageType.SqlInt);
             header.AddChild("ReturnAmount", new LocaleValue("总退货金额"), SqlStorageType.SqlDecimal);
-            header.AddChild("PPBillingDate", new LocaleValue("星空普票开票日期"), SqlStorageType.Sqlvarchar);
+            header.AddChild("PPBillingDate", new LocaleValue("普票开票日期"), SqlStorageType.Sqlvarchar);
             header.AddChild("PPBillingAmount", new LocaleValue("星空普票开票金额"), SqlStorageType.SqlDecimal);
-            header.AddChild("ZPBillingDate", new LocaleValue("星空专票开票日期"), SqlStorageType.Sqlvarchar);
+            header.AddChild("ZPBillingDate", new LocaleValue("专票开票日期"), SqlStorageType.Sqlvarchar);
             header.AddChild("ZPBillingAmount", new LocaleValue("星空专票开票金额"), SqlStorageType.SqlDecimal);
             header.AddChild("BillingAmount", new LocaleValue("总开票金额"), SqlStorageType.SqlDecimal);
             header.AddChild("PaymentDate", new LocaleValue("回款日期"), SqlStorageType.Sqlvarchar);
@@ -164,10 +164,11 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
           
             ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH,SFQJFWDZ);
             sql += string.Format($@"/*dialect*/
-                    INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,    
+                    INSERT INTO YingShouZhanKuanMX_GZTH(FID,NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,    
          ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额]
             ,[K3发货数量],[K3发货金额],[星空发货数量],[K3退货数量],[星空退货数量],[K3专票金额],[K3普票金额])    
          SELECT
+         999998,
          '合计',    
          SUM(FQTY),       
          SUM(FALLAMOUNT),    
@@ -212,7 +213,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
             {
                 sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')");
             }
-            Logger.Error("sql脚本", sql, new Exception());
+            //Logger.Error("sql脚本", sql, new Exception());
             DBUtils.Execute(this.Context, sql);
         }
 

YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs

@@ -57,6 +57,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
                 string fDate = rptTitles.FirstOrDefault(a => a.TitleKey == "FDate").TitleValue.ToString();
                 string fProject = rptTitles.FirstOrDefault(a => a.TitleKey == "FProject").TitleValue.ToString();
                 string FState = rptTitles.FirstOrDefault(a => a.TitleKey == "FState").TitleValue.ToString();
+                string F_SFYJKH = rptTitles.FirstOrDefault(a => a.TitleKey == "F_SFYJKH").TitleValue.ToString();
                 //单据体
                 var list = reportModel.DataSource.Rows;
 
@@ -74,14 +75,14 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
                     fDate2 = sqlTestList[0]["Date"].ToString().Split(' ')[0];
                 }
 
-                Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, Context);
+                Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, F_SFYJKH, Context);
             }
         }
 
         /// <summary>
         /// 赋值EXCEL
         /// </summary>
-        static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount,string fDate2,Kingdee.BOS.Context Context)
+        static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount,string fDate2,string F_SFYJKH, Kingdee.BOS.Context Context)
         {
             #region Excel代码
 
@@ -206,7 +207,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
             cell.SetCellValue("尊敬的 " + fClient + " 客户您好，我公司已根据合同/订单的要求向贵公司交付相关产品并请验收确认，鉴于我公司对贵公司已通知发货部分的交付义务已完成，");
             cell2.SetCellValue(fClient);
             var fAmountZW = ToChineseNumber(fAmount, Context);
-            if (Num > 0)
+            if (Num > 0 && F_SFYJKH == "2")
             {
                 cel3.SetCellValue("其中上期（截止" + fDate2 + "共欠我公司货款金额为：" + fAmount + "元（大写："+ fAmountZW + "）");
             }
@@ -241,6 +242,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
                 string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : list[i]["ZPBillingDate"].ToString().Split(' ')[0];
                 string ReturnDate = string.IsNullOrWhiteSpace(list[i]["ReturnDate"].ToString()) ? "" : list[i]["ReturnDate"].ToString().Split(' ')[0];
 
+                BillingDate += string.IsNullOrWhiteSpace(list[i]["PPBillingDate"].ToString()) ? "" : (string.IsNullOrWhiteSpace(BillingDate) ?"":",")+list[i]["PPBillingDate"].ToString().Split(' ')[0];
+
                 //将合计行放到最下方
                 IRow rowi = sheet.CreateRow(j + i);
                 if (list[i]["Number"].ToString() == "合计")
@@ -351,10 +354,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
                 n++;
 
                 //根据订单号分组合并单元格
-                if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-2)
+                if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-3)
                 {
-                    int k = (i == list.Count - 2) ? 0 : 1;
+                    int k = (i == list.Count - 3 && list[i]["CONTRACTNUMBER"].ToString() == GroupCONTRACTNUMBER) ? 0 : 1;
-                    if (GroupCount > 1)
+                    if (GroupCount > 1 || k == 0)
                     {
                         // 创建CellRangeAddress对象
                         CellRangeAddress cellRangeAddress = new CellRangeAddress(GroupIndex, j + i - k, 1, 1);

派诺报表SQL文件/业绩排行榜插入数据SQL.sql

@@ -21,25 +21,28 @@ SET @Year = YEAR(@FSDate) - 1;
 -- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>    
 SET @SixYearsAgoYear = @Year - 6;    
     
--- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>洢<EFBFBD><E6B4A2><EFBFBD>ֺ<EFBFBD><D6BA><EFBFBD>ֵ    
+---- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>洢<EFBFBD><E6B4A2><EFBFBD>ֺ<EFBFBD><D6BA><EFBFBD>ֵ    
-    DECLARE @SalesID NVARCHAR(50);    
+--    DECLARE @SalesID NVARCHAR(50);    
-    DECLARE @Pos INT;    
+--    DECLARE @Pos INT;    
-    DECLARE @FSaleOrgId1 NVARCHAR(50);    
+--    DECLARE @FSaleOrgId1 NVARCHAR(50);    
     
-    -- <20><>ʼ<EFBFBD><CABC>    
+--    -- <20><>ʼ<EFBFBD><CABC>    
-    SET @FSaleOrgId1 = LTRIM(RTRIM(@FSaleOrgId)) + ',';    
+--    SET @FSaleOrgId1 = LTRIM(RTRIM(@FSaleOrgId)) + ',';    
-    SET @Pos = CHARINDEX(',', @FSaleOrgId1);    
+--    SET @Pos = CHARINDEX(',', @FSaleOrgId1);    
     
-    TRUNCATE TABLE SalesIDTable    
+--    TRUNCATE TABLE SalesIDTable    
-    -- ѭ<><D1AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>    
+--    -- ѭ<><D1AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>    
-    WHILE @Pos > 0    
+--    WHILE @Pos > 0    
-    BEGIN    
+--    BEGIN    
-        SET @SalesID = SUBSTRING(@FSaleOrgId1, 1, @Pos - 1);    
+--        SET @SalesID = SUBSTRING(@FSaleOrgId1, 1, @Pos - 1);    
-        INSERT INTO SalesIDTable (SalesID) VALUES (@SalesID);    
+--        INSERT INTO SalesIDTable (SalesID) VALUES (@SalesID);    
-        SET @FSaleOrgId1 = SUBSTRING(@FSaleOrgId1, @Pos + 1, LEN(@FSaleOrgId1));    
+--        SET @FSaleOrgId1 = SUBSTRING(@FSaleOrgId1, @Pos + 1, LEN(@FSaleOrgId1));    
-        SET @Pos = CHARINDEX(',', @FSaleOrgId1);    
+--        SET @Pos = CHARINDEX(',', @FSaleOrgId1);    
-    END    
+--    END
     
+    SElECT FID AS 'SalesID'
+	INTO #SalesIDTable
+	FROM fn_StrSplit(@FSaleOrgId,',')
     
 --<EFBFBD><EFBFBD><EFBFBD>ձ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>    
 TRUNCATE TABLE YJPHB_GZTH    
@@ -66,8 +69,8 @@ TRUNCATE TABLE YJPHB_GZTH
  OR L.FNAME = '<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>'  
  OR A.FID IN (110185,207800) 
  OR D.F_correlation = 1)      
- AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') > @FSDate)                                      
+ --AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') > @FSDate)                                      
- AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd')< @FEDate)      
+ --AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd')< @FEDate)      
     
  --<EFBFBD><EFBFBD>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>    
  SELECT            
@@ -91,7 +94,7 @@ TRUNCATE TABLE YJPHB_GZTH
  LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=L.FNAME AND ISNULL(ACL.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''                                                                                                        
  WHERE 1=1 
  AND A.FID NOT IN(SELECT FID FROM  #TEMP3)    
- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))    
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))    
  AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy') >= @SixYearsAgoYear)                                            
  AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy') <= @Year)                                      
  AND A.FDocumentStatus = 'C'                     
@@ -120,7 +123,7 @@ TRUNCATE TABLE YJPHB_GZTH
 -- LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<2E><><EFBFBD><EFBFBD>=L.FNAME AND ISNULL(ACL.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,'') != ''                                                                                                        
 -- WHERE 1=1 
 -- AND A.FID NOT IN(SELECT FID FROM  #TEMP3)          
--- AND(@FSaleOrgId = '' Or A.FSALEORGID IN(SELECT SalesID FROM SalesIDTable))    
+-- AND(@FSaleOrgId = '' Or A.FSALEORGID IN(SELECT SalesID FROM #SalesIDTable))    
 -- AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') >= @FSDate)                                            
 -- AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') < @FEDate)                                      
 -- AND A.FDocumentStatus = 'C'                     
@@ -151,7 +154,7 @@ TRUNCATE TABLE YJPHB_GZTH
 -- INNER JOIN T_SEC_USER TU ON A.FChangerId = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>             
 -- WHERE 1=1                
 -- AND A.FID NOT IN(SELECT FID FROM  #TEMP3)       
--- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))    
+-- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))    
 -- AND (ISNULL(@FSDate,'') = '' OR FORMAT(A.FCHANGEDATE,'yyyy-MM-dd') >= @FSDate) 
 -- AND (ISNULL(@FSDate,'') = '' OR FORMAT(A.FCHANGEDATE,'yyyy-MM-dd') < @FEDate)                                                                                                
 -- --AND FORMAT(A.FDATE,'yyyy') != FORMAT(A.FCHANGEDATE,'yyyy')                        
@@ -163,14 +166,14 @@ TRUNCATE TABLE YJPHB_GZTH
  
 /*ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
  SELECT ROW_NUMBER() OVER(PARTITION BY FPKIDX ORDER BY AL.FCHANGEDATE DESC) AS 'rn',
- AL.FID
+ AL.FPKIDX,AL.FID
  INTO #TEMP5
  FROM T_SAL_XORDER AL
  INNER JOIN T_SAL_ORDER A  ON A.FID = AL.FPKIDX          
  INNER JOIN T_SEC_USER TU ON AL.FCHANGERID = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>   
  WHERE 1=1                
  AND A.FID NOT IN(SELECT FID FROM  #TEMP3)       
- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))    
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))    
  AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') >= @FSDate) 
  AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') < @FEDate)
  AND (ISNULL(@FSDate,'') = '' OR FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') >=  FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01'))                  
@@ -182,6 +185,37 @@ TRUNCATE TABLE YJPHB_GZTH
 
  DELETE FROM #TEMP5 WHERE rn > 1 
 
+  /*<EFBFBD><EFBFBD><EFBFBD>ڽ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
+ SELECT ROW_NUMBER() OVER(PARTITION BY AL.FPKIDX ORDER BY AL.FCHANGEDATE ASC) AS 'rn',
+ AL.FPKIDX,AL.FID,
+ SUM(CAST((
+ ROUND((AM.FQTY * AB.FTAXPRICE - (ISNULL(AM.FQTY,0) * ISNULL(AB.FTAXPRICE,0) * ISNULL(AB.FDISCOUNTRATE,0))/ 100*ISNULL(AN.FEXCHANGERATE,0))/( 1+ FTAXRATE /100 ),2) 
+ +ROUND(((ISNULL(AM.FQTY,0) * ISNULL(AB.FTAXPRICE,0) - (ISNULL(AM.FQTY,0) * ISNULL(AB.FTAXPRICE,0) * ISNULL(AB.FDISCOUNTRATE,0)/ 100))/( 1+ FTAXRATE /100 )* (FTAXRATE /100)* ISNULL(AN.FEXCHANGERATE,0) ),2)
+ -ROUND((AM.FQTYX * AB.FTAXPRICEX - (ISNULL(AM.FQTYX,0) * ISNULL(AB.FTAXPRICEX,0) * ISNULL(AB.FDISCOUNTRATEX,0))/ 100*ISNULL(AN.FEXCHANGERATE,0))/( 1+ FTAXRATEX /100 ),2)
+ -ROUND(((ISNULL(AM.FQTYX,0) * ISNULL(AB.FTAXPRICEX,0) - (ISNULL(AM.FQTYX,0) * ISNULL(AB.FTAXPRICEX,0) * ISNULL(AB.FDISCOUNTRATEX,0)/ 100))/( 1+ FTAXRATEX /100 )* (FTAXRATEX /100)* ISNULL(AN.FEXCHANGERATE,0) ),2)) AS DECIMAL(20, 10))) AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ,
+ AN.FBillAllAmount_LC AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
+ INTO #TEMP6
+ FROM T_SAL_XORDER AL
+ INNER JOIN T_SAL_ORDER A  ON A.FID = AL.FPKIDX  
+ INNER JOIN T_SAL_XORDERFIN AN ON AN.FID = AL.FID  --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>±<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ INNER JOIN T_SAL_XORDERENTRY AM ON AM.FID = AL.FID
+ INNER JOIN T_SAL_XORDERENTRY_F AB ON AB.FENTRYID = AM.FENTRYID        
+ INNER JOIN T_SEC_USER TU ON AL.FCHANGERID = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>   
+ WHERE 1=1                
+ AND A.FID NOT IN(SELECT FID FROM  #TEMP3)       
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))    
+ AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') >= @FEDate) 
+ AND (ISNULL(@FSDate,'') = '' OR FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') >=  FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01'))
+ AND (ISNULL(@FEDate,'') = '' OR FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') <  @FEDate)                  
+ AND A.F_contractnumber NOT LIKE 'Z%'                  
+ AND A.FManualClose <> '1'              
+ AND AL.FDOCUMENTSTATUS = 'C'
+ AND (A.F_HSYJ <> '0' OR FORMAT(A.F_HSRQ,'yyyy') != FORMAT(A.FChangeDate,'yyyy'))              
+ AND TU.FNAME NOT LIKE 'ERP%' AND TU.FNAME NOT LIKE '13570668909'
+ GROUP BY AL.FID,AL.FPKIDX,AL.FCHANGEDATE,AN.FBillAllAmount_LC
+
+ DELETE FROM #TEMP6 WHERE rn > 1
+
  --<EFBFBD><EFBFBD>ѯȫ<EFBFBD><EFBFBD>֯<EFBFBD>ĵ<EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                                     
  SELECT    
  A.FSaleOrgId AS '<EFBFBD><EFBFBD>֯FID'    
@@ -217,7 +251,7 @@ TRUNCATE TABLE YJPHB_GZTH
  --<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
  SELECT * FROM #TEMP4
  UNION ALL
- --<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD>
+ --<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Һ<EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>ޱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD>
   SELECT           
  A.FSALEORGID AS '<EFBFBD><EFBFBD>֯FID',            
  CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ELSE ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>  END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(SBU)',            
@@ -243,13 +277,52 @@ TRUNCATE TABLE YJPHB_GZTH
   WHERE 1=1 
  AND A.FID NOT IN(SELECT FID FROM  #TEMP3)
  AND A.FID NOT IN(SELECT <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID FROM  #TEMP4)
- AND(@FSaleOrgId = '' Or A.FSALEORGID IN(SELECT SalesID FROM SalesIDTable))    
+ AND A.FID NOT IN(SELECT FPKIDX FROM  #TEMP6)            
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN(SELECT SalesID FROM #SalesIDTable))    
  AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') >= @FSDate)                                            
  AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') < @FEDate)                                      
  AND A.FDocumentStatus = 'C'                     
  AND A.FManualClose <> '1'                              
  AND B.FManualRowClose <> '1'                          
  AND A.F_contractnumber NOT LIKE 'Z%'
+ --<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD>
+ UNION ALL
+  SELECT    
+ A.FSaleOrgId AS '<EFBFBD><EFBFBD>֯FID'    
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ELSE ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>  END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(SBU)'            
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ELSE ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> END AS  '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ'            
+ ,CASE WHEN ISNULL(O.FNAME,'')='' THEN XS_L.FNAME                                                    
+ ELSE O.FNAME END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա'                               
+ ,CASE WHEN n.FSHARERATE IS NULL THEN CAST(ROUND(AN.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-AN.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, 2) AS DECIMAL(20,10))                                                        
+ ELSE CAST(ROUND((AN.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-AN.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) * (n.FSHARERATE/100),2) AS DECIMAL(20, 10)) END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>'
+ --,CAST(AN.FBillAllAmount_LC AS DECIMAL(20, 10)) AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>'
+ ,A.F_CONTRACTNUMBER AS 'ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>'
+ ,A.fbillno AS '<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
+ ,AL.FPKIDX AS '<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID'
+ FROM T_SAL_XORDER AL           
+ --LEFT JOIN T_SAL_ORDERFIN AN ON A.FID = AN.FID --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LEFT JOIN T_SAL_ORDER A  ON A.FID = AL.FPKIDX
+ LEFT JOIN #TEMP6 AN ON AL.FID = AN.FID                                                                                   
+ LEFT JOIN V_BD_SALESMAN XS ON XS.fid = A.FSalerId                                        
+ LEFT JOIN V_BD_SALESMAN_L XS_L ON XS_L.fid = XS.fid --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD>ͣ<EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD><EFBFBD>             
+ left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'                                                        
+ left JOIN T_PerformanceSharingEntry N ON N.FID=M.FID  --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>              
+ LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID --<EFBFBD><EFBFBD>ȡҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD>                                        
+ LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=O.FNAME AND ISNULL(ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''                                                   
+ LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=XS_L.FNAME AND ISNULL(ACL.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''            
+ INNER JOIN T_SEC_USER TU ON AL.FCHANGERID = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>             
+ WHERE 1=1                
+ AND AL.FPKIDX NOT IN(SELECT FID FROM  #TEMP3)
+ AND AL.FPKIDX NOT IN(SELECT FPKIDX FROM  #TEMP5)
+ AND AL.FID IN(SELECT FID FROM  #TEMP6)
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable)) 
+ AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') >=  FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01'))
+ AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') >= @FSDate)                                            
+ AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') < @FEDate)
+ AND A.FManualClose <> '1'
+ AND AL.FDOCUMENTSTATUS = 'C'              
+ AND (A.F_HSYJ <> '0' OR FORMAT(A.F_HSRQ,'yyyy') != FORMAT(A.FChangeDate,'yyyy'))              
+ AND TU.FNAME NOT LIKE 'ERP%' AND TU.FNAME NOT LIKE '13570668909'
  ) a
 
 /*<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼDZ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
@@ -268,7 +341,7 @@ SUM(CAST((
  INNER JOIN T_SEC_USER TU ON AL.FCHANGERID = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  
  WHERE 1=1
  AND A.FID NOT IN(SELECT FID FROM  #TEMP3)
- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))
  AND (ISNULL(@FSDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') < FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01')) 
  AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') >=  FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01'))
  AND (ISNULL(@FEDate,'') = '' or FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') < @FEDate)  
@@ -305,7 +378,7 @@ SUM(CAST((
  INNER JOIN T_SEC_USER TU ON AL.FCHANGERID = TU.FUSERID -- <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>             
  WHERE 1=1                
  AND A.FID NOT IN(SELECT FID FROM  #TEMP3)
- AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+ AND(@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))
  AND (ISNULL(@FEDate,'') = '' or FORMAT(A.FAPPROVEDATE,'yyyy-MM-dd') < FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01')) 
  AND (ISNULL(@FSDate,'') = '' OR FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') >=  FORMAT(CAST(@FSDate AS DATE),'yyyy-01-01'))
  AND (ISNULL(@FEDate,'') = '' or FORMAT(AL.FCHANGEDATE,'yyyy-MM-dd') < @FEDate) 
@@ -398,7 +471,7 @@ SUM(CAST((
 --FROM T_AR_RECEIVEBILL A    
 --INNER JOIN V_BD_SALESMAN_L O ON O.fid= A.FSALEERID    
 --INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=O.FNAME  AND ISNULL(ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''     
---WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))    
+--WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))    
 SELECT 
 t1.FSaleOrgId AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯FID',    
 t3.FNAME AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա'    
@@ -410,7 +483,7 @@ FROM ZZZ_HeXiaoBook t1
 INNER JOIN T_SAL_ORDER t2 ON t1.XiaoShouFid = t2.FID
 INNER JOIN V_BD_SALESMAN_L t3 ON t3.fid= t2.FSALERID
 INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=t3.FNAME  AND ISNULL(ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''
-WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM SalesIDTable))  AND t1.ShoukuanType = 0     
+WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM #SalesIDTable))  AND t1.ShoukuanType = 0     
     
 --<EFBFBD><EFBFBD>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯<EFBFBD>µ<EFBFBD><EFBFBD>տ<EFBFBD><EFBFBD>˿    
 --SELECT    
@@ -423,7 +496,7 @@ WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM SalesIDTable))
 --FROM T_AR_REFUNDBILL A    
 --INNER JOIN V_BD_SALESMAN_L B ON A.FSALEERID = B.fid    
 --INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=B.FNAME  AND ISNULL(ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''     
---WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+--WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM #SalesIDTable))
 SELECT 
 t1.FSaleOrgId AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯FID',    
 t3.FNAME AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա'    
@@ -435,7 +508,7 @@ FROM ZZZ_HeXiaoBook t1
 INNER JOIN T_SAL_ORDER t2 ON t1.XiaoShouFid = t2.FID
 INNER JOIN V_BD_SALESMAN_L t3 ON t3.fid= t2.FSALERID
 INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=t3.FNAME  AND ISNULL(ACO.<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') != ''
-WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM SalesIDTable))  AND t1.ShoukuanType = 1        
+WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM #SalesIDTable))  AND t1.ShoukuanType = 1        
     
 --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŵ<EFBFBD>ۼƻؿ<EFBFBD><EFBFBD><EFBFBD>(<EFBFBD>ο<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)    
     

派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql

@@ -68,6 +68,7 @@ BEGIN
  --ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ              
  --WHERE B.FPLX = '<EFBFBD><EFBFBD>Ʊ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 
 
+ --<EFBFBD>ǿ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 UPDATE A                  
 SET PPBillingDate = B.FPRQ
 FROM YingShouZhanKuanMX_GZTH A                  
@@ -80,6 +81,20 @@ INNER JOIN (
 	ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ              
 WHERE B.FPLX = '<EFBFBD><EFBFBD>Ʊ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 
 
+--׷<EFBFBD><EFBFBD>K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+UPDATE A                  
+SET PPBillingDate = CASE ISNULL(A.PPBillingDate,'') WHEN '' THEN '' ELSE A.PPBillingDate + ','  END + B.FPRQ
+FROM YingShouZhanKuanMX_GZTH A                  
+INNER JOIN (
+	SELECT (
+	stuff((select ','+format(convert(date,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>),'yyyy-MM-dd') from (select distinct <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> from oldk3ICSale0802)b WHERE <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> = A.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD>' FOR xml path('')),1,1,'')) FPRQ,
+	<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	FROM oldk3ICSale0802 A
+	WHERE <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD>'
+	GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) B 
+	ON A.CONTRACTNUMBER = B.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>             
+WHERE B.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD>' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 
+
  -- UPDATE A                  
  --SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
  --FROM YingShouZhanKuanMX_GZTH A                  
@@ -87,6 +102,7 @@ WHERE B.FPLX = '
  --ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ  
  -- WHERE B.FPLX = 'רƱ' AND A.[<5B>Ƿ<EFBFBD>K3<4B><33><EFBFBD><EFBFBD>] = 0 
 
+ --<EFBFBD>ǿ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 UPDATE A                  
 SET ZPBillingDate = B.FPRQ
 FROM YingShouZhanKuanMX_GZTH A                  
@@ -99,7 +115,19 @@ INNER JOIN (
 	ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ  
 WHERE B.FPLX = 'רƱ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 
 
- 
+--׷<EFBFBD><EFBFBD>K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+UPDATE A                  
+SET PPBillingDate = CASE ISNULL(A.PPBillingDate,'') WHEN '' THEN '' ELSE A.PPBillingDate + ','  END + B.FPRQ
+FROM YingShouZhanKuanMX_GZTH A                  
+INNER JOIN (
+	SELECT (
+	stuff((select ','+format(convert(date,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>),'yyyy-MM-dd') from (select distinct <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> from oldk3ICSale0802)b WHERE <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> = A.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = 'ר' FOR xml path('')),1,1,'')) FPRQ,
+	<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	FROM oldk3ICSale0802 A
+	WHERE <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = 'ר'
+	GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) B 
+	ON A.CONTRACTNUMBER = B.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>             
+WHERE B.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = 'ר' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 
                 
  --UPDATE A                  
  --SET PPBillingAmount =  B.KPJE                  
@@ -181,7 +209,7 @@ WHERE B.FPLX = 'רƱ' AND A.[
  --<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD>ǷƱ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD> 
   --  OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0
  SELECT                  
- FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) AS '<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>',AVG(BillingAmount) - AVG(PaymentAmount) AS '<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ',                  
+ FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) - SUM(ISNULL(ReturnAmount,0)) AS '<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>',AVG(BillingAmount) - AVG(PaymentAmount) AS '<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>',SUM(OrderAmount) - SUM(BillingAmount) AS 'ǷƱ',                  
  CASE WHEN (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0))                  
  AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(BillingAmount,0))                  
  AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(PaymentAmount,0))           

派诺报表SQL文件/销售执行统计表存储过程.sql

@@ -1,5 +1,5 @@
  
-/****** Object:  StoredProcedure [dbo].[GetOrderData]    Script Date: 2025/8/2 21:48:44 ******/
+/****** Object:  StoredProcedure [dbo].[GetOrderData]    Script Date: 2025/8/20 10:19:00 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
@@ -12,7 +12,8 @@ ALTER PROCEDURE [dbo].[GetOrderData]
  @FSaleOrgIdName nvarchar(1000),                                                                                     
  @FSDate nvarchar(1000),                                                    
  @FEDate nvarchar(1000),
- @FPaperContract NVARCHAR(500)=''
+ @FPaperContract NVARCHAR(500)='',
+ @QuYu NVARCHAR(500)=''
 )                                                                              
 as                                                                         
   DECLARE @FSaleOrgId nvarchar(1000);                      
@@ -107,7 +108,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  (                                    
  SELECT ','+ CONVERT(NVARCHAR(100), FNAME,120) -- Ҫƴ<D2AA>ӵ<EFBFBD><D3B5><EFBFBD>                                                                              
  FROM  (      
-    SELECT DISTINCT  x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'<EFBFBD><EFBFBD>--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%' AS FNAME      
+    SELECT DISTINCT  x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'<EFBFBD><EFBFBD>--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%'+'---' +ISNULL(CONVERT(NVARCHAR(20),w.FMUSTDATE,23),'') AS FNAME      
     ,w.FID,w.F_PMSDate      
     ,W.FRECADVANCEAMOUNT,w.F_DAY  ,w.F_MBBA_DECIMAL_UKY      
     ,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE ,x.FNAME AS fname2 ,w.FMUSTDATE [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]       
@@ -153,6 +154,9 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
   A.FID ,                                                                              
  A.FBILLNO ,                                                                  
  B.FENTRYID ,  
+ a.F_INVOICEAMOUNT  '<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+ j.FBILLALLAMOUNT-  a.F_INVOICEAMOUNT  'δ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+
  ISNULL(N.FSHARERATE,100) AS FSHARERATE,
  F.FALLAMOUNT_LC ,                                                                                               
  MONTH(A.FApproveDate) AS '<EFBFBD>·<EFBFBD>' --<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>                                                                              
@@ -210,7 +214,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
              ELSE '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END AS 'ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'                         
  ,CASE WHEN N.FSHARERATE is null THEN '100' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as 'ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>' --<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>-ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF>-<2D><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                      
  , b.F_ProjectProposal AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'             
- ,'' AS '<27>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD> <20>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>                                                                              
+  ,a.F_Amount AS '<27>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD> <20>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>                                                                              
  , CAST( J.FEXCHANGERATE AS REAL) AS '<27><><EFBFBD><EFBFBD>' --<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>-<2D><><EFBFBD><EFBFBD>ͷ-<2D><><EFBFBD><EFBFBD>                                                                                
  ,H.F_Province AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>ʡ<EFBFBD><CAA1>' --<2D>ֶ<EFBFBD><D6B6><EFBFBD><EFBFBD>ijɡ<C4B3><C9A1><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>ʡ<EFBFBD>ݡ<EFBFBD><DDA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CRMϵͳ<CFB5>̻<EFBFBD><CCBB><EFBFBD>ERP<52>̻<EFBFBD><CCBB><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>ֶζ<D6B6>Ӧ                                                                              
  ,h.F_City AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' --<2D>ֶ<EFBFBD><D6B6><EFBFBD><EFBFBD>ijɡ<C4B3><C9A1><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CRMϵͳ<CFB5>̻<EFBFBD><CCBB><EFBFBD>ERP<52>̻<EFBFBD><CCBB><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>ֶζ<D6B6>Ӧ                                                                              
@@ -292,10 +296,10 @@ AND A.F_contractnumber NOT LIKE 'Z%'
  ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)) * isnull(A.FSHARERATE,100)/100 ,2) AS '<27>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>˻<EFBFBD>' --2024-11-20<32><30>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD>AS<41><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-AU<41>˻<EFBFBD><CBBB><EFBFBD><EFBFBD>*ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                          
  ,B.FQTY - AR.FDeliQty  AS 'δ<><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD>-<2D>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>                                                                                  
  , round( (A.FALLAMOUNT_LC - ISNULL(P.FAMOUNT,0) +ISNULL(Q.FAMOUNT,0))* isnull(A.FSHARERATE,100)/100,2)   as 'δ<><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'--(<28><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD>˰<EFBFBD>ϼƱ<CFBC>λ<EFBFBD><CEBB>-<2D><><EFBFBD><EFBFBD>֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>+<2B>˻<EFBFBD>֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>
-,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '<27>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --<2D><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>۳<EFBFBD><DBB3>ⵥ<EFBFBD><E2B5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>-<2D>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>                                  
+--,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '<27>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --<2D><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>۳<EFBFBD><DBB3>ⵥ<EFBFBD><E2B5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>-<2D>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>                                  
- ,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '<27><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                                      
+ --,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '<27><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                                      
- ,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --AV<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>-BB<42>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>                                                                              
+ --,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --AV<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>-BB<42>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>   
- ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --(AW<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-BC<42><43>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> 
+ --,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --(AW<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-BC<42><43>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> 
  ,ISNULL(G.F_CONTRACTNUMBER,'') AS 'Դ<><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'    ,CONVERT(DECIMAL(18,2),0)  AS <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                           
  INTO #TEMP1                                                                              
  FROM #TEMP4 A   
@@ -305,7 +309,7 @@ LEFT JOIN  #SAL P ON P.FENTRYID = A.FENTRYID  --
 LEFT JOIN  #RETURN q ON q.FENTRYID = A.FENTRYID  --<2D>˻<EFBFBD>֪ͨ<CDA8><D6AA>                                                                              
 LEFT JOIN #OUTSTOCK R ON R.FENTRYID = A.FENTRYID --<2D><><EFBFBD>۳<EFBFBD><DBB3>ⵥ                                                                              
 LEFT JOIN #RETURNSTOCK AA ON AA.FENTRYID = A.FENTRYID   --<2D><><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><CBBB><EFBFBD>                                                                              
-LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --Ӧ<>յ<EFBFBD>                                                                                                                                                
+--LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --Ӧ<>յ<EFBFBD>                                                                                                                                                
 LEFT JOIN #TEMP2 AD ON AD.FID = A.FID                             
 LEFT JOIN (
 	SELECT T1.FENTRYID,T3.F_CONTRACTNUMBER FROM T_SAL_ORDERENTRY_R T1
@@ -328,9 +332,10 @@ LEFT JOIN (
   UPDATE #TEMP1 SET  <20><>ͬ<EFBFBD>ܼ<EFBFBD>=<3D><>ͬ<EFBFBD>ܼ<EFBFBD>+(<28><><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>- <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> )                    
   WHERE  <20><><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD><>0               
         
-
+IF(@QuYu='')
-SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE desc
+  SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE DESC
-
+ ELSE
+  SELECT * FROM #TEMP1 WHERE <20><><EFBFBD><EFBFBD> LIKE '%'+@QuYu+'%'  ORDER BY fid,FENTRYID ,FSHARERATE DESC
   
 
 drop table #TEMP2