From ece3372b4f7500483092a90f2a1e40f3586f6f1b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 23 六月 2022 18:47:14 +0800
Subject: [PATCH] 存货档案、工艺路线(新增、编辑、删除、关联工艺路线)
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 23
VueWebApi/Models/StepEqp.cs | 23 +
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 7
VueWebApi/Logs/2022-06-23.TXT | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/VueWebApi.csproj | 2
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/VueWebApi.csproj.user | 2
VueWebApi/Controllers/DeviceManagerController.cs | 15
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ProductModelBLL.cs | 76 +++
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/DLL/DAL/ProductModelDAL.cs | 687 ++++++++++++++++++++++++++++++++
VueWebApi/DLL/BLL/BasicSettingBLL.cs | 4
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
VueWebApi/Models/RoutEdit.cs | 17
VueWebApi/bin/VueWebApi.xml | 118 +++++
VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt | 6
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/Controllers/BasicSettingController.cs | 6
VueWebApi/Controllers/ProductModelController.cs | 206 +++++++++
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 43 +
25 files changed, 1,190 insertions(+), 53 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 1aafff2..0c97248 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e796224..03964de 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -563,13 +563,13 @@
/// <summary>
/// 寰�鏉ュ崟浣嶅垹闄�
/// </summary>
- /// <param name="unitid">寰�鏉ュ崟浣岻D</param>
+ /// <param name="unitcode">寰�鏉ュ崟浣嶇紪鐮�</param>
/// <returns></returns>
[Route(template: "DeleteCurrentUnit")]
[HttpPost]
- public HttpResponseMessage DeleteCurrentUnit(string unitid)
+ public HttpResponseMessage DeleteCurrentUnit(string unitcode)
{
- mes = BasicSettingBLL.DeleteCurrentUnit(unitid);
+ mes = BasicSettingBLL.DeleteCurrentUnit(unitcode);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index 263c74c..c1c70fb 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -184,6 +184,21 @@
}
#endregion
+ #region[鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙
+ /// <summary>
+ /// 鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙�
+ /// </summary>
+ /// <param name="workshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WorkShopSelectLine")]
+ [HttpGet]
+ public HttpResponseMessage WorkShopSelectLine(string workshopcode)
+ {
+ mes = DeviceManagerBLL.WorkShopSelectLine(workshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[璁惧娓呭崟鏌ヨ]
/// <summary>
/// 璁惧娓呭崟鏌ヨ
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index fd161db..ab052a6 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -184,16 +184,16 @@
/// <summary>
/// 瀛樿揣妗ｆ鏌ヨ
/// </summary>
- /// <param name="partcode"></param>
- /// <param name="partname"></param>
- /// <param name="partspec"></param>
- /// <param name="stocktypecode"></param>
- /// <param name="materialtypecode"></param>
- /// <param name="storehousecode"></param>
- /// <param name="page"></param>
- /// <param name="rows"></param>
- /// <param name="prop"></param>
- /// <param name="order"></param>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="partname">鐗╂枡鍚嶇О</param>
+ /// <param name="partspec">鐗╂枡瑙勬牸</param>
+ /// <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+ /// <param name="materialtypecode">鐗╂枡绫诲瀷缂栫爜</param>
+ /// <param name="storehousecode">鎵�灞炰粨搴撶紪鐮�</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
[Route(template: "InventoryFileSelect")]
[HttpGet]
@@ -264,8 +264,192 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
-
+ /// <summary>
+ /// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
+ /// </summary>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "SaveInventoryFile")]
+ [HttpPost]
+ public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductModelBLL.SaveInventoryFile(partcode, username,json);
+ return TJson.toJson(mes);
+ }
#endregion
+
+
+
+ #region[宸ヨ壓璺嚎鏌ヨ]
+ /// <summary>
+ /// 宸ヨ壓璺嚎鏌ヨ
+ /// </summary>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
+ /// <param name="description">宸ヨ壓璺嚎鎻忚堪</param>
+ /// <param name="createuser">鍒涘缓浜哄憳</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "RouteSearch")]
+ [HttpGet]
+ public HttpResponseMessage RouteSearch(string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductModelBLL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎棰勮]
+ /// <summary>
+ /// 宸ヨ壓璺嚎棰勮
+ /// </summary>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewRoute")]
+ [HttpGet]
+ public HttpResponseMessage ViewRoute(string routecode)
+ {
+ mes = ProductModelBLL.ViewRoute(routecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鏂板]
+ /// <summary>
+ /// 宸ヨ壓璺嚎鏂板缂栬緫
+ /// </summary>
+ /// <param name="id">宸ヨ壓璺嚎id</param>
+ /// <param name="opertype">鎿嶄綔绫诲瀷(鏂板)</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateRoute")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateRoute(string id,string opertype, RoutEdit json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductModelBLL.AddUpdateRoute(id, opertype, username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鍒犻櫎]
+ /// <summary>
+ /// 宸ヨ壓璺嚎鍒犻櫎
+ /// </summary>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteRoute")]
+ [HttpPost]
+ public HttpResponseMessage DeleteRoute(string routecode)
+ {
+ mes = ProductModelBLL.DeleteRoute(routecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[宸ュ簭鏌ヨ]
+ /// <summary>
+ /// 宸ュ簭鏌ヨ
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="stepname">宸ュ簭鍚嶇О</param>
+ /// <param name="enable">鍚敤鐘舵��</param>
+ /// <param name="steptypecode">宸ュ簭绫诲瀷缂栫爜</param>
+ /// <param name="createuser">鍒涘缓浜哄憳</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "StepSearch")]
+ [HttpGet]
+ public HttpResponseMessage StepSearch(string stepcode = null, string stepname = null, string enable = null,string steptypecode=null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductModelBLL.StepSearch(stepcode, stepname, enable, steptypecode,createuser, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭鏂板缂栬緫]
+ /// <summary>
+ /// 宸ュ簭鏂板缂栬緫
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateStep")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateStep([FromBody] JObject obj)
+ {
+ string stepid = obj["id"].ToString(); //宸ュ簭id(涓婚敭)
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string stepname = obj["stepname"].ToString(); //宸ュ簭鍚嶇О
+ string steptypecode = obj["steptypecode"].ToString(); //宸ュ簭绫诲瀷缂栫爜
+ string enable = obj["enable"].ToString(); //鍚敤鐘舵��
+ string description = obj["description"].ToString(); //宸ュ簭鎻忚堪
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = ProductModelBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭鍒犻櫎]
+ /// <summary>
+ /// 宸ュ簭鍒犻櫎
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteStep")]
+ [HttpPost]
+ public HttpResponseMessage DeleteStep(string stepcode)
+ {
+ mes = ProductModelBLL.DeleteStep(stepcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "StepAssociationEqp")]
+ [HttpGet]
+ public HttpResponseMessage StepAssociationEqp(string stepcode)
+ {
+ mes = ProductModelBLL.StepAssociationEqp(stepcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveStepAssociationEqp")]
+ [HttpPost]
+ public HttpResponseMessage SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductModelBLL.SaveStepAssociationEqp(stepcode, username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebApi/DLL/BLL/BasicSettingBLL.cs b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
index a8dba0c..0c6584f 100644
--- a/VueWebApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -193,9 +193,9 @@
#endregion
#region[寰�鏉ュ崟浣嶅垹闄
- public static ToMessage DeleteCurrentUnit(string unitid)
+ public static ToMessage DeleteCurrentUnit(string unitcode)
{
- return BasicSettingDAL.DeleteCurrentUnit(unitid);
+ return BasicSettingDAL.DeleteCurrentUnit(unitcode);
}
#endregion
}
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index ae4eab9..6bab176 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -75,6 +75,13 @@
}
#endregion
+ #region[鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙
+ public static ToMessage WorkShopSelectLine(string workshopcode)
+ {
+ return DeviceManagerDAL.WorkShopSelectLine(workshopcode);
+ }
+ #endregion
+
#region [璁惧娓呭崟鏌ヨ]
public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
{
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index b6b3763..05d4a3c 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -96,5 +96,81 @@
return ProductModelDAL.InventoryFileAssociationRoute(partcode);
}
#endregion
+
+ #region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
+ public static ToMessage SaveInventoryFile(string partcode,string username, List<ObjectData> json)
+ {
+ return ProductModelDAL.SaveInventoryFile(partcode, username, json);
+ }
+ #endregion
+
+
+
+
+
+ #region[宸ヨ壓璺嚎鏌ヨ]
+ public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
+ {
+ return ProductModelDAL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎棰勮]
+ public static ToMessage ViewRoute(string routecode)
+ {
+ return ProductModelDAL.ViewRoute(routecode);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鏂板]
+ public static ToMessage AddUpdateRoute(string id,string opertype, string username, RoutEdit json)
+ {
+ return ProductModelDAL.AddUpdateRoute(id,opertype,username, json);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鍒犻櫎]
+ public static ToMessage DeleteRoute(string routecode)
+ {
+ return ProductModelDAL.DeleteRoute(routecode);
+ }
+ #endregion
+
+
+
+ #region[宸ュ簭鏌ヨ]
+ public static ToMessage StepSearch(string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
+ {
+ return ProductModelDAL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[宸ュ簭鏂板缂栬緫]
+ public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
+ {
+ return ProductModelDAL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, operType);
+ }
+ #endregion
+
+ #region[宸ュ簭鍒犻櫎]
+ public static ToMessage DeleteStep(string stepcode)
+ {
+ return ProductModelDAL.DeleteStep(stepcode);
+ }
+ #endregion
+
+ #region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
+ public static ToMessage StepAssociationEqp(string stepcode)
+ {
+ return ProductModelDAL.StepAssociationEqp(stepcode);
+ }
+ #endregion
+
+ #region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
+ public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
+ {
+ return ProductModelDAL.SaveStepAssociationEqp(stepcode,username,json);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 4a2f631..49a4858 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -1396,28 +1396,41 @@
#endregion
#region[寰�鏉ュ崟浣嶅垹闄
- public static ToMessage DeleteCurrentUnit(string unitid)
+ public static ToMessage DeleteCurrentUnit(string unitcode)
{
var sql = "";
List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
+ list.Clear();
+ sql = @"select * from TFlw_Rteqp where eqp_code=@unitcode";
+ dynamicParams.Add("@unitcode", unitcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "澶栧崗渚涙柟宸插叧鑱斿鍗忓伐搴�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
//鍒犻櫎(鏇存柊鐘舵��)寰�鏉ュ崟浣嶈〃
- sql = @"update TCustomer set is_delete='1' where id=@unitid";
- list.Add(new { str = sql, parm = new { unitid = unitid } });
+ sql = @"update TCustomer set is_delete='1' where code=@unitcode";
+ list.Add(new { str = sql, parm = new { unitcode = unitcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.Message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.Message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 1745424..8dde061 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -59,7 +59,7 @@
//寰幆鍐欏叆璁惧绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TRoleType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
+ sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
list.Add(new
{
str = sql,
@@ -112,8 +112,8 @@
//鍒ゆ柇璁惧绫诲瀷涓嬫槸鍚﹀叧鑱旇澶囩粍
sql = @"select * from TEqpGroup where eqptype_code=@devicetypecode and is_delete<>'1'";
dynamicParams.Add("@devicetypecode", devicetypecode);
- var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data.Count > 0)
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -125,8 +125,8 @@
//鍒ゆ柇璁惧鏈夋棤鍏宠仈璁惧绫诲瀷
sql = @"select * from TEqpInfo where eqptype_code=@devicetypecode and is_delete<>'1'";
dynamicParams.Add("@devicetypecode", devicetypecode);
- var data0 = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data0.Count > 0)
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -288,8 +288,8 @@
//鍒ゆ柇璁惧缁勪笅鏄惁鍏宠仈璁惧
sql = @"select * from TEqpInfo where eqpgroup_code=@devicegroupcode and is_delete<>'1'";
dynamicParams.Add("@devicegroupcode", devicegroupcode);
- var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data.Count > 0)
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -382,6 +382,33 @@
}
#endregion
+ #region[鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙
+ public static ToMessage WorkShopSelectLine(string workshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<TreeObejct> list = new List<TreeObejct>();
+ try
+ {
+ //鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
+ dynamicParams.Add("@workshop_code", workshopcode);
+ var data = DapperHelper.selectProcedure("h_p_T_WorkShopSelectLine", dynamicParams);
+
+ 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 DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
{
@@ -401,7 +428,7 @@
}
if (status != "" && status != null)
{
- search += "and A.status=@status ";
+ search += "and A.enable=@status ";
dynamicParams.Add("@status", status);
}
if (workShop != "" && workShop != null)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 336984c..f92eef6 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -265,10 +265,10 @@
{
code = json[i].code,
name = json[i].name,
- digdect=json[i].digdect,
- r_ule=json[i].r_ule,
- username= username,
- CreateDate= DateTime.Now.ToString()
+ digdect = json[i].digdect,
+ r_ule = json[i].r_ule,
+ username = username,
+ CreateDate = DateTime.Now.ToString()
}
});
}
@@ -638,7 +638,7 @@
rout.code = data.Rows[i]["CODE"].ToString();
rout.name = data.Rows[i]["NAME"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
-
+
//鏍规嵁宸ヨ壓璺嚎缂栫爜鑾峰彇鍏宠仈鐨勫伐搴忎俊鎭�
sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
inner join TStep B on A.step_code=B.stepcode
@@ -664,5 +664,682 @@
}
#endregion
+ #region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
+ public static ToMessage SaveInventoryFile(string partcode, string username, List<ObjectData> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ if (json == null || json.Count <= 0)
+ {
+ //娓呴櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛ㄦ暟鎹�
+ sql = @"delete TMateriel_Route where materiel_code=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ //鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
+ sql = @"update TMateriel_Info set proute_id='N' where partcode=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ }
+ else
+ {
+ //娓呴櫎鐢ㄦ埛鍏宠仈瑙掕壊琛ㄦ暟鎹�
+ sql = @"delete TMateriel_Route where materiel_code=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date) values(@materiel_code,@route_code,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ materiel_code = partcode,
+ route_code = json[i].code,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
+ sql = @"update TMateriel_Info set proute_id='Y' where partcode=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[宸ヨ壓璺嚎鏌ヨ]
+ public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (routecode != "" && routecode != null)
+ {
+ search += "and code like '%'+@partcode+'%' ";
+ dynamicParams.Add("@routecode", routecode);
+ }
+ if (routename != "" && routename != null)
+ {
+ search += "and name like '%'+@routename+'%' ";
+ dynamicParams.Add("@routename", routename);
+ }
+ if (description != "" && description != null)
+ {
+ search += "and description=@description ";
+ dynamicParams.Add("@description", description);
+ }
+ if (createuser != "" && createuser != null)
+ {
+ search += "and lm_user=@createuser ";
+ dynamicParams.Add("@createuser", createuser);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select code,name,description,enable,lm_user,lm_date
+ from TFlw_Rout
+ where is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎棰勮]
+ public static ToMessage ViewRoute(string routecode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<RoutEdit> list = new List<RoutEdit>();
+ try
+ {
+ //鑾峰彇宸ヨ壓璺嚎淇℃伅
+ sql = @"select code,name,description,enable
+ from TFlw_Rout
+ where code=@routecode and is_delete<>'1'";
+ dynamicParams.Add("@routecode", routecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < data.Rows.Count; i++)
+ {
+ RoutEdit rout = new RoutEdit();
+ rout.code = data.Rows[i]["CODE"].ToString();
+ rout.name = data.Rows[i]["NAME"].ToString();
+ rout.enable = data.Rows[i]["ENABLE"].ToString();
+ rout.description = data.Rows[i]["DESCRIPTION"].ToString();
+
+ //鏍规嵁宸ヨ壓璺嚎缂栫爜鑾峰彇鍏宠仈鐨勫伐搴忎俊鎭�
+ sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
+ inner join TStep B on A.step_code=B.stepcode
+ where A.rout_code=@route_code and B.is_delete<>'1' order by A.seq asc";
+ dynamicParams.Add("@route_code", rout.code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ rout.Data = data0;
+ list.Add(rout);
+
+ }
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鏂板]
+ public static ToMessage AddUpdateRoute(string id, string opertype, string username, RoutEdit json)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (opertype == "Add")
+ {
+ //鏂板宸ヨ壓璺嚎琛�
+ sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ string is_firststep = "N"; //鏄惁棣栭亾宸ュ簭
+ string is_laststep = "N"; //鏄惁鏈亾宸ュ簭
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ if (json.Data.Rows[i]["SEQ"].ToString() == "1") //鏄惁棣栭亾宸ュ簭
+ {
+ is_firststep = "Y";
+ }
+ if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //鏄惁鏈亾宸ュ簭
+ {
+ is_laststep = "Y";
+ }
+ //鏂板宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
+ sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values()";
+ list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString() } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鍒犻櫎]
+ public static ToMessage DeleteRoute(string routecode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鍒ゆ柇宸ヨ壓璺嚎鏄惁琚伐鍗曞紩鐢�(琚紩鐢ㄥ垯涓嶈兘鍒犻櫎)
+ sql = @"select * from TK_Wrk_Man where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ヨ壓璺嚎宸茶宸ュ崟寮曠敤锛屼笉鍏佽鍒犻櫎!";
+ mes.data = null;
+ }
+ else
+ {
+ //鍒ゆ柇褰撳墠宸ヨ壓璺嚎鏄惁鏈夎缃妭鎷嶅伐浠�(鏈夎缃紝鎻愮ず鍏堝垹闄よ妭鎷嶅伐浠疯缃�)
+ sql = @"select * from TPrteEqp_Stad where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ヨ壓璺嚎宸茶缃妭鎷嶅伐浠凤紝璇峰厛鍒犻櫎璁剧疆!";
+ mes.data = null;
+ }
+ else
+ {
+ //鍒犻櫎宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
+ sql = @"delete TFlw_Rtdt where rout_code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ //鍒犻櫎宸ヨ壓璺嚎琛�
+ sql = @"delete TFlw_Rout where code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ //鍒犻櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛�
+ sql = @"delete TMateriel_Route where route_code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ }
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+
+ #region[宸ュ簭鏌ヨ]
+ public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (stepcode != "" && stepcode != null)
+ {
+ search += "and stepcode like '%'+@stepcode+'%' ";
+ dynamicParams.Add("@stepcode", stepcode);
+ }
+ if (stepname != "" && stepname != null)
+ {
+ search += "and stepname like '%'+@stepname+'%' ";
+ dynamicParams.Add("@stepname", stepname);
+ }
+ if (enable != "" && enable != null)
+ {
+ search += "and enable=@enable ";
+ dynamicParams.Add("@enable", enable);
+ }
+ if (steptypecode != "" && steptypecode != null)
+ {
+ search += "and flwtype=@steptypecode ";
+ dynamicParams.Add("@steptypecode", steptypecode);
+ }
+ if (createuser != "" && createuser != null)
+ {
+ search += "and lm_user=@createuser ";
+ dynamicParams.Add("@createuser", createuser);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
+ from TStep
+ where is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭鏂板缂栬緫]
+ public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (operType == "Add")
+ {
+ var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date)
+ values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
+ dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@stepname", stepname);
+ dynamicParams.Add("@steptypecode", steptypecode);
+ dynamicParams.Add("@enable", enable);
+ dynamicParams.Add("@description", description);
+ dynamicParams.Add("@username", username);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (operType == "Update")
+ {
+ //濡傛灉褰撳墠宸ュ簭浣跨敤鐘舵�佷綅N(鏈惎鐢�),闇�鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲宸ヨ壓璺嚎琚紩鐢ㄧ殑宸ュ崟鏄惁鍏抽棴
+ if (enable == "N")
+ {
+ var sql0 = @"select * from TFlw_Rtdt A
+ inner join TK_Wrk_Man B on A.rout_code=B.route_code
+ where A.step_code=@stepcode and B.status<>'CLOSED'";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ュ簭鏈変负鎵ц瀹岀殑宸ュ崟,宸ュ簭鐘舵�佷笉鑳戒负鏈惎鐢�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+
+ var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+ lm_user=@username,lm_date=@CreateDate where id=@stepid";
+ dynamicParams.Add("@stepid", stepid);
+ dynamicParams.Add("@stepname", stepname);
+ dynamicParams.Add("@steptypecode", steptypecode);
+ dynamicParams.Add("@enable", enable);
+ dynamicParams.Add("@description", description);
+ dynamicParams.Add("@username", username);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭鍒犻櫎]
+ public static ToMessage DeleteStep(string stepcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //褰撳墠宸ュ簭鏄惁鍏宠仈宸ヨ壓璺嚎
+ sql = @"select * from TFlw_Rtdt
+ where step_code=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ュ簭宸插叧鑱斿伐鑹鸿矾绾�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍒犻櫎璁惧鑺傛媿宸ヤ环琛�
+ sql = @"delete TPrteEqp_Stad where stepcode=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ //鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
+ sql = @"delete TFlw_Rteqp where step_code=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ //鍒犻櫎缂洪櫡鍏宠仈宸ュ簭琛�
+ sql = @"update TDefect_Step where step_code=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ //鍒犻櫎宸ュ簭
+ sql = @"update TStep set is_delete='1' where partcode=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇
+ public static ToMessage StepAssociationEqp(string stepcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<StepEqp> list = new List<StepEqp>();
+ try
+ {
+ //鑾峰彇宸ヤ綔绔欓泦鍚�(杞﹂棿銆佸鍗忎緵搴斿晢,鍖呭惈宸茬粦瀹氬伐浣滅珯鏍囪瘑)
+ sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag from TOrganization T
+ left join(
+ select distinct A.eqp_code,B.wksp_code from TFlw_Rteqp A
+ inner join TEqpInfo B on A.eqp_code=B.code
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
+ UNION ALL
+ select distinct T.btype as wksp_code,(case T.btype when 'WX' then '澶栧崗渚涙柟' end ) as wksp_name,'W' as type,(case when B.btype is null then 'N' else 'Y' end) flag
+ from TCustomer T
+ left join(
+ select distinct A.eqp_code,B.btype from TFlw_Rteqp A
+ inner join TCustomer B on A.eqp_code=B.code
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on T.code=B.eqp_code where T.btype='WX' and T.is_delete<>'1'";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ for (int i = 0; i < data.Rows.Count; i++)
+ {
+ StepEqp rout = new StepEqp();
+ rout.code = data.Rows[i]["WKSP_CODE"].ToString();
+ rout.name = data.Rows[i]["WKSP_NAME"].ToString();
+ rout.type = data.Rows[i]["TYPE"].ToString();
+ rout.flag = data.Rows[i]["FLAG"].ToString();
+ rout.children = new List<StepEqpCn>();
+ if (rout.code == "WX") //澶栧崗渚涙柟
+ {
+ //鏍规嵁澶栧崗渚涙柟鏍囪瘑缂栫爜鏌ユ壘澶栧崗渚涙柟淇℃伅(鍖呭惈宸插叧鑱旀爣璇�)
+ sql = @"select A.code,A.name,'W' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ from TCustomer A
+ left join(
+ select distinct A.eqp_code from TFlw_Rteqp A
+ inner join TCustomer B on A.eqp_code=B.code
+ where B.btype=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on A.code=B.eqp_code where A.btype=@wxcode and A.is_delete<>'1'";
+ dynamicParams.Add("@wxcode", rout.code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int k = 0; k < data0.Rows.Count; k++)
+ {
+ StepEqpCn cn = new StepEqpCn();
+ cn.code = data0.Rows[k]["CODE"].ToString();//澶栧崗渚涙柟缂栫爜
+ cn.name = data0.Rows[k]["NAME"].ToString();//澶栧崗渚涙柟鍚嶇О
+ cn.type = data0.Rows[k]["TYPE"].ToString();//宸ヤ綔绔欑被鍨�(E:璁惧 W:澶栧崗渚涙柟)
+ cn.flag = data0.Rows[k]["FLAG"].ToString();//鍏宠仈鏍囪瘑
+ rout.children.Add(cn);
+ }
+ list.Add(rout);
+ }
+ else
+ {
+ //鏍规嵁杞﹂棿缂栫爜鏌ユ壘璁惧(鍖呭惈宸插叧鑱旀爣璇�)
+ sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
+ from TEqpInfo A
+ left join(
+ select distinct A.eqp_code from TFlw_Rteqp A
+ inner join TEqpInfo B on A.eqp_code=B.code
+ where B.wksp_code='W001' and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on A.code=B.eqp_code and A.is_delete<>'1'";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int j = 0; j < data0.Rows.Count; j++)
+ {
+ StepEqpCn cn = new StepEqpCn();
+ cn.code= data0.Rows[j]["CODE"].ToString();//璁惧缂栫爜
+ cn.name = data0.Rows[j]["NAME"].ToString();//璁惧鍚嶇О
+ cn.type = data0.Rows[j]["TYPE"].ToString();//宸ヤ綔绔欑被鍨�(E:璁惧 W:澶栧崗渚涙柟)
+ cn.flag = data0.Rows[j]["FLAG"].ToString();//鍏宠仈鏍囪瘑
+ rout.children.Add(cn);
+ }
+ list.Add(rout);
+ }
+ }
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region [宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜
+ public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ if (json == null || json.Count <= 0)
+ {
+ //娓呴櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃鏁版嵁
+ sql = @"delete TFlw_Rteqp where step_code=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ //鏍囪宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
+ sql = @"update TStep is_eqp='N' where stepcode=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ }
+ else
+ {
+ //娓呴櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃鏁版嵁
+ sql = @"delete TFlw_Rteqp where step_code=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ //寰幆鍐欏叆鐢ㄦ埛鍏宠仈瑙掕壊琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ eqp_code = json[i].code,
+ stepcode = stepcode,
+ style = json[i].name,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
+ sql = @"update TStep set is_eqp='Y' where stepcode=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Logs/2022-06-23.TXT b/VueWebApi/Logs/2022-06-23.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-06-23.TXT
diff --git a/VueWebApi/Models/RoutEdit.cs b/VueWebApi/Models/RoutEdit.cs
new file mode 100644
index 0000000..2550c95
--- /dev/null
+++ b/VueWebApi/Models/RoutEdit.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class RoutEdit
+ {
+ public string code { get; set; }
+ public string name { get; set; }
+ public string enable { get; set; }
+ public string description { get; set; }
+ public DataTable Data { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Models/StepEqp.cs b/VueWebApi/Models/StepEqp.cs
new file mode 100644
index 0000000..c5ae77e
--- /dev/null
+++ b/VueWebApi/Models/StepEqp.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class StepEqp
+ {
+ public string code { get; set; }
+ public string name { get; set; }
+ public string type { get; set; }
+ public string flag { get; set; }
+ public List<StepEqpCn> children { get; set; }//瀛愯妭鐐�
+ }
+ public class StepEqpCn
+ {
+ public string code { get; set; }
+ public string name { get; set; }
+ public string type { get; set; }
+ public string flag { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6450730..892adbc 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -372,13 +372,13 @@
<publishTime>11/28/2018 13:04:24</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>06/22/2022 18:15:29</publishTime>
+ <publishTime>06/23/2022 17:26:46</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>06/22/2022 18:15:29</publishTime>
+ <publishTime>06/23/2022 17:26:46</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
<publishTime>06/16/2022 14:26:01</publishTime>
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index c65ba00..bdd1c55 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -283,6 +283,8 @@
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
+ <Compile Include="Models\RoutEdit.cs" />
+ <Compile Include="Models\StepEqp.cs" />
<Compile Include="Models\TreeDG.cs" />
<Compile Include="Models\TreeDM.cs" />
<Compile Include="Models\TreeObejct.cs" />
diff --git a/VueWebApi/VueWebApi.csproj.user b/VueWebApi/VueWebApi.csproj.user
index 926c718..d9b58fe 100644
--- a/VueWebApi/VueWebApi.csproj.user
+++ b/VueWebApi/VueWebApi.csproj.user
@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 0082e0b..04e3a93 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 1b9dbaf..751c647 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -728,7 +728,7 @@
<summary>
寰�鏉ュ崟浣嶅垹闄�
</summary>
- <param name="unitid">寰�鏉ュ崟浣岻D</param>
+ <param name="unitcode">寰�鏉ュ崟浣嶇紪鐮�</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -796,6 +796,13 @@
<summary>
鎵�灞炶溅闂翠笅鎷夋帴鍙�
</summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.WorkShopSelectLine(System.String)">
+ <summary>
+ 鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙�
+ </summary>
+ <param name="workshopcode">杞﹂棿缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMangerSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -1048,16 +1055,16 @@
<summary>
瀛樿揣妗ｆ鏌ヨ
</summary>
- <param name="partcode"></param>
- <param name="partname"></param>
- <param name="partspec"></param>
- <param name="stocktypecode"></param>
- <param name="materialtypecode"></param>
- <param name="storehousecode"></param>
- <param name="page"></param>
- <param name="rows"></param>
- <param name="prop"></param>
- <param name="order"></param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="partname">鐗╂枡鍚嶇О</param>
+ <param name="partspec">鐗╂枡瑙勬牸</param>
+ <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+ <param name="materialtypecode">鐗╂枡绫诲瀷缂栫爜</param>
+ <param name="storehousecode">鎵�灞炰粨搴撶紪鐮�</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateInventoryFile(Newtonsoft.Json.Linq.JObject)">
@@ -1081,6 +1088,95 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <summary>
+ 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
+ </summary>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <summary>
+ 宸ヨ壓璺嚎鏌ヨ
+ </summary>
+ <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
+ <param name="description">宸ヨ壓璺嚎鎻忚堪</param>
+ <param name="createuser">鍒涘缓浜哄憳</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.ViewRoute(System.String)">
+ <summary>
+ 宸ヨ壓璺嚎棰勮
+ </summary>
+ <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateRoute(System.String,System.String,VueWebApi.Models.RoutEdit)">
+ <summary>
+ 宸ヨ壓璺嚎鏂板缂栬緫
+ </summary>
+ <param name="id">宸ヨ壓璺嚎id</param>
+ <param name="opertype">鎿嶄綔绫诲瀷(鏂板)</param>
+ <param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.DeleteRoute(System.String)">
+ <summary>
+ 宸ヨ壓璺嚎鍒犻櫎
+ </summary>
+ <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <summary>
+ 宸ュ簭鏌ヨ
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <param name="stepname">宸ュ簭鍚嶇О</param>
+ <param name="enable">鍚敤鐘舵��</param>
+ <param name="steptypecode">宸ュ簭绫诲瀷缂栫爜</param>
+ <param name="createuser">鍒涘缓浜哄憳</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateStep(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 宸ュ簭鏂板缂栬緫
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.DeleteStep(System.String)">
+ <summary>
+ 宸ュ簭鍒犻櫎
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
+ <summary>
+ 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <summary>
+ 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <param name="json"></param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.SystemSettingController.EncodingRules(System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
缂栫爜瑙勫垯鏌ヨ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
index d56c6eb..f5e894a 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
index 0dd1ba0..a214495 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-35bd76ae72fd355c9137f72fe96aec389f85212c
+4c18228ccc6ec1b0f1e055955b46344b14f533de
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
index d0db3af..f9e4547 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -1,6 +1,3 @@
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.dll.config
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\VueWebApi.dll
@@ -111,7 +108,10 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.pdb
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OOXML.pdb
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.xml
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\ServiceStack.Common.xml
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.xml
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index b9da3c9..04e3a93 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 0082e0b..dc24f8c 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/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 2f30b1d..f4168a8 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-facf67c0e99c52b4a568e4dc312c32889b04f076
+8846817bef2faf361bb1dae0ba7c58c4d14cfba8
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 0082e0b..dc24f8c 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3