From d570cdca55f34f8860f48bb30c5bea5b1f61390c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 十月 2023 07:37:48 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 3993537..9724209 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -68,7 +68,7 @@
select wo_code,sum(good_qty) as good_qty,sum(ng_qty) as ng_qty,sum(bad_qty) as bad_qty from TK_Wrk_Step where isend='Y' group by wo_code
) S on P.wo_code=S.wo_code
where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'
- ) as AA where AA.plan_qty>(AA.good_qty+aa.bad_qty+AA.ng_qty)";
+ ) as AA where AA.plan_qty>=(AA.good_qty+aa.bad_qty+AA.ng_qty)";
var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
if (data0.Rows.Count > 0)
@@ -167,7 +167,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TUom U on M.uom_code=U.code
where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and B.isend='Y'
- and A.plan_qty>(B.good_qty+B.ng_qty+B.bad_qty)
+ and A.plan_qty>=(B.good_qty+B.ng_qty+B.bad_qty)
)as A ";
var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
@@ -401,9 +401,9 @@
}
#endregion
-
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
+
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛╙
public static ToMessage WareHouseTopLeftData()
{
string sql = "";
@@ -427,7 +427,7 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛╙
public static ToMessage WareHouseTopBottomData()
{
string sql = "";
@@ -451,7 +451,7 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
public static ToMessage WareHouseRightTopData()
{
string sql = "";
@@ -474,7 +474,7 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
public static ToMessage WareHouseRightBottomData()
{
string sql = "";
@@ -498,21 +498,106 @@
#endregion
- #region[杞﹂棿鐪嬫澘鍏憡]
- public static ToMessage WkspReportNotice(string shopcode)
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟]
+ public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
{
- string sql = "";
+ var sql = "";
var dynamicParams = new DynamicParameters();
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ Dictionary<object, object> dir0 = new Dictionary<object, object>();
+ Dictionary<object, object> dir1 = new Dictionary<object, object>();
try
{
- string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- //鑾峰彇杞﹂棿鍏憡淇℃伅
- sql = @"select contents from TSystemAnnouncement
- where wksp_code in @shopcode";
- var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftTop";
+ var data = DapperHelper.selecttable(sql);
+ sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftCenter";
+ var data1 = DapperHelper.selecttable(sql);
+ for (int i = 0; i < wkshoplist.Length; i++)
+ {
+ var top0 = data.AsEnumerable()
+ .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
+ .Select(group => new
+ {
+ wkshp_code = group.Field<string>("wkshp_code"),
+ plan_qty = group.Field<decimal>("plan_qty"),
+ good_qty = group.Field<decimal>("good_qty")
+ }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, good_qty = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
+ .ToList();
+ dir0.Add(wkshoplist[i].ToString(), top0);
+
+ var top1 = data1.AsEnumerable()
+ .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
+ .Select(group => new
+ {
+ wkshp_code = group.Field<string>("wkshp_code"),
+ plan_qty = group.Field<decimal>("plan_qty"),
+ quantity = group.Field<decimal>("quantity")
+ }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m,quantity = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
+ .ToList();
+ dir1.Add(wkshoplist[i].ToString(), top1);
+ }
+ dir.Add("LeftTop", dir0);
+ dir.Add("LeftBottom", dir1);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗昡
+ public static ToMessage WorkShopCompreRightTop()
+ {
+ var sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ sql = @"select * from h_v_DDKanBan_WorkShopCompreRightTop";
+ var data = DapperHelper.selecttable(sql);
+ sql = @"select * from h_v_DDKanBan_WorkShopCompreRightCenter";
+ var data1 = DapperHelper.selecttable(sql);
+ dir.Add("RightTop", data);
+ dir.Add("RightBottom", data1);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨]
+ public static ToMessage WorkShopCompreRightBottom()
+ {
+ var sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ sql = @"select * from h_v_DDKanBan_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;
}
catch (Exception e)
{
--
Gitblit v1.9.3