From d11b595b22ae25e49e24f298ba2ca58528bda532 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 九月 2023 18:18:17 +0800
Subject: [PATCH] 正清河 仓库看板、车间综合看板接口
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/ProductModelDAL.cs | 6
VueWebApi/Controllers/KanBanManagerentController.cs | 60 ++++++++---
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 6
VueWebApi/DLL/BLL/KanBanManagerentBLL.cs | 32 ++++-
VueWebApi/Logs/2023-09-13.TXT | 0
VueWebApi/bin/VueWebApi.xml | 26 +++-
/dev/null | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 113 +++++++++++++++++++--
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 26 +++-
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ProductModelBLL.cs | 4
VueWebApi/Controllers/ProductModelController.cs | 3
17 files changed, 213 insertions(+), 64 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 0ac91d9..b97c22e 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 7e1975e..911ec36 100644
--- a/VueWebApi/Controllers/KanBanManagerentController.cs
+++ b/VueWebApi/Controllers/KanBanManagerentController.cs
@@ -155,12 +155,12 @@
}
#endregion
-
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
+
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛╙
/// <summary>
- /// 澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛�
+ /// 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛�
/// </summary>
/// <returns></returns>
[Route(template: "WareHouseTopLeftData")]
@@ -172,9 +172,9 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛╙
/// <summary>
- /// 澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛�
+ /// 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛�
/// </summary>
/// <returns></returns>
[Route(template: "WareHouseTopBottomData")]
@@ -186,9 +186,9 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
/// <summary>
- /// 澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
+ /// 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
/// </summary>
/// <returns></returns>
[Route(template: "WareHouseRightTopData")]
@@ -200,9 +200,9 @@
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
/// <summary>
- /// 澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
+ /// 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
/// </summary>
/// <returns></returns>
[Route(template: "WareHouseRightBottomData")]
@@ -216,17 +216,45 @@
- #region[杞﹂棿鐪嬫澘鍏憡]
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟]
/// <summary>
- /// 杞﹂棿鐪嬫澘鍏憡
+ /// 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟
/// </summary>
- /// <param name="shopcode">杞﹂棿缂栫爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
/// <returns></returns>
- [Route(template: "WkspReportNotice")]
- [HttpPost]
- public HttpResponseMessage WkspReportNotice(string shopcode)
+ [Route(template: "WorkShopCompreLeftTop")]
+ [HttpGet]
+ public HttpResponseMessage WorkShopCompreLeftTop(string wkshopcode)
{
- mes = KanBanManagerentBLL.WkspReportNotice(shopcode);
+ mes = KanBanManagerentBLL.WorkShopCompreLeftTop(wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗昡
+ /// <summary>
+ /// 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreRightTop")]
+ [HttpGet]
+ public HttpResponseMessage WorkShopCompreRightTop()
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreRightTop();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨]
+ /// <summary>
+ /// 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreRightBottom")]
+ [HttpGet]
+ public HttpResponseMessage WorkShopCompreRightBottom()
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreRightBottom();
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index e3cc28b..e8bd332 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -242,7 +242,6 @@
string uomcode = obj["uomcode"].ToString(); //鍗曚綅缂栫爜
string warehousecode = obj["warehousecode"].ToString(); //鎵�灞炰粨搴撶紪鐮�
string stocktypecode = obj["stocktypecode"].ToString(); //瀛樿揣绫诲瀷缂栫爜
- string materialtypecode = obj["materialtypecode"].ToString(); //鐗╂枡绫诲瀷缂栫爜
string minstockqty = obj["minstockqty"].ToString(); //鏈�灏忓簱瀛�
string maxstockqty = obj["maxstockqty"].ToString(); //鏈�澶у簱瀛�
string is_batchno = obj["is_batchno"].ToString(); //鏄惁鎵规绠＄悊
@@ -251,7 +250,7 @@
string is_outcheck = obj["is_outcheck"].ToString(); //鏄惁鍑哄巶妫�楠�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
+ mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
index 7bb1746..ad5dcc2 100644
--- a/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
+++ b/VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -75,32 +75,30 @@
}
#endregion
-
-
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛╙
public static ToMessage WareHouseTopLeftData()
{
return KanBanManagerentDAL.WareHouseTopLeftData();
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛╙
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛╙
public static ToMessage WareHouseTopBottomData()
{
return KanBanManagerentDAL.WareHouseTopBottomData();
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕]
public static ToMessage WareHouseRightTopData()
{
return KanBanManagerentDAL.WareHouseRightTopData();
}
#endregion
- #region[澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
+ #region[姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕]
public static ToMessage WareHouseRightBottomData()
{
return KanBanManagerentDAL.WareHouseRightBottomData();
@@ -108,10 +106,26 @@
#endregion
- #region[杞﹂棿鐪嬫澘鍏憡]
- public static ToMessage WkspReportNotice(string shopcode)
+
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟]
+ public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
{
- return KanBanManagerentDAL.WkspReportNotice(shopcode);
+ return KanBanManagerentDAL.WorkShopCompreLeftTop(wkshopcode);
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗昡
+ public static ToMessage WorkShopCompreRightTop()
+ {
+ return KanBanManagerentDAL.WorkShopCompreRightTop();
+ }
+ #endregion
+
+ #region[姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨]
+ public static ToMessage WorkShopCompreRightBottom()
+ {
+ return KanBanManagerentDAL.WorkShopCompreRightBottom();
}
#endregion
}
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index 6d97a6e..3cc82ee 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -85,9 +85,9 @@
#endregion
#region[瀛樿揣妗ｆ鏂板缂栬緫]
- public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
+ public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
{
- return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, is_batchno, is_fifo, is_incheck, is_outcheck, username, operType);
+ return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty, is_batchno, is_fifo, is_incheck, is_outcheck, username, operType);
}
#endregion
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 3993537..892f3c3 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -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)
{
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 773cf63..f803f51 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -568,7 +568,7 @@
#endregion
#region[瀛樿揣妗ｆ鏂板缂栬緫]
- public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
+ public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
{
var dynamicParams = new DynamicParameters();
try
@@ -594,7 +594,7 @@
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
dynamicParams.Add("@stocktypecode", stocktypecode);
- dynamicParams.Add("@materialtypecode", materialtypecode);
+ dynamicParams.Add("@materialtypecode", "");
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
dynamicParams.Add("@username", username);
@@ -630,7 +630,7 @@
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
dynamicParams.Add("@stocktypecode", stocktypecode);
- dynamicParams.Add("@materialtypecode", materialtypecode);
+ dynamicParams.Add("@materialtypecode", "");
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
dynamicParams.Add("@username", username);
diff --git a/VueWebApi/Logs/2023-09-13.TXT b/VueWebApi/Logs/2023-09-13.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-09-13.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 743a8cf..12a1f72 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -750,13 +750,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>09/12/2023 16:38:24</publishTime>
+ <publishTime>09/13/2023 18:10:18</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>09/12/2023 16:38:24</publishTime>
+ <publishTime>09/13/2023 18:10:18</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>09/12/2023 16:38:24</publishTime>
+ <publishTime>09/13/2023 18:10:18</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 6e8d60b..18ad8de 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 23156b5..32d95a4 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -2335,33 +2335,45 @@
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkspReportNotice(System.String)">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreLeftTop(System.String)">
<summary>
- 杞﹂棿鐪嬫澘鍏憡
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟
</summary>
- <param name="shopcode">杞﹂棿缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightTop">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightBottom">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index 9c03031..0000000
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
index ca643d0..c6492c4 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -459,7 +459,6 @@
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 ccf6729..e18cc38 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 6e8d60b..18ad8de 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 23156b5..32d95a4 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -2335,33 +2335,45 @@
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笂浜у搧寰呭叆搴撳垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭彂璐у垪琛�
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,宸︿笅浜у搧寰呭彂璐у垪琛�
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
<summary>
- 澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
+ 姝ｆ竻鍜屼粨搴撶湅鏉�,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkspReportNotice(System.String)">
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreLeftTop(System.String)">
<summary>
- 杞﹂棿鐪嬫澘鍏憡
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,宸︿笂鐢熶骇璁㈠崟
</summary>
- <param name="shopcode">杞﹂棿缂栫爜</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightTop">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笂閿�鍞鍗�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightBottom">
+ <summary>
+ 姝ｆ竻鍜岃溅闂寸患鍚堢湅鏉�,鍙充笅搴撳瓨
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 6e8d60b..18ad8de 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3