From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 11:08:34 +0800
Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。
---
Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
index 9789bf9..78b2aef 100644
--- a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
@@ -60,7 +60,7 @@
{
Id = a.Id,
- CategoryNo = a.CategoryNo, //绫诲埆鍙�
+ CategoryNo = a.CategoryNo, //绫诲埆缂栫爜
CategoryName = a.CategoryName, //绫诲埆鍚嶇О
AreaNo = a.AreaNo, //鍖哄煙鍙�
@@ -202,12 +202,11 @@
var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.CategoryNo == category.CategoryNo);
//鑾峰彇鍖哄煙淇℃伅
var area = Db.Queryable<SysStorageArea>().Where(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0").ToList();
-
if (categoryInfo != null)
{
throw new Exception("褰撳墠绫诲埆淇℃伅宸茶鍒涘缓锛岃閲嶆柊濉啓淇℃伅锛�");
}
- if (area == null)
+ if (area.Count == 0)
{
throw new Exception("褰撳墠閫夋嫨鍖哄煙淇℃伅寮傚父锛岃閲嶆柊閫夋嫨鎴栬仈绯荤鐞嗗憳锛�");
}
@@ -215,7 +214,7 @@
Db.BeginTran();
SysMaterialCategory list = new SysMaterialCategory()
{
- CategoryNo = category.CategoryNo, //绫诲埆鍙�
+ CategoryNo = category.CategoryNo, //绫诲埆缂栫爜
CategoryName = category.CategoryName, //绫诲埆鍚嶇О
AreaNo = category.AreaNo, //鍖哄煙缂栫爜
@@ -256,6 +255,8 @@
string msg = "";
//鑾峰彇绫诲埆淇℃伅
var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.Id == category.Id);
+ //鑾峰彇绫诲埆瀵瑰簲鐗╂枡淇℃伅
+ var matelist = Db.Queryable<SysMaterials>().Where(a=>a.IsDel == "0" && a.CategoryNo == categoryInfo.CategoryNo).ToList();
//鑾峰彇鍖哄煙淇℃伅
var area = Db.Queryable<SysStorageArea>().First(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0");
@@ -265,16 +266,21 @@
}
Db.BeginTran();
- categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆鍙�
+ categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆缂栫爜
categoryInfo.CategoryName = category.CategoryName; //绫诲埆鍚嶇О
categoryInfo.AreaNo = category.AreaNo; //鍖哄煙缂栫爜
categoryInfo.Demo = category.Demo; //澶囨敞
categoryInfo.UpdateUser = category.CreateUser; //鏇存敼浜�
categoryInfo.UpdateTime = Db.GetDate(); //鏇存敼鏃堕棿
-
Db.Updateable(categoryInfo).ExecuteCommand();
+ foreach (var item in matelist)
+ {
+ item.CategoryNo = categoryInfo.CategoryNo;
+ }
+ Db.Updateable(matelist).ExecuteCommand();
+
Db.CommitTran();
msg = "缂栬緫绫诲埆淇℃伅鎴愬姛锛�";
--
Gitblit v1.8.0