修复BUG:资产负债表获取存货明细过虑不核算的仓库

8bc95152 · jianshuqin · 9553415e · 8bc95152
Commit 8bc95152 authored Dec 31, 2021 by jianshuqin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

FinanceReportServices.cs Bailun.DC.Services/FinanceReportServices.cs +5 -5

No files found.
--- a/Bailun.DC.Services/FinanceReportServices.cs
+++ b/Bailun.DC.Services/FinanceReportServices.cs
@@ -1821,11 +1821,11 @@ namespace Bailun.DC.Services
                    cn.Open();
                }

-                var FBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") +"'"); // +and 2=" + payid);
-                var NoFBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and hq_type!='FBA仓' and hq_type!='耗材仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
+                var FBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and warehouse_code not in ('BLDYYMS','BLRUIYUN','BLTEST') and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") +"'"); // +and 2=" + payid);
+                var NoFBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and warehouse_code not in ('BLDYYMS','BLRUIYUN','BLTEST') and hq_type!='FBA仓' and hq_type!='耗材仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);

-                var FBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
-                var NoFBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and hq_type!='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
+                var FBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and warehouse_code not in ('BLDYYMS','BLRUIYUN','BLTEST') and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
+                var NoFBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and warehouse_code not in ('BLDYYMS','BLRUIYUN','BLTEST') and hq_type!='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);

                var SemiFinishBalance = cn.QueryFirstOrDefault<decimal?>("select sum(inventory_amount) from dc_semi_daily_stock where day='" + day.ToString("yyyy-MM-dd")+"'");

@@ -1853,7 +1853,7 @@ namespace Bailun.DC.Services
                }

                var sql = "select * from dc_inventory_balance where statistical_time='" + day.ToString("yyyy-MM-dd") + "' ";// and 2=" + payid;
-
+                sql += " and warehouse_code not in ('BLDYYMS','BLRUIYUN','BLTEST') ";
                if (t == 0) //FBA在库明细
                {
                    sql += " and hq_type='FBA仓' and is_transfer=0";