diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index 86e3c04..814d3be 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -557,7 +557,7 @@ FROM #PLChongDianZhuangHeTong ; ON B.FENTRYID = B2.FENTRYID LEFT JOIN ( - SELECT Aq2.FBillAllAmount_LC, + SELECT Aq.FALLAMOUNT_LC AS FBillAllAmount_LC, Aq.* FROM ( @@ -585,33 +585,7 @@ FROM #PLChongDianZhuangHeTong ; ON W1.FSID = W2.FENTRYID GROUP BY W2.FSID, W2.FSBILLID - ) Aq - JOIN - ( - SELECT W2.FSBILLID, - STRING_AGG(CONVERT(NVARCHAR, W1.FDATE, 23), ',') AS 'FDate', - SUM(W1.FPRICEUNITQTY) AS 'FRETNOTICEQTY', - SUM(W1.FALLAMOUNT_LC) AS 'FBillAllAmount_LC' - FROM - ( - SELECT q1.FDATE, - q3.FSID, - q2.FALLAMOUNT_LC, - q2.FPRICEUNITQTY - FROM T_SAL_RETURNNOTICE q1 - JOIN T_SAL_RETURNNOTICEENTRY_F q2 - ON q1.FID = q2.FID - JOIN T_SAL_RETURNNOTICEENTRY_LK q3 - ON q2.FENTRYID = q3.FENTRYID - WHERE q1.FDOCUMENTSTATUS = 'C' - AND q1.FCANCELSTATUS = 'A' - AND q3.FSTABLENAME = 'T_SAL_ORDERENTRY' - ) W1 - JOIN T_SAL_ORDERENTRY_LK W2 - ON W1.FSID = W2.FENTRYID - GROUP BY W2.FSBILLID - ) Aq2 - ON Aq.FSBILLID = Aq2.FSBILLID + ) Aq ) B3 --销售订单-表关联表(销售退货) ON B.FENTRYID = B3.FSID JOIN T_SAL_ORDERFIN C --销售订单_财务表 diff --git a/国庆后的需求变化.txt b/国庆后的需求变化.txt index e802a06..c856805 100644 --- a/国庆后的需求变化.txt +++ b/国庆后的需求变化.txt @@ -45,3 +45,11 @@ A(储能、微电风、光储充)剩余部分 OK 郭靖: 目前系统里C和CS合同模板需新增文档中标黄的部分@格致--余宇波 @贺光波 同时,系统里C合同还需要新增一个模板 + + +一、设备层 +二、通讯层 +三、应用管理层 +四、线缆施工费用 +五、技术服务费 +系统合同的报价单排序从上到下按这个排,云星空的报价单导入看看调整下,谢谢@格致--余宇波 @贺光波 \ No newline at end of file