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 | 254 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 209 insertions(+), 45 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 3e09e6f..9724209 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -20,7 +20,7 @@
public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿]
public static ToMessage ShopSearch()
{
string sql = "";
@@ -46,7 +46,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
public static ToMessage LineSearchTopLeftData(string shopcode)
{
string sql = "";
@@ -58,14 +58,19 @@
{
string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
//鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
- sql = @"select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TK_Wrk_Record A
+ sql = @"select * from (
+ select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,S.good_qty,S.ng_qty,S.bad_qty from TK_Wrk_Record A
inner join TK_Wrk_Man P on A.wo_code=P.wo_code
left join TMateriel_Info M on P.materiel_code=M.partcode
left join TUom T on M.uom_code=T.code
left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
- where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'";
+ left join (
+ 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)";
var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
-
+
if (data0.Rows.Count > 0)
{
for (int j = 0; j < data0.Rows.Count; j++)
@@ -144,7 +149,7 @@
}
#endregion\
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛]
public static ToMessage LineSearchBottomLeftData(string shopcode)
{
string sql = "";
@@ -162,6 +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)
)as A ";
var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
@@ -179,7 +185,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
public static ToMessage LineSearchTopRightData(string shopcode)
{
string sql = "";
@@ -199,7 +205,7 @@
select C.name as linename,'' as wkshname,M.partname,A.sqty as good_qty from TK_Wrk_OutRecord A
inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
inner join TMateriel_Info M on A.materiel_code=M.partcode
- inner join TCustomer C on A.wx_code=C.code and C.btype='WX'
+ inner join TCustomer C on A.wx_code=C.code
where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
) as A group by A.org_name,A.name,A.partname order by good_qty desc";
var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
@@ -218,7 +224,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
public static ToMessage LineSearchBottomRightData(string shopcode)
{
string sql = "";
@@ -226,12 +232,12 @@
string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
try
{
- //鑾峰彇鎶ュ伐涓嶈壇top5淇℃伅
- sql = @"select isnull(COUNT(B.name),0) cont,B.name
+ //鑾峰彇鎶ュ伐涓嶈壇娆℃暟top5淇℃伅
+ sql = @"select B.name, COUNT(*) as cont
from CSR_WorkRecord_Defect A
- inner join TDefect B on A.defect_code=B.code
+ inner join TDefect B on CHARINDEX(',' + B.code + ',', ',' + A.defect_code + ',') > 0
inner join TK_Wrk_Man M on A.wo_code=M.wo_code
- where DateDiff(dd,A.lm_date,getdate())<=7 and M.wkshp_code in @shopcode
+ where M.wkshp_code in @shopcode
group by B.name order by cont desc";
var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
@@ -250,18 +256,40 @@
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁癩
- public static ToMessage PurchaseLeftTop()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,top5涓嶈壇]
+ public static ToMessage QCBadTop(string wkshopcode)
{
- string sql = "";
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- //鑾峰彇鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
- sql = @"select * from h_v_DDKanBan_PurchaseLeftTop ";
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_DDKanBan_QCBadTop";
var data = DapperHelper.selecttable(sql);
+
+ var top = data.AsEnumerable().GroupBy(row => row.Field<string>("name"))
+ .Select(group => new
+ {
+ name = group.Key,
+ cont = group.Sum(row => row.Field<int>("cont"))
+ }).ToList();
+ dir.Add("ALL", top);
+ for (int i = 0; i < wkshoplist.Length; i++)
+ {
+ var top0 = data.AsEnumerable()
+ .Where(row => row.Field<string>("wkshp_code")== wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
+ .GroupBy(row =>row.Field<string>("name"))
+ .Select(group => new
+ {
+ name = group.Key,
+ cont = group.Sum(row => row.Field<int>("cont"))
+ }).ToList();
+ dir.Add(wkshoplist[i].ToString(), top0);
+ }
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
+ mes.data = dir;
}
catch (Exception e)
{
@@ -274,18 +302,28 @@
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃]
- public static ToMessage PurchaseLeftBottom()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage QCBadCenterLeftWeek(string wkshopcode)
{
string sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- //鑾峰彇閲囪喘璁㈠崟璺熻釜鍒楄〃
- sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom ";
- var data = DapperHelper.selecttable(sql);
+ //瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍛ㄤ笉鑹秼鍔�(褰撳墠鏃堕棿寰�鍓嶄竴鍛�)
+ //瀛樺偍杩囩▼鍚�
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"h_p_KanBan_QCBadCenterLeft";
+ 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)
{
@@ -298,15 +336,56 @@
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top]
- public static ToMessage PurchaseRight()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜嘳
+ public static ToMessage QCBadCenterRightWeek(string wkshopcode)
{
- string sql = "";
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- //鑾峰彇閲囪喘璁㈠崟璺熻釜鍒楄〃
- sql = @"select * from h_v_DDKanBan_PurchaseRight ";
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_DDKanBan_QCBadCenterRight";
var data = 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"),
+ radio = group.Field<decimal>("radio")
+ }).ToList();
+ dir.Add(wkshoplist[i].ToString(), top0);
+ }
+ 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 QCBadBottomWeek(string wkshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_DDKanBan_QCBadBottom where wkshp_code in @wkshoplist";
+ dynamicParams.Add("@wkshoplist", wkshoplist);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -324,14 +403,14 @@
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛╙
public static ToMessage WareHouseTopLeftData()
{
string sql = "";
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopLeft order by voucherdate";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -348,14 +427,14 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛╙
public static ToMessage WareHouseTopBottomData()
{
string sql = "";
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopBottom order by voucherdate";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -372,7 +451,7 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
public static ToMessage WareHouseRightTopData()
{
string sql = "";
@@ -395,7 +474,7 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
public static ToMessage WareHouseRightBottomData()
{
string sql = "";
@@ -419,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