1

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

@@ -620,7 +620,7 @@ namespace LQKJ.K3.CZXT.Pluglus
         {
             // 调用基类的 GetSummaryColumnInfo 方法获取基本的汇总列信息
             var result = base.GetSummaryColumnInfo(filter);
-            // 以下是一些被注释掉的代码，表示如果需要，可以添加更多的汇总字段
+            // 以下是一些汇总字段
             result.Add(new SummaryField("F_LQKJ_FSTOCKINQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//入库数
             result.Add(new SummaryField("F_LQKJ_FSTOCKOUTQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//出库数
             result.Add(new SummaryField("F_LQKJ_Inboundvolume", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//入库体积

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

@@ -498,6 +498,10 @@ namespace LQKJ.K3.CZXT.Pluglus
             zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_FDate", type = 4, zdcd = 500, zwName = "业务日期" });
             zds.Add(new CreateTmpTableZD() { zdName = "FMATERIALNUMBER", type = 2, zdcd = 500, zwName = "物料编码" });
             zds.Add(new CreateTmpTableZD() { zdName = "FMATERIALID", type = 2, zdcd = 500, zwName = "物料名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_ORA_ASSISTANT", type = 2, zdcd = 500, zwName = "纸大类编码" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_ORA_ASSISTANTS", type = 2, zdcd = 500, zwName = "纸大类名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_ORA_ASSISTANT1", type = 2, zdcd = 500, zwName = "项目编码" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_ORA_ASSISTANT1S", type = 2, zdcd = 500, zwName = "项目名称" });
             zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKID", type = 2, zdcd = 500, zwName = "仓库名称" });
             zds.Add(new CreateTmpTableZD() { zdName = "FOWNERTYPENAME", type = 2, zdcd = 500, zwName = "货主类型" });
             zds.Add(new CreateTmpTableZD() { zdName = "FOwnerId", type = 2, zdcd = 500, zwName = "货主" });
@@ -537,6 +541,10 @@ namespace LQKJ.K3.CZXT.Pluglus
 ,CKBM.FNUMBER AS FSTOCKID--仓库名称
 ,W.FNUMBER AS FMATERIALNUMBER--物料编码
 ,WL.FNAME AS FMATERIALID--物料名称
+,ZDL.FNUMBER AS F_ORA_ASSISTANT--纸大类编码
+,ZDLM.FDATAVALUE AS F_ORA_ASSISTANTS--纸大类名称
+,XM.FNUMBER AS F_ORA_ASSISTANT1--项目编码
+,XMM.FDATAVALUE AS F_ORA_ASSISTANT1S--项目名称
 ,T1.FOWNERTYPENAME --货主类型
 ,DWBM.FNUMBER AS FSTOCKUNITID--库存单位
 ,ISNULL(FORMAT(CONVERT(FLOAT,T1.FSTOCKQCQTY), '0.####'), '0') AS FSTOCKQCQTY--期初&数量(库存)
@@ -549,8 +557,8 @@ namespace LQKJ.K3.CZXT.Pluglus
 ,ISNULL(FORMAT((T1.FSTOCKINQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.####'), '0') AS F_LQKJ_Inboundvolume--入库体积
 ,ISNULL(FORMAT((T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.####'), '0') AS F_LQKJ_Outboundvolume--出库体积
 ,ISNULL(FORMAT((CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END * (T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY)), '0.####'), '0') AS F_LQKJ_Totalvolume--总体积
-,ISNULL(FORMAT((CS.F_LQKJ_Warehouserent), '0.####'), '0') AS F_LQKJ_Warehouserent--仓租单价
-,ISNULL(FORMAT(((CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END * (T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY)) * CS.F_LQKJ_Warehouserent), '0.####'), '0') AS F_LQKJ_Warehouse--仓租
+,ISNULL(FORMAT((W.F_ORA_DECIMAL_QTR), '0.####'), '0') AS F_LQKJ_Warehouserent--仓租单价
+,ISNULL(FORMAT(((CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END * (T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY)) * W.F_ORA_DECIMAL_QTR), '0.####'), '0') AS F_LQKJ_Warehouse--仓租
 ,ISNULL(FORMAT((CS.F_LQKJ_Unloadingfee), '0.####'), '0') AS F_LQKJ_Unloadingfee--卸车费单价
 ,ISNULL(FORMAT((T1.FSTOCKINQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END * CS.F_LQKJ_Unloadingfee), '0.####'), '0') AS F_LQKJ_Unloading--卸车费
 ,ISNULL(FORMAT((CS.F_LQKJ_Loadingfee), '0.####'), '0') AS F_LQKJ_Loadingfee --装车费单价
@@ -563,7 +571,7 @@ namespace LQKJ.K3.CZXT.Pluglus
 ,ISNULL(FORMAT((SS.F_LQKJ_Specialloading), '0.####'), '0') AS F_LQKJ_Specialloading--特殊装货
 ,ISNULL(FORMAT((SS.F_LQKJ_Inspectionfee), '0.####'), '0') AS F_LQKJ_Inspectionfee--检查及包装费
 ,ISNULL(FORMAT((SS.F_LQKJ_Wdbczce), '0.####'), '0') AS F_LQKJ_Wdbczce--未达标仓租差额
-,ISNULL(FORMAT((CS.F_LQKJ_Warehouserent * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + (CS.F_LQKJ_Unloadingfee * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END))
+,ISNULL(FORMAT((W.F_ORA_DECIMAL_QTR * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + (CS.F_LQKJ_Unloadingfee * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END))
 + (CS.F_LQKJ_Loadingfee * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + (CS.F_LQKJ_Sortingfees * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.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 {0} T1
@@ -573,6 +581,12 @@ LEFT JOIN T_ORG_ORGANIZATIONS CKZZ ON T1.FSTOCKORGID=CKZZ.FORGID--组织表
 LEFT JOIN V_TGT_OWNER HZ ON T1.FOwnerId=HZ.fid--货主表
 LEFT JOIN T_BD_STOCK_L CK ON T1.FSTOCKID=CK.FSTOCKID AND CK.FLOCALEID=2052--仓库多语言表
 LEFT JOIN T_BD_MATERIAL W ON T1.FMATERIALID=W.FMATERIALID
+
+LEFT JOIN T_BAS_ASSISTANTDATAENTRY ZDL ON W.F_ORA_ASSISTANT=ZDL.FENTRYID--纸大类编码
+LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L ZDLM ON W.F_ORA_ASSISTANT=ZDLM.FENTRYID AND ZDLM.FLOCALEID=2052--纸大类名称
+LEFT JOIN T_BAS_ASSISTANTDATAENTRY XM ON W.F_ORA_ASSISTANT1=XM.FENTRYID--项目编码
+LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L XMM ON W.F_ORA_ASSISTANT1=XMM.FENTRYID AND XMM.FLOCALEID=2052--项目名称
+
 LEFT JOIN t_BD_MaterialBase JB ON JB.FMATERIALID=W.FMATERIALID
 LEFT JOIN T_BD_MATERIAL_L WL ON T1.FMATERIALID=WL.FMATERIALID AND WL.FLOCALEID = 2052 --物料多语言表
 LEFT JOIN T_BD_UNIT_L DW ON T1.FSTOCKUNITID=DW.FUNITID AND DW.FLOCALEID=2052 --计量单位多语言表