1

Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs

@@ -771,11 +771,50 @@ UPDATE  #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.含税
 FROM  dbo.oldk3seorder0701 k3 
 WHERE F_K3SEQ=k3.行号 AND #tempDaBiao.ContractNumber=k3.合同号;
 
-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'
-GROUP BY a.AFBILLNO) b
-where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBILLNO  ;
+  SELECT DISTINCT a.fid,b.F_SettlementAmount,jiashui 
+	 INTO #PLChongDianZhuangHeTong_yibiao
+	 FROM #PLChongDianZhuangHeTong a
+	 INNER JOIN (SELECT a.FID, SUM(B.F_SettlementAmount) AS F_SettlementAmount,SUM(B2.FTAXPRICE*C.FExchangeRate*b.FQTY) AS jiashui  
+	 FROM  T_SAL_ORDERENTRY B --销售订单明细表
+	  LEFT JOIN T_SAL_ORDERENTRY_F B2 --销售订单明细_F表
+        ON B.FENTRYID = B2.FENTRYID
+    JOIN T_SAL_ORDER A --销售订单表
+        ON A.FID = B.FID 
+   	  JOIN T_SAL_ORDERFIN C --销售订单_财务表
+        ON A.FID = C.FID
+	     LEFT JOIN
+    (
+        SELECT B.FNAME,
+               B.FSPECIFICATION,
+               A.*
+        FROM T_BD_MATERIAL A
+            JOIN T_BD_MATERIAL_L B
+                ON A.FMATERIALID = B.FMATERIALID
+        WHERE B.FLOCALEID = 2052
+              AND A.FDOCUMENTSTATUS = 'C'
+              AND A.FFORBIDSTATUS = 'A'
+    ) G --物料表
+	  ON G.FMATERIALID = B.FMATERIALID   
+	   WHERE  G.FNUMBER  LIKE 'V%' 
+	   GROUP BY a.fid
+	   ) b 
+	   ON a.fid=b.fid
+
+
+
+	UPDATE  #tempDaBiao SET TotalSpread= TotalSpread-b.jiashui +b.F_SettlementAmount 
+	,CurrentSettledUpset2=CurrentSettledUpset2-b.F_SettlementAmount
+	FROM (SELECT fid,F_SettlementAmount ,jiashui FROM #PLChongDianZhuangHeTong_yibiao ) b
+	where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.FID=b.FID;
+
+	DELETE #tempDaBiao
+	WHERE  TableName IN ('#PLChongDianZhuangHeTong')  AND FID NOT IN (
+	SELECT  a.fid FROM #tempDaBiao b INNER JOIN dbo.T_SAL_ORDER a
+	ON a.FID=b.FID
+	WHERE
+	(A.F_SpecialContracts = '是'  OR a.F_GROSSMARGIN1='<35%' OR  b.TotalSpread < 0 ) and (a.F_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null )
+	);
+
 ";
 
 
@@ -868,7 +907,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
         ) t1
            
             order by Sort desc,Date desc ,fid desc ,FIDENTITYID ", tableName);
-            //Logger.Error("特价明细报表", sql, new Exception());
+            Logger.Error("特价明细报表", sql, new Exception());
             DBUtils.Execute(this.Context, sql);
         }