添加显示编码仓库、库存组织、库存单位、货主

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

@@ -481,7 +481,8 @@ namespace LQKJ.K3.CZXT.Pluglus
             zds = new List<CreateTmpTableZD>();
             // 添加多个字段的定义：字段名称、数据类型、长度、中文名称等
             zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_FDate", type = 4, zdcd = 500, zwName = "业务日期" });
-            zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_OrgId", type = 2, zdcd = 500, zwName = "库存组织" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_OrgId", type = 2, zdcd = 500, zwName = "库存组织名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_OrgBM", type = 2, zdcd = 500, zwName = "库存组织编码" });
             zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_FSTOCKQCQTY", type = 3, zdcd = 4, zwName = "期初数" });
             zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_FSTOCKINQTY", type = 3, zdcd = 4, zwName = "入库数" });
             zds.Add(new CreateTmpTableZD() { zdName = "F_LQKJ_FSTOCKOUTQTY", type = 3, zdcd = 4, zwName = "出库数" });
@@ -508,7 +509,8 @@ namespace LQKJ.K3.CZXT.Pluglus
                 DataTable db = CreateTmpTable();
                 db.BeginInit();// 开始初始化数据表
                 // 构建最终的 SQL 查询语句
-                string sql = string.Format(@"/*dialect*/SELECT REPLACE(CONVERT(VARCHAR(10), T1.FDate, 111), '-', '/') AS F_LQKJ_FDate,T1.FNUMBER,Z.FNUMBER AS F_LQKJ_OrgId --组织
+                string sql = string.Format(@"/*dialect*/SELECT REPLACE(CONVERT(VARCHAR(10), T1.FDate, 111), '-', '/') AS F_LQKJ_FDate,T1.FNUMBER,ZZ.FNAME AS F_LQKJ_OrgId --组织
+                                            ,Z.FNUMBER AS F_LQKJ_OrgBM --组织
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, T1.FSTOCKQCQTY), '0.####'), '0') AS F_LQKJ_FSTOCKQCQTY--期初数
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, T2.FSTOCKINQTY), '0.####'), '0') AS F_LQKJ_FSTOCKINQTY--入库数
                                             ,ISNULL(FORMAT(CONVERT(FLOAT, T2.FSTOCKOUTQTY), '0.####'), '0') AS F_LQKJ_FSTOCKOUTQTY--出库数
@@ -554,6 +556,7 @@ namespace LQKJ.K3.CZXT.Pluglus
                                                     SUM(CAST(T1.FSTOCKINQTY AS DECIMAL(18, 4))) AS FSTOCKINQTY, -- 收入&数量(库存)的汇总
 	                                                SUM(CAST(T1.FSTOCKOUTQTY AS DECIMAL(18, 4))) AS FSTOCKOUTQTY  -- 发出&数量(库存)的汇总
                                             FROM {0} T1
+                                            LEFT JOIN T_ORG_ORGANIZATIONS_L ZZ ON T1.FSTOCKORGID=ZZ.FORGID AND ZZ.FLOCALEID=2052--组织多语言表
                                             LEFT JOIN T_ORG_ORGANIZATIONS Z ON T1.FSTOCKORGID=Z.FORGID --组织表
                                             GROUP BY T1.FDate,Z.FNUMBER)T2 ON T1.FDate=T2.FDate AND T1.FNUMBER=T2.FNUMBER
                                             LEFT JOIN LQKJ_SettupParameters CS ON 1=1

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

@@ -502,7 +502,8 @@ namespace LQKJ.K3.CZXT.Pluglus
             // 定义报表字段名的列表 zds 列表将用于记录需要选择的字段及其相关信息（如类型、长度、名称等）
             zds = new List<CreateTmpTableZD>();
             // 添加多个字段的定义：字段名称、数据类型、长度、中文名称等
-            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKORGID", type = 2, zdcd = 500, zwName = "库存组织" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKORGID", type = 2, zdcd = 500, zwName = "库存组织名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKORGBM", type = 2, zdcd = 500, zwName = "库存组织编码" });
             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 = "物料名称" });
