1

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

@@ -473,7 +473,7 @@ 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_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 = "出库数" });

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

@@ -570,8 +570,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 T_ORG_ORGANIZATIONS_L Z ON T1.FOwnerId=Z.FORGID AND Z.FLOCALEID=2052--组织多语言表
-LEFT JOIN T_ORG_ORGANIZATIONS HZ ON T1.FOwnerId=HZ.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_BD_MaterialBase JB ON JB.FMATERIALID=W.FMATERIALID
@@ -583,12 +582,10 @@ LEFT JOIN T_BD_STOCK CKBM ON T1.FSTOCKID=CKBM.FSTOCKID
 WHERE 1=1 AND (T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY !=0 OR T1.FSTOCKQCQTY != 0 OR T1.FSTOCKINQTY !=0 OR T1.FSTOCKOUTQTY!=0) {1}", receBillTable, Filter);
                 // 执行动态SQL查询并获取查询结果
                 DynamicObjectCollection dynamics = DBUtils.ExecuteDynamicObject(Context, sql);
-
                 // 创建一个新的列表，用于存储处理结果的字段名
                 List<string> dynamic = new List<string>();
                 // 遍历动态对象集合中的每一项
                 foreach (var item in dynamics)
-
                 {
                     // 创建一个新的 DataRow 用于存储每一条记录
                     DataRow dr = db.NewRow();
@@ -713,7 +710,6 @@ WHERE 1=1 AND (T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY !=0 OR T1.FSTOC
             // 返回最终的ORDER BY子句
             return OrderBy;
         }
-
         /// <summary>
         /// 设置报表头
         /// </summary>