From 7c78ddfc867ac8cf06cc911bb59977d9381deb12 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 26 七月 2024 14:20:39 +0800
Subject: [PATCH] 车间看板新增车间参数
---
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 2
VueWebCoreApi/Controllers/KanBanManagerentController.cs | 15 ++++---
VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs | 12 +++---
VueWebCoreApi.sln | 2
VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs | 53 +++++++++++++++++++-------
5 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/VueWebCoreApi.sln b/VueWebCoreApi.sln
index 9c1a0f8..a25310b 100644
--- a/VueWebCoreApi.sln
+++ b/VueWebCoreApi.sln
@@ -3,7 +3,7 @@
# Visual Studio Version 16
VisualStudioVersion = 16.0.32002.261
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VueWebCoreApi", "VueWebCoreApi\VueWebCoreApi.csproj", "{316CBE3A-CB91-4F63-AFA4-A8C533020BD7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VueWebCoreApi", "VueWebCoreApi\VueWebCoreApi.csproj", "{316CBE3A-CB91-4F63-AFA4-A8C533020BD7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/VueWebCoreApi/Controllers/KanBanManagerentController.cs b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
index 42b83f5..451429a 100644
--- a/VueWebCoreApi/Controllers/KanBanManagerentController.cs
+++ b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
@@ -109,12 +109,13 @@
/// <summary>
/// 鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "WorkShopProduceTopData")]
[HttpGet]
- public JsonResult WorkShopProduceTopData()
+ public JsonResult WorkShopProduceTopData(string wkshopcode)
{
- mes = KanBanManagerentBLL.WorkShopProduceTopData();
+ mes = KanBanManagerentBLL.WorkShopProduceTopData(wkshopcode);
return Json(mes);
}
#endregion
@@ -123,12 +124,13 @@
/// <summary>
/// 鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "WorkShopProduceBottomLeftData")]
[HttpGet]
- public JsonResult WorkShopProduceBottomLeftData()
+ public JsonResult WorkShopProduceBottomLeftData(string wkshopcode)
{
- mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData();
+ mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData(wkshopcode);
return Json(mes);
}
#endregion
@@ -137,12 +139,13 @@
/// <summary>
/// 鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "WorkShopProduceBottomRightData")]
[HttpGet]
- public JsonResult WorkShopProduceBottomRightData()
+ public JsonResult WorkShopProduceBottomRightData(string wkshopcode)
{
- mes = KanBanManagerentBLL.WorkShopProduceBottomRightData();
+ mes = KanBanManagerentBLL.WorkShopProduceBottomRightData(wkshopcode);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
index 767e0ba..e176f8a 100644
--- a/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -55,23 +55,23 @@
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
- public static ToMessage WorkShopProduceTopData()
+ public static ToMessage WorkShopProduceTopData(string wkshopcode)
{
- return KanBanManagerentDAL.WorkShopProduceTopData();
+ return KanBanManagerentDAL.WorkShopProduceTopData(wkshopcode);
}
#endregion
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
- public static ToMessage WorkShopProduceBottomLeftData()
+ public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
{
- return KanBanManagerentDAL.WorkShopProduceBottomLeftData();
+ return KanBanManagerentDAL.WorkShopProduceBottomLeftData(wkshopcode);
}
#endregion
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
- public static ToMessage WorkShopProduceBottomRightData()
+ public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
{
- return KanBanManagerentDAL.WorkShopProduceBottomRightData();
+ return KanBanManagerentDAL.WorkShopProduceBottomRightData(wkshopcode);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
index afeb0c6..b9ac68b 100644
--- a/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -153,13 +153,16 @@
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
- public static ToMessage WorkShopProduceTopData()
+ public static ToMessage WorkShopProduceTopData(string wkshopcode)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
- sql = @"select * from h_v_SFKanBan_WorkshopTop";
- var data = DapperHelper.selecttable(sql);
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_SFKanBan_WorkshopTop where wkshp_code in @wkshoplist";
+ dynamicParams.Add("@wkshoplist", wkshoplist);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -176,17 +179,25 @@
#endregion
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
- public static ToMessage WorkShopProduceBottomLeftData()
+ public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
{
string sql = "";
Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
+ //瀛樺偍杩囩▼鍚�(褰撳墠鏃堕棿寰�鍓嶄竴鍛�)
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
sql = @"h_p_SFKanBan_WorkshopBottomLeft";
- var data = DapperHelper.lissql(sql);
+ for (int i = 0; i < wkshoplist.Length; i++)
+ {
+ var dynamicParams = new DynamicParameters();
+ dynamicParams.Add("@wkshop_code", wkshoplist[i].ToString());
+ var dt = DapperHelper.selectProcedure(sql, dynamicParams);
+ dir.Add(wkshoplist[i].ToString(), dt);
+ }
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
- mes.data = data;
+ mes.data = dir;
}
catch (Exception e)
{
@@ -200,13 +211,16 @@
#endregion
#region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
- public static ToMessage WorkShopProduceBottomRightData()
+ public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
- sql = @"select * from h_v_SFKanBan_WorkshopBottomRight";
- var data = DapperHelper.selecttable(sql);
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_SFKanBan_WorkshopBottomRight where wkshp_code in @wkshoplist";
+ dynamicParams.Add("@wkshoplist", wkshoplist);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -316,12 +330,21 @@
{
sql = @"select * from h_v_SFKanBan_WorkShopCompreRightBottom";
var data = DapperHelper.selecttable(sql);
- dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
- dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
- dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
- mes.code = "200";
- mes.message = "鏌ヨ鎴愬姛!";
- mes.data = dir;
+ if (data.Rows.Count > 0)
+ {
+ dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
+ dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
+ dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ else
+ {
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = null;
+ }
}
catch (Exception e)
{
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index fa89d22..76ad447 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -179,7 +179,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select top 100 percent AA.saleOrderCode as 閿�鍞鍗曞彿,AA.m_po as 鐢熶骇璁㈠崟鍙�,AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 鐢熶骇宸ュ崟鍙�,
- AA.status as 宸ュ崟鐘舵��,AA.lm_date as 鍗曟嵁鏃ユ湡,AA.route_code as 宸ヨ壓璺嚎缂栧彿,AA.route_name as 宸ヨ壓璺嚎鍚嶇О,
+ AA.status as 宸ュ崟鐘舵��,AA.lm_date as 鍗曟嵁鏃ユ湡,
AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.plan_qty as 浠诲姟鏁伴噺,left(AA.concat_name,len(concat_name)-1) as 鐢熶骇杩涘害
from (
select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,
--
Gitblit v1.9.3