1

CZXT.kdsln.config

@@ -7,7 +7,7 @@
   <ProjectRefPath>D:\谭富强工作目录\仓租系统\CZXT\CZXT\K3Cloud\bin</ProjectRefPath>
   <IsAutoCheckIn>1</IsAutoCheckIn>
   <IsStartScc>1</IsStartScc>
-  <LastExpandPackageNodeID>488a8668-0ea1-4e70-abc8-a64597862bbd</LastExpandPackageNodeID>
+  <LastExpandPackageNodeID>d0e3cf8e-fb08-4e5a-9dd0-deac28a7f6f5</LastExpandPackageNodeID>
   <SCCCfg>
   </SCCCfg>
 </KDSolution>
\ No newline at end of file

Code/LQKJ.K3.CZXT.Pluglus/WarehouseRentReport.cs

@@ -509,7 +509,7 @@ namespace LQKJ.K3.CZXT.Pluglus
                                             ,ISNULL(FORMAT(T2.FSTOCKINQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END, '0.####'), '0') AS F_LQKJ_Inboundvolume--入库体积
                                             ,ISNULL(FORMAT(T2.FSTOCKOUTQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END, '0.####'), '0') AS F_LQKJ_Outboundvolume--出库体积
                                             ,ISNULL(FORMAT(T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END, '0.####'), '0') AS F_LQKJ_Inventoryvolume--库存体积
-                                            ,ISNULL(FORMAT(CS.F_LQKJ_Warehouserent * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END), '0.####'), '0') AS F_LQKJ_Warehouse--仓租 
+                                            ,ISNULL(FORMAT(T1.F_ORA_DECIMAL_QTR * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END), '0.####'), '0') AS F_LQKJ_Warehouse--仓租 
                                             ,ISNULL(FORMAT(CS.F_LQKJ_Unloadingfee * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END), '0.####'), '0') AS F_LQKJ_Enterfee--进仓费
                                             ,ISNULL(FORMAT(CS.F_LQKJ_Loadingfee * (T2.FSTOCKOUTQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END), '0.####'), '0') AS  F_LQKJ_Warehousingfee--出仓费
                                             ,ISNULL(FORMAT(CS.F_LQKJ_Sortingfees * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END), '0.####'), '0') AS F_LQKJ_Cargosortingfee--货物分拣费
@@ -519,23 +519,26 @@ namespace LQKJ.K3.CZXT.Pluglus
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, SS.F_LQKJ_Specialloading), '0.####'), '0') AS F_LQKJ_Specialloading --特殊装货
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, SS.F_LQKJ_Inspectionfee), '0.####'), '0') AS F_LQKJ_Inspectionfee --检查及包装费
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, SS.F_LQKJ_Wdbczce), '0.####'), '0') AS F_LQKJ_Wdbczce --未达标仓租差额
-                                            ,ISNULL(FORMAT((CS.F_LQKJ_Warehouserent * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END)) + (CS.F_LQKJ_Unloadingfee * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END))
+                                            ,ISNULL(FORMAT((T1.F_ORA_DECIMAL_QTR * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END)) + (CS.F_LQKJ_Unloadingfee * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END))
                                             + (CS.F_LQKJ_Loadingfee * (T2.FSTOCKOUTQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END)) + (CS.F_LQKJ_Sortingfees * (T1.FSTOCKJCQTY * CASE WHEN T1.FVOLUME = 0 THEN 1 ELSE T1.FVOLUME END))
                                             + SS.F_LQKJ_Scanfee + SS.F_LQKJ_JDchannelfee + SS.F_LQKJ_Breturnfees + SS.F_LQKJ_Specialloading + SS.F_LQKJ_Inspectionfee + SS.F_LQKJ_Wdbczce, '0.####'), '0') AS F_LQKJ_Totalcosts--费用合计
                                             FROM(SELECT FDate, FNUMBER,
                                                 SUM(CAST(FSTOCKQCQTY AS DECIMAL(18, 4))) AS FSTOCKQCQTY, -- 期初数量(库存)的汇总
 	                                                SUM(CAST(FSTOCKJCQTY AS DECIMAL(18, 4))) AS FSTOCKJCQTY,  -- 结存数量(库存)的汇总
-													SUM(CAST(FVOLUME AS DECIMAL(18, 4))) AS FVOLUME  -- 结存数量(库存)的汇总
+													SUM(CAST(FVOLUME AS DECIMAL(18, 4))) AS FVOLUME,  --体积
+													SUM(CAST(F_ORA_DECIMAL_QTR AS DECIMAL(18, 4))) AS F_ORA_DECIMAL_QTR  --仓租单价
                                             FROM(SELECT T1.FDate, -- 日期
                                                     Z.FNUMBER, --组织
                                                     T1.FMATERIALID, -- 物料编码
                                                     T1.FSTOCKID, -- 仓库
                                                     SUM(CAST(T1.FSTOCKQCQTY AS DECIMAL(18, 4))) AS FSTOCKQCQTY, -- 期初数量(库存)的汇总
 	                                                SUM(CAST(T1.FSTOCKJCQTY AS DECIMAL(18, 4))) AS FSTOCKJCQTY,  -- 结存数量(库存)的汇总
-													SUM(CAST(JB.FVOLUME AS DECIMAL(18, 4))) AS FVOLUME  -- 体积
+													SUM(CAST(JB.FVOLUME AS DECIMAL(18, 4))) AS FVOLUME,  -- 体积
+													SUM(CAST(W.F_ORA_DECIMAL_QTR AS DECIMAL(18, 4))) AS F_ORA_DECIMAL_QTR  -- 仓租单价
                                             FROM {0} T1
                                             LEFT JOIN T_ORG_ORGANIZATIONS Z ON T1.FSTOCKORGID=Z.FORGID --组织表
 											LEFT JOIN t_BD_MaterialBase JB ON JB.FMATERIALID=T1.FMATERIALID
+											LEFT JOIN T_BD_MATERIAL W ON T1.FMATERIALID=W.FMATERIALID
                                             GROUP BY T1.FDate, T1.FMATERIALID, T1.FSTOCKID,Z.FNUMBER) T1
                                             GROUP BY FDate, FNUMBER) T1 
                                             LEFT JOIN (SELECT T1.FDate, -- 日期