213

Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs

@@ -296,6 +296,13 @@ else
                     wheresql += $@" and [F_009] = '{GCXMFid}'";
                 }
 
+                //获取责任人
+                var ZeRenRen = Convert.ToString(dyObj["F_ZeRenRen"]);
+
+                if (!string.IsNullOrWhiteSpace(ZeRenRen))
+                {                    
+                    wheresql += $@" and [ZeRenRen] = '{ZeRenRen}'";
+                }
                 //获取合同号
                 var HeTongHao = Convert.ToString(dyObj["F_HeTongHao"]);
                 if (!string.IsNullOrWhiteSpace(HeTongHao))
@@ -309,6 +316,8 @@ else
                     wheresql += $@" and [F_003] like '%{F_SBU}%'";
                 }
 
+
+                //[F_025]  [实际已出货应收款合计] F_ChuHuo1 F_ChuHuo2
                 this.View.Model.DeleteEntryData("F_MBBA_Entity_qtr");
 
                 //获取表1

Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs

@@ -426,18 +426,21 @@ FROM #PLChongDianZhuangHeTong ;");
        H5.FDATAVALUE AS 'SpecialCauseType',                                              --特价原因分类
        A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause',                                  --CRM特价原因
        CASE
-           WHEN AAA.F_ORDERTYPE = 'YB' THEN
+          WHEN (AAA.F_ORDERTYPE = 'YB' or  AAA.F_ORDERTYPE = 'CDZYB') THEN
                B.F_SETTLEMENTP
            ELSE
                NULL
        END AS 'CurrentSettledUpset1',                                                    --当期结算价（仪表）
-       CASE
+      
+        CASE
+           WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN
+              isnull(g.F_JSJ,0)* B.FQTY+isnull(A.F_KFYS,0)+isnull(F_SGCB,0)+isnull(F_SSRT,0)*800+isnull(F_SJRT,0)*800 
            WHEN AAA.F_ORDERTYPE = 'XT'
-                AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
+             AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
                CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT)
            ELSE
                NULL
-       END AS 'CurrentSettledUpset2',                                                    --当期结算价（系统）
+       END AS 'CurrentSettledUpset2',                                                                             --当期结算价（系统）
        (B2.FTAXPRICE - B.F_SETTLEMENTP) AS 'Difference',                                 --差额（单价-底价）
                                                                                          --P、C、E、S
        CASE