From 54cf93766639d96ed2bdd101440d2ce9f2538e7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 12 九月 2023 18:54:44 +0800
Subject: [PATCH] 正清和质量看板接口功能 修改存货查询功能
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/ProductModelDAL.cs | 2
VueWebApi/Controllers/KanBanManagerentController.cs | 70 ++++++---
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Logs/2023-09-12.TXT | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 8
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs | 37 +++--
VueWebApi/bin/VueWebApi.xml | 32 +++-
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 201 +++++++++++++++++++---------
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 32 +++-
VueWebApi/bin/VueWebApi.pdb | 0
16 files changed, 253 insertions(+), 130 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 6b566dd..0ac91d9 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/KanBanManagerentController.cs b/VueWebApi/Controllers/KanBanManagerentController.cs
index 908c0c9..7e1975e 100644
--- a/VueWebApi/Controllers/KanBanManagerentController.cs
+++ b/VueWebApi/Controllers/KanBanManagerentController.cs
@@ -18,9 +18,9 @@
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
+ /// 姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿
/// </summary>
/// <returns></returns>
[Route(template: "ShopSearch")]
@@ -32,9 +32,9 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+ /// 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
/// </summary>
/// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
@@ -47,9 +47,9 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
+ /// 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛
/// </summary>
/// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
@@ -62,9 +62,9 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
+ /// 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛
/// </summary>
/// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
@@ -77,9 +77,9 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛]
/// <summary>
- /// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
+ /// 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛
/// </summary>
/// <param name="shopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
@@ -94,48 +94,68 @@
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁癩
+
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇]
/// <summary>
- /// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
+ /// 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
/// <returns></returns>
- [Route(template: "PurchaseLeftTop")]
+ [Route(template: "QCBadTop")]
[HttpGet]
- public HttpResponseMessage PurchaseLeftTop()
+ public HttpResponseMessage QCBadTop(string wkshopcode)
{
- mes = KanBanManagerentBLL.PurchaseLeftTop();
+ mes = KanBanManagerentBLL.QCBadTop(wkshopcode);
return TJson.toJson(mes);
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃]
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔縘
/// <summary>
- /// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃
+ /// 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
/// <returns></returns>
- [Route(template: "PurchaseLeftBottom")]
+ [Route(template: "QCBadCenterLeftWeek")]
[HttpGet]
- public HttpResponseMessage PurchaseLeftBottom()
+ public HttpResponseMessage QCBadCenterLeftWeek(string wkshopcode)
{
- mes = KanBanManagerentBLL.PurchaseLeftBottom();
+ mes = KanBanManagerentBLL.QCBadCenterLeftWeek(wkshopcode);
return TJson.toJson(mes);
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top]
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜嘳
/// <summary>
- /// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top
+ /// 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
/// <returns></returns>
- [Route(template: "PurchaseRight")]
+ [Route(template: "QCBadCenterRightWeek")]
[HttpGet]
- public HttpResponseMessage PurchaseRight()
+ public HttpResponseMessage QCBadCenterRightWeek(string wkshopcode)
{
- mes = KanBanManagerentBLL.PurchaseRight();
+ mes = KanBanManagerentBLL.QCBadCenterRightWeek(wkshopcode);
return TJson.toJson(mes);
}
#endregion
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴
+ /// <summary>
+ /// 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴�
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ /// <returns></returns>
+ [Route(template: "QCBadBottomWeek")]
+ [HttpGet]
+ public HttpResponseMessage QCBadBottomWeek(string wkshopcode)
+ {
+ mes = KanBanManagerentBLL.QCBadBottomWeek(wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
#region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
diff --git a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
index ae503fe..7bb1746 100644
--- a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
+++ b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -10,35 +10,35 @@
{
public class KanBanManagerentBLL
{
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿]
public static ToMessage ShopSearch()
{
return KanBanManagerentDAL.ShopSearch();
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
public static ToMessage LineSearchTopLeftData(string shopcode)
{
return KanBanManagerentDAL.LineSearchTopLeftData(shopcode);
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛]
public static ToMessage LineSearchBottomLeftData(string shopcode)
{
return KanBanManagerentDAL.LineSearchBottomLeftData(shopcode);
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛]
public static ToMessage LineSearchTopRightData(string shopcode)
{
return KanBanManagerentDAL.LineSearchTopRightData(shopcode);
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛]
public static ToMessage LineSearchBottomRightData(string shopcode)
{
return KanBanManagerentDAL.LineSearchBottomRightData(shopcode);
@@ -47,27 +47,36 @@
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁癩
- public static ToMessage PurchaseLeftTop()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇]
+ public static ToMessage QCBadTop(string wkshopcode)
{
- return KanBanManagerentDAL.PurchaseLeftTop();
+ return KanBanManagerentDAL.QCBadTop(wkshopcode);
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃]
- public static ToMessage PurchaseLeftBottom()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage QCBadCenterLeftWeek(string wkshopcode)
{
- return KanBanManagerentDAL.PurchaseLeftBottom();
+ return KanBanManagerentDAL.QCBadCenterLeftWeek(wkshopcode);
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top]
- public static ToMessage PurchaseRight()
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜嘳
+ public static ToMessage QCBadCenterRightWeek(string wkshopcode)
{
- return KanBanManagerentDAL.PurchaseRight();
+ return KanBanManagerentDAL.QCBadCenterRightWeek(wkshopcode);
}
#endregion
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴
+ public static ToMessage QCBadBottomWeek(string wkshopcode)
+ {
+ return KanBanManagerentDAL.QCBadBottomWeek(wkshopcode);
+ }
+ #endregion
+
+
+
#region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 5e67faf..3993537 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 = "";
@@ -70,7 +70,7 @@
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++)
@@ -149,7 +149,7 @@
}
#endregion\
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛]
public static ToMessage LineSearchBottomLeftData(string shopcode)
{
string sql = "";
@@ -185,7 +185,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
public static ToMessage LineSearchTopRightData(string shopcode)
{
string sql = "";
@@ -224,7 +224,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
+ #region[姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
public static ToMessage LineSearchBottomRightData(string shopcode)
{
string sql = "";
@@ -232,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";
@@ -256,15 +256,136 @@
#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 = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage QCBadCenterLeftWeek(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_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 = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜嘳
+ public static ToMessage QCBadCenterRightWeek(string wkshopcode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ 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 = @"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;
@@ -280,55 +401,7 @@
}
#endregion
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃]
- public static ToMessage PurchaseLeftBottom()
- {
- string sql = "";
- try
- {
- //鑾峰彇閲囪喘璁㈠崟璺熻釜鍒楄〃
- sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom ";
- var data = DapperHelper.selecttable(sql);
- mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
- }
- catch (Exception e)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = e.Message;
- mes.data = null;
- }
- return mes;
- }
- #endregion
-
- #region[閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top]
- public static ToMessage PurchaseRight()
- {
- string sql = "";
- try
- {
- //鑾峰彇閲囪喘璁㈠崟璺熻釜鍒楄〃
- sql = @"select * from h_v_DDKanBan_PurchaseRight ";
- var data = DapperHelper.selecttable(sql);
- mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
- }
- catch (Exception e)
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = e.Message;
- mes.data = null;
- }
- return mes;
- }
- #endregion
-
-
+
#region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
public static ToMessage WareHouseTopLeftData()
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 77b8ca9..773cf63 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -462,7 +462,7 @@
if (stocktypecode != "" && stocktypecode != null)
{
search0+= " where code = @stocktypecode";
- search += " and CTE.code <>@stocktypecode and CTE.iparent_id<>@stocktypecode and CTE.dict_type='CHLX' ";
+ search += " and CTE.iparent_id<>'' and CTE.dict_type='CHLX'";
dynamicParams.Add("@stocktypecode", stocktypecode);
}
if (materialtypecode != "" && materialtypecode != null)
diff --git a/VueWebApi/Logs/2023-09-12.TXT b/VueWebApi/Logs/2023-09-12.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-09-12.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 84362e6..743a8cf 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES姝ｆ竻娌�</_PublishTargetUrl>
- <History>True|2023-08-16T08:52:02.7063729Z;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
+ <History>True|2023-09-12T06:37:37.0665432Z;True|2023-08-16T16:52:02.7063729+08:00;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -750,13 +750,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>08/31/2023 16:26:21</publishTime>
+ <publishTime>09/12/2023 16:38:24</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/31/2023 16:26:21</publishTime>
+ <publishTime>09/12/2023 16:38:24</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/31/2023 16:26:21</publishTime>
+ <publishTime>09/12/2023 16:38:24</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index d5ea379..6e8d60b 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 9a04171..23156b5 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -2273,54 +2273,64 @@
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.ShopSearch">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftTop">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadTop(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftBottom">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterLeftWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseRight">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterRightWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadBottomWeek(System.String)">
+ <summary>
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴�
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..9c03031
--- /dev/null
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
index c6492c4..ca643d0 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -459,6 +459,7 @@
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES椤圭洰\MES姝ｆ竻娌砛VueWebApi\VueWebApi\obj\Debug\VueWebApi.dll
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index ac22928..ccf6729 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index d5ea379..6e8d60b 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 9a04171..23156b5 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -2273,54 +2273,64 @@
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.ShopSearch">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鑾峰彇鐢熶骇杞﹂棿
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomLeftData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,宸︿笅鍒楄〃鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchTopRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笂top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.LineSearchBottomRightData(System.String)">
<summary>
- 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
+ 姝ｆ竻鍜岃溅闂寸湅鏉�,鍙充笅top鎺掕鎺ュ彛
</summary>
<param name="shopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftTop">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadTop(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿笂top5涓嶈壇
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseLeftBottom">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterLeftWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,宸︿腑鍛ㄤ笉鑹秼鍔�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.PurchaseRight">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadCenterRightWeek(System.String)">
<summary>
- 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,鍙充腑鍛ㄥ畬鎴愭暟/鐜�
</summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.QCBadBottomWeek(System.String)">
+ <summary>
+ 姝ｆ竻鍜岃溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嬩换鍔¤繘搴�
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index 2c850c0..5c97c60 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index d5ea379..6e8d60b 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3