@@ -511,9 +512,12 @@ namespace LQKJ.K3.CZXT.Pluglus
             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 = "FSTOCKBM", 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 = "货主" });
-            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKUNITID", type = 2, zdcd = 500, zwName = "库存单位" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FOwnerId", type = 2, zdcd = 500, zwName = "货主名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FOwnerBM", type = 2, zdcd = 500, zwName = "货主编码" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKUNITID", type = 2, zdcd = 500, zwName = "库存单位名称" });
+            zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKUNITBM", type = 2, zdcd = 500, zwName = "库存单位编码" });
             zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKQCQTY", type = 3, zdcd = 4, zwName = "期初&数量(库存)" });
             zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKINQTY", type = 3, zdcd = 4, zwName = "收入&数量(库存)" });
             zds.Add(new CreateTmpTableZD() { zdName = "FSTOCKOUTQTY", type = 3, zdcd = 4, zwName = "发出&数量(库存)" });
@@ -544,9 +548,12 @@ namespace LQKJ.K3.CZXT.Pluglus
                 db.BeginInit();// 开始初始化数据表
                 // 构建最终的 SQL 查询语句
                 string sql = string.Format(@"/*dialect*/SELECT REPLACE(CONVERT(VARCHAR(10), T1.FDate, 111), '-', '/') AS F_LQKJ_FDate--日期
-,CKZZ.FNUMBER AS FSTOCKORGID--库存组织
-,HZ.FNUMBER AS FOwnerId--货主
-,CKBM.FNUMBER AS FSTOCKID--仓库名称
+,ZZ.FNAME AS FSTOCKORGID--库存组织名称
+,CKZZ.FNUMBER AS FSTOCKORGBM--库存组织编码
+,HZMC.FNAME AS FOwnerId--货主名称
+,HZ.FNUMBER AS FOwnerBM--货主编码
+,CK.FNAME AS FSTOCKID--仓库名称
+,CKBM.FNUMBER AS FSTOCKBM--仓库编码
 ,W.FNUMBER AS FMATERIALNUMBER--物料编码
 ,WL.FNAME AS FMATERIALID--物料名称
 ,ZDL.FNUMBER AS F_ORA_ASSISTANT--纸大类编码
@@ -554,7 +561,8 @@ namespace LQKJ.K3.CZXT.Pluglus
 ,XM.FNUMBER AS F_ORA_ASSISTANT1--项目编码
 ,XMM.FDATAVALUE AS F_ORA_ASSISTANT1S--项目名称
 ,T1.FOWNERTYPENAME --货主类型
-,DWBM.FNUMBER AS FSTOCKUNITID--库存单位
+,DW.FNAME AS FSTOCKUNITID--库存单位名称
+,DWBM.FNUMBER AS FSTOCKUNITBM--库存单位编码
 ,ISNULL(FORMAT(CONVERT(FLOAT,T1.FSTOCKQCQTY), '0.####'), '0') AS FSTOCKQCQTY--期初&数量(库存)
 --,ISNULL(FORMAT((T1.FSTOCKJCQTY - T1.FSTOCKINQTY + T1.FSTOCKOUTQTY), '0.##'), '0') AS FSTOCKQCQTY--期初&数量(库存)
 ,ISNULL(FORMAT(CONVERT(FLOAT, T1.FSTOCKINQTY), '0.####'), '0') AS FSTOCKINQTY--收入&数量(库存)
@@ -586,6 +594,7 @@ FROM {0} T1
 LEFT JOIN LQKJ_SettupParameters CS ON 1=1 --设置参数表
 LEFT JOIN T_ORG_ORGANIZATIONS_L ZZ ON T1.FSTOCKORGID=ZZ.FORGID AND ZZ.FLOCALEID=2052--组织多语言表
 LEFT JOIN T_ORG_ORGANIZATIONS CKZZ ON T1.FSTOCKORGID=CKZZ.FORGID--组织表
+LEFT JOIN V_TGT_OWNER_L HZMC ON T1.FOwnerId=HZMC.fid AND HZMC.FLOCALEID=2052--货主多语言表
 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