From ecebb28b60d49eeac50dfa3c9a812a0a221e55ae Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 13 十月 2023 16:07:49 +0800
Subject: [PATCH] 1.通用基础资料：增加模具检验项目、保养项目下拉接口 2.模具管理：点检项目、点检标准、保养项目、保养标准、导入接口
---
VueWebCoreApi/wwwroot/Excel/模具点检标准.xls | 0
VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs | 14
VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs | 30
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 114 +++
VueWebCoreApi/wwwroot/Excel/模具保养项目.xls | 0
VueWebCoreApi/Controllers/GeneralBasicDataController.cs | 28
VueWebCoreApi/Tools/ImportExcelData.cs | 667 ++++++++++++++++-
VueWebCoreApi/Controllers/MouldManagerController.cs | 281 +++++++
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 70 +
VueWebCoreApi/wwwroot/Excel/模具保养标准.xls | 0
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 972 ++++++++++++++++++++++++++
11 files changed, 2,100 insertions(+), 76 deletions(-)
diff --git a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
index 75cc388..2c48bd0 100644
--- a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
+++ b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
@@ -234,5 +234,33 @@
return Json(mes);
}
#endregion
+
+ #region[妯″叿妫�楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 妯″叿妫�楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MouldCheckItemSelect")]
+ [HttpGet]
+ public JsonResult MouldCheckItemSelect()
+ {
+ mes = GeneralBasicDataBLL.MouldCheckItemSelect();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤圭洰涓嬫媺鍒楄〃]
+ /// <summary>
+ /// 妯″叿淇濆吇椤圭洰涓嬫媺鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MouldRepairItemSelect")]
+ [HttpGet]
+ public JsonResult MouldRepairItemSelect()
+ {
+ mes = GeneralBasicDataBLL.MouldRepairItemSelect();
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index beecc71..4b9b018 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -153,7 +153,286 @@
[HttpPost]
public JsonResult DeleteMouldCheckItem(string checkitemcode)
{
- mes = MouldManagerBLL.DeleteMouldCheckItem(checkitemcode);
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.DeleteMouldCheckItem(checkitemcode,us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鐐规鏍囧噯鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="checkstandcode">鐐规鏍囧噯缂栫爜</param>
+ /// <param name="checkstandname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkstandescr">鏍囧噯瑕佹眰</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckStandArdSearch")]
+ [HttpGet]
+ public JsonResult DeviceCheckStandArdSearch(int page, int rows, string prop, string order, string checkstandcode = null, string checkstandname = null, string checkstandescr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkstandescr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="checkstand_code">妯″叿鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewMouldCheckStanedSearch")]
+ [HttpPost]
+ public JsonResult ViewMouldCheckStanedSearch(string checkstand_code)
+ {
+ mes = MouldManagerBLL.ViewMouldCheckStanedSearch(checkstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateMouldCheckStandArd")]
+ [HttpPost]
+ public JsonResult AddUpdateMouldCheckStandArd(string opertype, RoutEdit json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.AddUpdateMouldCheckStandArd(opertype, json, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="checkstand_code">妯″叿鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteMouldCheckStaned")]
+ [HttpPost]
+ public JsonResult DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.DeleteMouldCheckStaned(checkstand_code,us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鍏宠仈妯″叿鏌ヨ]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯鍏宠仈妯″叿鏌ヨ
+ /// </summary>
+ /// <param name="checkstand_code">妯″叿鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "CheckStanedAssociationMould")]
+ [HttpGet]
+ public JsonResult CheckStanedAssociationMould(string checkstand_code)
+ {
+ mes = MouldManagerBLL.CheckStanedAssociationMould(checkstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region [妯″叿鐐规鏍囧噯鍏宠仈妯″叿鎻愪氦]
+ /// <summary>
+ /// 妯″叿鐐规鏍囧噯鍏宠仈妯″叿鎻愪氦
+ /// </summary>
+ /// <param name="checkstand_code">妯″叿鐐规鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveCheckStanedAssociationMould")]
+ [HttpPost]
+ public JsonResult SaveCheckStanedAssociationMould(string checkstand_code, List<ObjectData> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.SaveCheckStanedAssociationMould(checkstand_code, us, json);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 妯″叿淇濆吇椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="maiitemcode">淇濆吇閮ㄤ綅缂栫爜</param>
+ /// <param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
+ /// <param name="maidescr">淇濆吇瑕佹眰</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldMaiItemSearch")]
+ [HttpGet]
+ public JsonResult MouldMaiItemSearch(int page, int rows, string prop, string order, string maiitemcode = null, string maiitemname = null, string maidescr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldMaiItemSearch(maiitemcode, maiitemname, maidescr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 妯″叿淇濆吇椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateMouldMaiItem")]
+ [HttpPost]
+ public JsonResult AddUpdateMouldMaiItem([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string maiitemid = obj["id"].ToString(); //妯″叿淇濆吇椤筰d(涓婚敭)
+ string maiitemcode = obj["maiitemcode"].ToString(); //妯″叿鐐规閮ㄤ綅缂栫爜
+ string maiitemname = obj["maiitemname"].ToString(); //妯″叿鐐规閮ㄤ綅鍚嶇О
+ string maiitemdescr = obj["maiitemdescr"].ToString(); //妯″叿鐐规閮ㄤ綅瑕佹眰
+ string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
+ mes = MouldManagerBLL.AddUpdateMouldMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, us, opertype);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤瑰垹闄
+ /// <summary>
+ /// 妯″叿淇濆吇椤瑰垹闄�
+ /// </summary>
+ /// <param name="maiitemcode">妯″叿淇濆吇椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteMouldMaiItem")]
+ [HttpPost]
+ public JsonResult DeleteMouldMaiItem(string maiitemcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.DeleteMouldMaiItem(maiitemcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇鏍囧噯鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="repairstandcode">淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="repairstandname">淇濆吇鏍囧噯鍚嶇О</param>
+ /// <param name="repairstandescr">淇濆噯瑕佹眰</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldRepairStandArdSearch")]
+ [HttpGet]
+ public JsonResult MouldRepairStandArdSearch(int page, int rows, string prop, string order, string repairstandcode = null, string repairstandname = null, string repairstandescr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldRepairStandArdSearch(repairstandcode, repairstandname, repairstandescr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="repairstand_code">妯″叿淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewMouldRepairStanedSearch")]
+ [HttpPost]
+ public JsonResult ViewMouldRepairStanedSearch(string repairstand_code)
+ {
+ mes = MouldManagerBLL.ViewMouldRepairStanedSearch(repairstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateMouldRepairStandArd")]
+ [HttpPost]
+ public JsonResult AddUpdateMouldRepairStandArd(string opertype, RoutEdit json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.AddUpdateMouldRepairStandArd(opertype, json, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="repairstand_code">妯″叿淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteMouldRepairStaned")]
+ [HttpPost]
+ public JsonResult DeleteMouldRepairStaned(string repairstand_code)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.DeleteMouldRepairStaned(repairstand_code, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鏌ヨ]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鏌ヨ
+ /// </summary>
+ /// <param name="repairstand_code">妯″叿淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairStanedAssociationMould")]
+ [HttpGet]
+ public JsonResult RepairStanedAssociationMould(string repairstand_code)
+ {
+ mes = MouldManagerBLL.RepairStanedAssociationMould(repairstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region [妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鎻愪氦]
+ /// <summary>
+ /// 妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鎻愪氦
+ /// </summary>
+ /// <param name="repairstand_code">妯″叿淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveRepairStanedAssociationMould")]
+ [HttpPost]
+ public JsonResult SaveRepairStanedAssociationMould(string repairstand_code, List<ObjectData> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.SaveRepairStanedAssociationMould(repairstand_code, us, json);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
index e32b27c..3b007d2 100644
--- a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
@@ -122,5 +122,19 @@
return GeneralBasicDataDAL.InventoryTreePermissions();
}
#endregion
+
+ #region[妯″叿妫�楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage MouldCheckItemSelect()
+ {
+ return GeneralBasicDataDAL.MouldCheckItemSelect();
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤圭洰涓嬫媺鍒楄〃]
+ public static ToMessage MouldRepairItemSelect()
+ {
+ return GeneralBasicDataDAL.MouldRepairItemSelect();
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index 34d4445..115578c 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -35,7 +35,7 @@
#region[妯″叿鐐规椤瑰垪琛ㄦ煡璇
public static ToMessage MouldCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, int startNum, int endNum, string prop, string order)
{
- return MouldManagerDAL.MouldMangerSearch(checkitemcode, checkitemname, checkdescr, startNum, endNum, prop, order);
+ return MouldManagerDAL.MouldCheckItemSearch(checkitemcode, checkitemname, checkdescr, startNum, endNum, prop, order);
}
#endregion
@@ -47,9 +47,117 @@
#endregion
#region[妯″叿鐐规椤瑰垹闄
- public static ToMessage DeleteMouldCheckItem(string checkitemcode)
+ public static ToMessage DeleteMouldCheckItem(string checkitemcode,User us)
{
- return MouldManagerDAL.DeleteMouldCheckItem(checkitemcode);
+ return MouldManagerDAL.DeleteMouldCheckItem(checkitemcode,us);
+ }
+ #endregion
+
+
+ #region[妯″叿鐐规鏍囧噯鍒楄〃鏌ヨ]
+ public static ToMessage DeviceCheckStandArdSearch(string checkstandcode, string checkstandname, string checkstandescr, int startNum, int endNum, string prop, string order)
+ {
+ return MouldManagerDAL.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkstandescr, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ public static ToMessage ViewMouldCheckStanedSearch(string checkstand_code)
+ {
+ return MouldManagerDAL.ViewMouldCheckStanedSearch(checkstand_code);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateMouldCheckStandArd(string opertype, RoutEdit json, User us)
+ {
+ return MouldManagerDAL.AddUpdateMouldCheckStandArd(opertype, json, us);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鍒犻櫎]
+ public static ToMessage DeleteMouldCheckStaned(string checkstand_code, User us)
+ {
+ return MouldManagerDAL.DeleteMouldCheckStaned(checkstand_code, us);
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鍏宠仈妯″叿鏌ヨ]
+ public static ToMessage CheckStanedAssociationMould(string checkstand_code)
+ {
+ return MouldManagerDAL.CheckStanedAssociationMould(checkstand_code);
+ }
+ #endregion
+
+ #region [妯″叿鐐规鏍囧噯鍏宠仈妯″叿鎻愪氦]
+ public static ToMessage SaveCheckStanedAssociationMould(string checkstand_code, User us, List<ObjectData> json)
+ {
+ return MouldManagerDAL.SaveCheckStanedAssociationMould(checkstand_code, us, json);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇椤瑰垪琛ㄦ煡璇
+ public static ToMessage MouldMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, int startNum, int endNum, string prop, string order)
+ {
+ return MouldManagerDAL.MouldMaiItemSearch(maiitemcode, maiitemname, maidescr, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateMouldMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, User us, string opertype)
+ {
+ return MouldManagerDAL.AddUpdateMouldMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, us, opertype);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇椤瑰垹闄
+ public static ToMessage DeleteMouldMaiItem(string maiitemcode, User us)
+ {
+ return MouldManagerDAL.DeleteMouldMaiItem(maiitemcode, us);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇鏍囧噯鍒楄〃鏌ヨ]
+ public static ToMessage MouldRepairStandArdSearch(string repairstandcode, string repairstandname, string repairstandescr, int startNum, int endNum, string prop, string order)
+ {
+ return MouldManagerDAL.MouldRepairStandArdSearch(repairstandcode, repairstandname, repairstandescr, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ public static ToMessage ViewMouldRepairStanedSearch(string repairstand_code)
+ {
+ return MouldManagerDAL.ViewMouldRepairStanedSearch(repairstand_code);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateMouldRepairStandArd(string opertype, RoutEdit json, User us)
+ {
+ return MouldManagerDAL.AddUpdateMouldRepairStandArd(opertype, json, us);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鍒犻櫎]
+ public static ToMessage DeleteMouldRepairStaned(string repairstand_code, User us)
+ {
+ return MouldManagerDAL.DeleteMouldRepairStaned(repairstand_code, us);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鏌ヨ]
+ public static ToMessage RepairStanedAssociationMould(string repairstand_code)
+ {
+ return MouldManagerDAL.RepairStanedAssociationMould(repairstand_code);
+ }
+ #endregion
+
+ #region [妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿鎻愪氦]
+ public static ToMessage SaveRepairStanedAssociationMould(string repairstand_code, User us, List<ObjectData> json)
+ {
+ return MouldManagerDAL.SaveRepairStanedAssociationMould(repairstand_code, us, json);
}
#endregion
}
diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index c8df2f4..54cfec8 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -68,8 +68,14 @@
case "13"://妯″叿鐐规椤圭洰
Message = ImportExcelData.Thirteen(dataTable, out StuCode);
break;
- case "14"://宸ヨ淇濆吇
- Message = ImportExcelData.Fourteen(savePath, out StuCode);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ Message = ImportExcelData.Thirteen_one(dataTable, out StuCode);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ Message = ImportExcelData.Fourteen(dataTable, out StuCode);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ Message = ImportExcelData.Fourteen_one(dataTable, out StuCode);
break;
case "15"://宸ュ簭瀹氫箟
Message = ImportExcelData.Fifteen(dataTable, out StuCode);
@@ -166,8 +172,14 @@
case "13"://妯″叿鐐规椤圭洰
list = ImportExcelData.ThirteenData(dataTable, out stuCode, out message, out count);
break;
- case "14"://宸ヨ淇濆吇
- list = ImportExcelData.FourteenData(savePath, out stuCode, out message, out count);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ list = ImportExcelData.Thirteen_oneData(dataTable, out stuCode, out message, out count);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ list = ImportExcelData.FourteenData(dataTable, out stuCode, out message, out count);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ list = ImportExcelData.FourteenData_one(dataTable, out stuCode, out message, out count);
break;
case "15"://宸ュ簭瀹氫箟
list = ImportExcelData.FifteenData(dataTable, out stuCode, out message, out count);
@@ -256,8 +268,14 @@
case "13"://妯″叿鐐规椤圭洰
Message = ImportExcelData.ThirteenSubmit(dataTable, us, out StuCode);
break;
- case "14"://宸ヨ淇濆吇
- Message = ImportExcelData.FourteenSubmit(savePath, User, out StuCode);
+ case "13_1"://妯″叿鐐规鏍囧噯
+ Message = ImportExcelData.Thirteen_oneSubmit(dataTable, us, out StuCode);
+ break;
+ case "14"://妯″叿淇濆吇椤圭洰
+ Message = ImportExcelData.FourteenSubmit(dataTable, us, out StuCode);
+ break;
+ case "14_1"://妯″叿淇濆吇鏍囧噯
+ Message = ImportExcelData.Fourteen_oneSubmit(dataTable, us, out StuCode);
break;
case "15"://宸ュ簭瀹氫箟
Message = ImportExcelData.FifteenSubmit(dataTable, us, out StuCode);
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index c30445c..1d48bc2 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -444,13 +444,21 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select AA.code,AA.name,isnull(AA.parentid,-1) as parentid from(
- select code,name,idparent as parentid from TMateriel_Class
- union all
- select partcode as code,partname as name,idinventoryclass as parentid
- from TMateriel_Info
- where status='0'
- ) as AA";
+ sql = @"WITH RecursiveCTE AS (
+ SELECT code, name, idparent
+ FROM TMateriel_Class
+ WHERE code in(select distinct idinventoryclass from TMateriel_Info where status='0')
+ UNION ALL
+ SELECT c.code, c.name, c.idparent
+ FROM TMateriel_Class c
+ INNER JOIN RecursiveCTE r ON c.code = r.idparent
+ )
+ SELECT distinct code, name, idparent as parentid
+ FROM RecursiveCTE CTE
+ union all
+ select partcode as code,partname as name,idinventoryclass as parentid
+ from TMateriel_Info
+ where status='0'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -466,5 +474,53 @@
return mes;
}
#endregion
+
+ #region[妯″叿妫�楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage MouldCheckItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇妯″叿鐐规椤圭洰鏁版嵁
+ sql = @"select code,name,description from TMouldchk_Item";
+ 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 MouldRepairItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇妯″叿淇濆吇椤圭洰鏁版嵁
+ sql = @"select code,name,description from TMouldmai_Item";
+ 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
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index e965a11..273a95e 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -34,7 +34,7 @@
}
if (onstate != "" && onstate != null)
{
- search += "and A.usestaus=@onstate ";
+ search += "and A.usestatus=@onstate ";
dynamicParams.Add("@onstate", onstate);
}
if (mouldcode != "" && mouldcode != null)
@@ -69,7 +69,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.status,A.usestaus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
+ var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
A.surp_life,'0' as serlife,A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
STUFF((SELECT ',' + B.partcode
from TMouldInfoPart B
@@ -110,7 +110,7 @@
{
if (opertype == "Add")
{
- //鍐欏叆妯″叿娓呭崟琛�
+ //鍐欏叆妯″叿娓呭崟琛�
sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date)
values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
list.Add(new
@@ -286,6 +286,8 @@
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.Message = "鍒犻櫎鎴愬姛!";
@@ -313,7 +315,7 @@
#region[妯″叿鐐规椤瑰垪琛ㄦ煡璇
- public static ToMessage MouldMangerSearch(string checkitemcode, string checkitemname, string checkdescr, int startNum, int endNum, string prop, string order)
+ public static ToMessage MouldCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -380,6 +382,8 @@
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.Message = "鏂板鎿嶄綔鎴愬姛!";
@@ -406,6 +410,8 @@
int cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.Message = "淇敼鎿嶄綔鎴愬姛!";
@@ -432,7 +438,7 @@
#endregion
#region[妯″叿鐐规椤瑰垹闄
- public static ToMessage DeleteMouldCheckItem(string checkitemcode)
+ public static ToMessage DeleteMouldCheckItem(string checkitemcode,User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -460,6 +466,8 @@
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.Message = "鍒犻櫎鎴愬姛!";
@@ -485,5 +493,959 @@
}
#endregion
+
+ #region[妯″叿鐐规鏍囧噯鍒楄〃鏌ヨ]
+ public static ToMessage DeviceCheckStandArdSearch(string checkstandcode, string checkstandname, string checkstandescr, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (checkstandcode != "" && checkstandcode != null)
+ {
+ search += "and A.code like '%'+@checkstandcode+'%' ";
+ dynamicParams.Add("@checkstandcode", checkstandcode);
+ }
+ if (checkstandname != "" && checkstandname != null)
+ {
+ search += "and A.name like '%'+@checkstandname+'%' ";
+ dynamicParams.Add("@checkstandname", checkstandname);
+ }
+ if (checkstandescr != "" && checkstandescr != null)
+ {
+ search += "and A.iscontr=@checkstandescr ";
+ dynamicParams.Add("@checkstandescr", checkstandescr);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.code,A.name,A.description,A.is_checkmould,U.username as lm_user,A.lm_date
+ from TMouldchk_Main A
+ left join TUser U on A.lm_user=U.usercode
+ where 1=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 ViewMouldCheckStanedSearch(string checkstand_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇妯″叿鐐规鏍囧噯淇℃伅
+ sql = @"select code,name,description
+ from TMouldchk_Main
+ where code=@checkstand_code";
+ dynamicParams.Add("@checkstand_code", checkstand_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ RoutEdit rout = new RoutEdit();
+ if (data.Rows.Count > 0)
+ {
+ rout.code = data.Rows[0]["CODE"].ToString();
+ rout.name = data.Rows[0]["NAME"].ToString();
+ rout.description = data.Rows[0]["DESCRIPTION"].ToString();
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+ //鏍规嵁妯″叿鐐规鏍囧噯缂栫爜鑾峰彇鍏宠仈鐨勬楠岄」鐩俊鎭�
+ sql = @"select B.code,B.name,A.chkdesc from TMouldchk_Deta A
+ left join TMouldchk_Item B on A.code=B.code
+ where A.mouldchk_main_code=@checkstaned_code order by A.seq asc";
+ dynamicParams.Add("@checkstaned_code", rout.code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ rout.Data = data0;
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = rout;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鐐规鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateMouldCheckStandArd(string opertype, RoutEdit json, User us)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (opertype == "Add")
+ {
+ //鏂板妯″叿鐐规鏍囧噯涓昏〃
+ sql = @"insert into TMouldchk_Main(code,name,description,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description,lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ //鏂板妯″叿鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
+ sql = @"insert TMouldchk_Deta (seq,code,name,mouldchk_main_code,chkdesc,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@mouldchk_main_code,@chkdesc,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ mouldchk_main_code = json.code,
+ chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
+ 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")
+ {
+ //鍒犻櫎鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ sql = @"delete from TMouldchk_Deta where mouldchk_main_code=@checkstaned_code";
+ list.Add(new { str = sql, parm = new { checkstaned_code = json.code } });
+ //淇敼鐐规鏍囧噯涓昏〃
+ sql = @"update TMouldchk_Main set name=@checkstaned_name,description=@checkstaned_desc where code=@checkstaned_code";
+ list.Add(new { str = sql, parm = new { checkstaned_code = json.code, checkstaned_name = json.name, checkstaned_desc = json.description} });
+ //鏂板鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ sql = @"insert TMouldchk_Deta (seq,code,name,mouldchk_main_code,chkdesc,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@mouldchk_main_code,@chkdesc,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ mouldchk_main_code = json.code,
+ chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
+ 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 DeleteMouldCheckStaned(string checkstand_code, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TMouldchk_Proc_Main where mouldchkmain_code=@checkstand_code";
+ dynamicParams.Add("@checkstand_code", checkstand_code);
+ 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 TMouldchk_Main where code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //鍒犻櫎妯″叿鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
+ sql = @"delete TMouldchk_Deta where mouldchk_main_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //鍒犻櫎妯″叿鐐规鏍囧噯鍏宠仈妯″叿琛�
+ sql = @"delete TMouldchk_Mould where mouldchkmain_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
+ 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 CheckStanedAssociationMould(string checkstand_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from(
+ select AA.code,AA.name,'M' as type,(case when BB.mouldchkmain_code is null then 'N' else 'Y' end) flag
+ from(
+ select A.code,A.name,'' as mouldchkmain_code
+ from TMouldInfo A
+ where A.status='Y'
+ ) as AA
+ left join (
+ select A.code,A.name,B.mouldchkmain_code
+ from TMouldInfo A
+ inner join TMouldchk_Mould B on A.code=B.mould_code
+ where B.mouldchkmain_code=@checkstand_code and A.status='Y'
+ ) as BB on AA.code=BB.code
+ ) as CC";
+ dynamicParams.Add("@checkstand_code", checkstand_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 SaveCheckStanedAssociationMould(string checkstand_code, User us, List<ObjectData> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ if (json == null || json.Count <= 0)
+ {
+ //娓呴櫎妯″叿鐐规鏍囧噯鍏宠仈妯″叿琛ㄦ暟鎹�
+ sql = @"delete TMouldchk_Mould where mouldchkmain_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //鏍囪妯″叿鐐规鏍囧噯琛ㄥ叧鑱旀ā鍏锋爣璇�
+ sql = @"update TMouldchk_Main set is_checkmould='N' where code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ }
+ else
+ {
+ //娓呴櫎妯″叿鐐规鏍囧噯鍏宠仈妯″叿琛ㄦ暟鎹�
+ sql = @"delete TMouldchk_Mould where mouldchkmain_code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ //寰幆鍐欏叆妯″叿鐐规鏍囧噯鍏宠仈妯″叿琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TMouldchk_Mould(mouldchkmain_code,mould_code,lm_user,lm_date) values(@checkstand_code,@mould_code,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = json[i].code,
+ checkstand_code = checkstand_code,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鏍囪妯″叿鐐规鏍囧噯琛ㄥ叧鑱旀ā鍏锋爣璇�
+ sql = @"update TMouldchk_Main set is_checkmould='Y' where code=@checkstand_code";
+ list.Add(new { str = sql, parm = new { checkstand_code = checkstand_code } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规鏍囧噯鍏宠仈妯″叿", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
+ 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 MouldMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (maiitemcode != "" && maiitemcode != null)
+ {
+ search += "and A.code like '%'+@maiitemcode+'%' ";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ }
+ if (maiitemname != "" && maiitemname != null)
+ {
+ search += "and A.name like '%'+@maiitemname+'%' ";
+ dynamicParams.Add("@maiitemname", maiitemname);
+ }
+ if (maidescr != "" && maidescr != null)
+ {
+ search += "and A.description like '%'+@maidescr+'%' ";
+ dynamicParams.Add("@maidescr", maidescr);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.code,A.name,A.description,U.username as lm_user,A.lm_date
+ from TMouldmai_Item A
+ left join TUser U on A.lm_user=U.usercode
+ where 1=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 AddUpdateMouldMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, User us, string opertype)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (opertype == "Add")
+ {
+ var sql = @"insert into TMouldmai_Item(code,name,description,lm_user,lm_date)
+ values(@maiitemcode,@maiitemname,@maiitemdescr,@usercode,@CreateDate)";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ dynamicParams.Add("@maiitemname", maiitemname);
+ dynamicParams.Add("@maiitemdescr", maiitemdescr);
+ dynamicParams.Add("@usercode", us.usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
+ 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")
+ {
+ var sql = @"update TMouldmai_Item set name=@maiitemname,description=@maiitemdescr,
+ lm_user=@usercode,lm_date=@CreateDate
+ where id=@maiitemid";
+ dynamicParams.Add("@maiitemid", maiitemid);
+ dynamicParams.Add("@maiitemname", maiitemname);
+ dynamicParams.Add("@maiitemdescr", maiitemdescr);
+ dynamicParams.Add("@usercode", us.usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
+ 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 DeleteMouldMaiItem(string maiitemcode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇淇濆吇鏍囧噯椤圭洰鏄惁鏈夊叧鑱斾繚鍏绘爣鍑�,涓嶅厑璁稿垹闄�
+ sql = @"select * from TMouldmai_Deta
+ where code=@checkitemcode";
+ dynamicParams.Add("@maiitemcode", maiitemcode);
+ 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 TMouldmai_Item where code=@maiitemcode";
+ list.Add(new { str = sql, parm = new { maiitemcode = maiitemcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
+ 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 MouldRepairStandArdSearch(string repairstandcode, string repairstandname, string repairstandescr, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (repairstandcode != "" && repairstandcode != null)
+ {
+ search += "and A.code like '%'+@repairstandcode+'%' ";
+ dynamicParams.Add("@repairstandcode", repairstandcode);
+ }
+ if (repairstandname != "" && repairstandname != null)
+ {
+ search += "and A.name like '%'+@repairstandname+'%' ";
+ dynamicParams.Add("@repairstandname", repairstandname);
+ }
+ if (repairstandescr != "" && repairstandescr != null)
+ {
+ search += "and A.iscontr=@repairstandescr ";
+ dynamicParams.Add("@repairstandescr", repairstandescr);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.code,A.name,A.description,A.is_repairmould,U.username as lm_user,A.lm_date
+ from TMouldmai_Main A
+ left join TUser U on A.lm_user=U.usercode
+ where 1=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 ViewMouldRepairStanedSearch(string repairstand_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇妯″叿淇濆吇鏍囧噯淇℃伅
+ sql = @"select code,name,description
+ from TMouldmai_Main
+ where code=@repairstand_code";
+ dynamicParams.Add("@repairstand_code", repairstand_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ RoutEdit rout = new RoutEdit();
+ if (data.Rows.Count > 0)
+ {
+ rout.code = data.Rows[0]["CODE"].ToString();
+ rout.name = data.Rows[0]["NAME"].ToString();
+ rout.description = data.Rows[0]["DESCRIPTION"].ToString();
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+ //鏍规嵁妯″叿淇濆吇鏍囧噯缂栫爜鑾峰彇鍏宠仈鐨勬楠岄」鐩俊鎭�
+ sql = @"select B.code,B.name,A.chkdesc from TMouldmai_Deta A
+ left join TMouldchk_Item B on A.code=B.code
+ where A.mouldmai_main_code=@repairstand_code order by A.seq asc";
+ dynamicParams.Add("@repairstand_code", rout.code);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ rout.Data = data0;
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = rout;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇鏍囧噯鏂板缂栬緫]
+ public static ToMessage AddUpdateMouldRepairStandArd(string opertype, RoutEdit json, User us)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ if (opertype == "Add")
+ {
+ //鏂板妯″叿淇濆吇鏍囧噯涓昏〃
+ sql = @"insert into TMouldmai_Main(code,name,description,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ //鏂板妯″叿淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
+ sql = @"insert TMouldmai_Deta (seq,code,name,mouldmai_main_code,chkdesc,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@mouldmai_main_code,@chkdesc,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ mouldmai_main_code=json.code,
+ chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
+ 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")
+ {
+ //鍒犻櫎淇濆吇鏍囧噯鍏宠仈淇濆吇椤圭洰瀛愯〃
+ sql = @"delete from TMouldmai_Deta where mouldmai_main_code=@repairstaned_code";
+ list.Add(new { str = sql, parm = new { repairstaned_code = json.code } });
+ //淇敼淇濆吇鏍囧噯涓昏〃
+ sql = @"update TMouldmai_Main set name=@checkstaned_name,description=@checkstaned_desc where code=@repairstaned_code";
+ list.Add(new { str = sql, parm = new { repairstaned_code = json.code, checkstaned_name = json.name, checkstaned_desc = json.description } });
+ //鏂板淇濆吇鏍囧噯鍏宠仈淇濆吇椤圭洰瀛愯〃
+ for (int i = 0; i < json.Data.Rows.Count; i++)
+ {
+ sql = @"insert TMouldmai_Deta (seq,code,name,mouldmai_main_code,chkdesc,lm_user,lm_date)
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@mouldmai_main_code,@chkdesc,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ mouldmai_main_code = json.code,
+ chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
+ 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 DeleteMouldRepairStaned(string repairstand_code, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TMouldmaint_Proc_Main where mouldmaint_code=@repairstand_code";
+ dynamicParams.Add("@repairstand_code", repairstand_code);
+ 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 TMouldmai_Main where code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //鍒犻櫎妯″叿淇濆吇鏍囧噯鍏宠仈淇濆吇椤圭洰瀛愯〃
+ sql = @"delete TMouldmai_Deta where mouldmai_main_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //鍒犻櫎妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿琛�
+ sql = @"delete TMouldmai_Mould where mouldmaimain_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
+ 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 RepairStanedAssociationMould(string repairstand_code)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from(
+ select AA.code,AA.name,'M' as type,(case when BB.mouldmaimain_code is null then 'N' else 'Y' end) flag
+ from(
+ select A.code,A.name,'' as mouldmaimain_code
+ from TMouldInfo A
+ where A.status='Y'
+ ) as AA
+ left join (
+ select A.code,A.name,B.mouldmaimain_code
+ from TMouldInfo A
+ inner join TMouldmai_Mould B on A.code=B.mould_code
+ where B.mouldmaimain_code=@repairstand_code and A.status='Y'
+ ) as BB on AA.code=BB.code
+ ) as CC";
+ dynamicParams.Add("@repairstand_code", repairstand_code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 SaveRepairStanedAssociationMould(string repairstand_code, User us, List<ObjectData> json)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ if (json == null || json.Count <= 0)
+ {
+ //娓呴櫎妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿琛ㄦ暟鎹�
+ sql = @"delete TMouldmai_Mould where mouldmaimain_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //鏍囪妯″叿淇濆吇鏍囧噯琛ㄥ叧鑱旀ā鍏锋爣璇�
+ sql = @"update TMouldmai_Main set is_repairmould='N' where code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ }
+ else
+ {
+ //娓呴櫎妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿琛ㄦ暟鎹�
+ sql = @"delete TMouldmai_Mould where mouldmaimain_code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ //寰幆鍐欏叆妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿琛�
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TMouldmai_Mould(mouldmaimain_code,mould_code,lm_user,lm_date) values(@repairstand_code,@mould_code,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = json[i].code,
+ repairstand_code = repairstand_code,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鏍囪妯″叿淇濆吇鏍囧噯琛ㄥ叧鑱旀ā鍏锋爣璇�
+ sql = @"update TMouldmai_Main set is_repairmould='Y' where code=@repairstand_code";
+ list.Add(new { str = sql, parm = new { repairstand_code = repairstand_code } });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
+ 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
+
}
}
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index e0724aa..71e7ec5 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1063,25 +1063,25 @@
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿缂栧彿(鍞竴)}";
return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "*妯″叿鍚嶇О")
+ else if (excelTable[0].Columns[1].ColumnName != "*妯″叿鍚嶇О")
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鍚嶇О}";
return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
+ else if (excelTable[0].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙勬牸鍨嬪彿}";
return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "*鐘舵��")
+ else if (excelTable[0].Columns[3].ColumnName != "*鐘舵��")
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "*浠撳簱缂栫爜")
+ else if (excelTable[0].Columns[4].ColumnName != "*浠撳簱缂栫爜")
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*浠撳簱缂栫爜}";
@@ -1105,7 +1105,7 @@
Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "浜у搧缂栫爜")
+ else if (excelTable[1].Columns[1].ColumnName != "浜у搧缂栫爜")
{
code = "301";
Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
@@ -1165,82 +1165,203 @@
}
#endregion
- #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ淇濆吇妯℃澘銆�
- public static string Fourteen(string FileCode, out string code)
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿鐐规鏍囧噯妯℃澘銆�
+ public static string Thirteen_one(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
if (excelTable.Count != 2)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,缂哄け鐨凷heet";
+ code = "301";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
else if (excelTable[0].Columns.Count != 3)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ code = "301";
+ Message = "妯″叿鐐规鏍囧噯妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
- else if (excelTable[1].Columns.Count != 8)
+ else if (excelTable[1].Columns.Count != 5)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
- else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "淇濆吇鏍囧噯(鍞竴)")
+ else if (excelTable[0].Columns[1].ColumnName != "*妯″叿鐐规鏍囧噯鍚嶇О")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鐐规鏍囧噯鍚嶇О}";
+ return Message;
}
- else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
+ else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鎻忚堪")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鐐规鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
+ return Message;
}
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[1].Columns[0].ColumnName != "*妯″叿鐐规鏍囧噯缂栧彿")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿鐐规鏍囧噯缂栧彿}";
+ return Message;
}
- else if (excelTable[1].Columns[1].ColumnName != "淇濆吇鏍囧噯")
+ else if (excelTable[1].Columns[1].ColumnName != "*鐐规椤瑰簭鍙�")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤瑰簭鍙穧";
+ return Message;
}
- else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
+ else if (excelTable[1].Columns[2].ColumnName != "*妯″叿鐐规椤圭紪鍙�(鍞竴)")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+ return Message;
}
- else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
+ else if (excelTable[1].Columns[3].ColumnName != "*妯″叿鐐规椤瑰悕绉�")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*妯″叿鐐规椤瑰悕绉皚";
+ return Message;
}
- else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉＄爜锛堝敮涓�锛�")
+ else if (excelTable[1].Columns[4].ColumnName != "鐐规椤硅姹�")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "鍏宠仈妯″叿鐐规閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕鐐规椤硅姹倉";
+ return Message;
}
- else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
+ else
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "200";
+ Message = "妯℃澘妫�楠岄�氳繃";
}
- else if (excelTable[1].Columns[6].ColumnName != "淇濆吇瑕佹眰")
+ return Message;
+ }
+ #endregion
+
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿淇濆吇椤规ā鏉裤��
+ public static string Fourteen(List<DataTable> excelTable, out string code)
+ {
+ string Message = "";
+ code = "";
+ if (excelTable.Count != 1)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
- else if (excelTable[1].Columns[7].ColumnName != "淇濆吇绛夌骇")
+ else if (excelTable[0].Columns.Count != 3)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
+ }
+ else if (excelTable[0].Columns[0].ColumnName != "*淇濆吇椤圭洰缂栧彿(鍞竴)")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*淇濆吇椤圭洰缂栧彿(鍞竴)}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[1].ColumnName != "*淇濆吇椤圭洰鍚嶇О")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*淇濆吇椤圭洰鍚嶇О}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[2].ColumnName != "瑕佹眰鎻忚堪")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑕佹眰鎻忚堪}";
+ return Message;
+ }
+ else
+ {
+ code = "200";
+ Message = "妯℃澘妫�楠岄�氳繃";
+ }
+ return Message;
+ }
+ #endregion
+
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿淇濆吇鏍囧噯妯℃澘銆�
+ public static string Fourteen_one(List<DataTable> excelTable, out string code)
+ {
+ string Message = "";
+ code = "";
+ if (excelTable.Count != 2)
+ {
+ code = "301";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
+ }
+ else if (excelTable[0].Columns.Count != 3)
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇鏍囧噯妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
+ }
+ else if (excelTable[1].Columns.Count != 5)
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
+ }
+ else if (excelTable[0].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[1].ColumnName != "*妯″叿淇濆吇鏍囧噯鍚嶇О")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯鍚嶇О}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鎻忚堪")
+ {
+ code = "301";
+ Message = "妯″叿淇濆吇鏍囧噯妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕鏍囧噯鎻忚堪}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[0].ColumnName != "*妯″叿淇濆吇鏍囧噯缂栧彿")
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿淇濆吇鏍囧噯缂栧彿}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[1].ColumnName != "*淇濆吇椤瑰簭鍙�")
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*淇濆吇椤瑰簭鍙穧";
+ return Message;
+ }
+ else if (excelTable[1].Columns[2].ColumnName != "*妯″叿淇濆吇椤圭紪鍙�(鍞竴)")
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[3].ColumnName != "*妯″叿淇濆吇椤瑰悕绉�")
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*妯″叿淇濆吇椤瑰悕绉皚";
+ return Message;
+ }
+ else if (excelTable[1].Columns[4].ColumnName != "淇濆吇椤硅姹�")
+ {
+ code = "301";
+ Message = "鍏宠仈妯″叿淇濆吇閮ㄤ綅妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕淇濆吇椤硅姹倉";
+ return Message;
}
else
{
@@ -3430,7 +3551,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*鐐规椤圭洰鍚嶇О}";
- erro.ErrorCont = "妯″叿鐐规椤圭洰琛�:{*鐐规椤圭洰鍚嶇О}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorCont = "妯″叿鐐规椤圭洰琛�:{*鐐规椤圭洰鍚嶇О}瀛楁" + excelTable[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
@@ -3456,16 +3577,282 @@
}
#endregion
- #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ヨ淇濆吇銆�
- public static List<ExcelErro> FourteenData(string FileCode, out string StuCode, out string message, out int count)
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿鐐规鏍囧噯銆�
+ public static List<ExcelErro> Thirteen_oneData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
{
message = "";
StuCode = "";
count = 0;
string sql = "";
+ var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ //妯″叿鐐规鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪鐐规鏍囧噯
+ for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ {
+ if (excelTable[0].Rows[j][0].ToString().Trim() != null && excelTable[0].Rows[j][0].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldchk_Main where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[j][0].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "妯″叿鐐规鏍囧噯琛�:{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+ list.Add(erro);
+ }
+ //閫氳繃妯″叿鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿鐐规椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+ if (ds.Rows.Count > 0)
+ {
+ //鍒ゆ柇鐐规鏍囧噯鏌ヨ鐐规椤规暟鎹槸鍚︽湁閲嶅
+ DataTable distinct1 = ds.DefaultView.ToTable(true, "*妯″叿鐐规椤圭紪鍙�(鍞竴)");
+ if (distinct1.Rows.Count != ds.Rows.Count)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿鐐规椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+ list.Add(erro);
+ }
+ }
+ else
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏风偣妫�鏍囧噯椤电妯℃澘涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ }
+ }
+ //褰撳墠Excel鏁版嵁涓偣妫�椤归〉绛句腑,妯″叿鐐规椤圭紪鍙�(鍞竴)鍦ㄦā鍏风偣妫�閮ㄤ綅琛ㄤ腑鏄惁瀛樺湪
+ for (int k = 0; k < excelTable[1].Rows.Count; k++)
+ {
+ if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldchk_Item where code=@code";
+ dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count < 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ }
+ }
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ var dt3 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
+ ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿"))
+ select r;
+ List<DataRow> listRow = dt3.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿鐐规鏍囧噯缂栧彿}";
+ erro.ErrorCont = "妯″叿鐐规椤归〉绛炬ā鏉�:{*妯″叿鐐规鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪妯″叿鐐规鏍囧噯椤电妯℃澘:{*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ }
+ return list;
+ }
+ #endregion
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿淇濆吇椤圭洰銆�
+ public static List<ExcelErro> FourteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
+ {
+ message = "";
+ StuCode = "";
+ count = 0;
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ DataTable dt;
+ List<ExcelErro> list = new List<ExcelErro>();
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ //妯″叿淇濆吇椤圭洰琛�
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
+ {
+ if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldmai_Item where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[k][0].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*淇濆吇椤圭洰缂栧彿(鍞竴)}";
+ erro.ErrorCont = "妯″叿淇濆吇椤圭洰:{*淇濆吇椤圭洰缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[k][0].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldmai_Item where name=@name";
+ dynamicParams.Add("@name", excelTable[0].Rows[k][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*淇濆吇椤圭洰鍚嶇О}";
+ erro.ErrorCont = "妯″叿淇濆吇椤圭洰琛�:{*淇濆吇椤圭洰鍚嶇О}瀛楁" + excelTable[0].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable[0].Rows.Count;
+ }
+ return list;
+ }
+ #endregion
+
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿淇濆吇鏍囧噯銆�
+ public static List<ExcelErro> FourteenData_one(List<DataTable> excelTable, out string StuCode, out string message, out int count)
+ {
+ message = "";
+ StuCode = "";
+ count = 0;
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ DataTable dt;
+ List<ExcelErro> list = new List<ExcelErro>();
+ list = ImportExcel.InportExcelToTableListErro(excelTable); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ //妯″叿淇濆吇鏍囧噯琛ㄦ槸鍚﹀凡瀛樺湪淇濆吇鏍囧噯
+ for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ {
+ if (excelTable[0].Rows[j][0].ToString().Trim() != null && excelTable[0].Rows[j][0].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldmai_Main where code=@code";
+ dynamicParams.Add("@code", excelTable[0].Rows[j][0].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}";
+ erro.ErrorCont = "妯″叿淇濆吇鏍囧噯琛�:{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}瀛楁" + excelTable[0].Rows[j][0].ToString().Trim() + "鍦ㄦ暟鎹〃涓凡瀛樺湪";
+ list.Add(erro);
+ }
+ //閫氳繃妯″叿淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿淇濆吇椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
+ if (ds.Rows.Count > 0)
+ {
+ //鍒ゆ柇淇濆吇鏍囧噯鏌ヨ淇濆吇椤规暟鎹槸鍚︽湁閲嶅
+ DataTable distinct1 = ds.DefaultView.ToTable(true, "*妯″叿淇濆吇椤圭紪鍙�(鍞竴)");
+ if (distinct1.Rows.Count != ds.Rows.Count)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 瀵瑰簲{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}鏈夐噸澶�";
+ list.Add(erro);
+ }
+ }
+ else
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}:" + excelTable[1].Rows[j][0].ToString().Trim() + " 鍦ㄦā鍏蜂繚鍏绘爣鍑嗛〉绛炬ā鏉夸腑涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ //褰撳墠Excel鏁版嵁涓繚鍏婚」椤电涓�,妯″叿淇濆吇椤圭紪鍙�(鍞竴)鍦ㄦā鍏蜂繚鍏婚儴浣嶈〃涓槸鍚﹀瓨鍦�
+ for (int k = 0; k < excelTable[1].Rows.Count; k++)
+ {
+ if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
+ {
+ sql = @"select * from TMouldmai_Item where code=@code";
+ dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count < 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
+ erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ }
+ }
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ var dt3 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
+ ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿"))
+ select r;
+ List<DataRow> listRow = dt3.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{*妯″叿淇濆吇鏍囧噯缂栧彿}";
+ erro.ErrorCont = "妯″叿淇濆吇椤归〉绛炬ā鏉�:{*妯″叿淇濆吇鏍囧噯缂栧彿}瀛楁涓湁鍊煎湪妯″叿淇濆吇鏍囧噯椤电妯℃澘:{*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)}涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "301";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ }
return list;
}
#endregion
@@ -5114,14 +5501,186 @@
}
#endregion
- #region銆怑xcel鏁版嵁涓婁紶,宸ヨ淇濆吇銆�
- public static string FourteenSubmit(string FileCode, string User, out string StuCode)
+ #region銆怑xcel鏁版嵁涓婁紶,妯″叿鐐规鏍囧噯銆�
+ public static string Thirteen_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
{
string message = "";
StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
+ list.Clear();
+ //瀵煎叆妯″叿鐐规鏍囧噯涓昏〃
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
+ {
+ sql = @"insert into TMouldchk_Main(code,name,description,lm_user,lm_date)
+ values(@code,@name,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable[0].Rows[k][0].ToString().Trim(),
+ name = excelTable[0].Rows[k][1].ToString().Trim(),
+ description = excelTable[0].Rows[k][2].ToString().Trim(),
+ CreateDate = DateTime.Now.ToString(),
+ Operator = us.usercode
+ }
+ });
+ }
+ //瀵煎叆妯″叿鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
+ for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ {
+ sql = @"insert into TMouldchk_Deta(seq,code,name,mouldchk_main_code,chkdesc,lm_user,lm_date)
+ values(@seq,@code,@name,@mouldchk_main_code,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ seq = excelTable[1].Rows[i][1].ToString().Trim(),
+ code = excelTable[1].Rows[i][2].ToString().Trim(),
+ name = excelTable[1].Rows[i][3].ToString().Trim(),
+ mouldchk_main_code = excelTable[1].Rows[i][0].ToString().Trim(),
+ description = excelTable[1].Rows[i][4].ToString().Trim(),
+ Operator = us.usercode,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
+ }
+ catch (Exception e)
+ {
+ StuCode = "300";
+ message = e.Message;
+ }
+ return message;
+ }
+ #endregion
+ #region銆怑xcel鏁版嵁涓婁紶,妯″叿淇濆吇椤圭洰銆�
+ public static string FourteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
+ {
+ string message = "";
+ StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //瀵煎叆妯″叿淇濆吇椤圭洰琛�
+ for (int i = 0; i < excelTable[0].Rows.Count; i++)
+ {
+ sql = @"insert into TMouldmai_Item(code,name,description,lm_user,lm_date)
+ values(@code,@name,@description,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable[0].Rows[i][0].ToString().Trim(),
+ name = excelTable[0].Rows[i][1].ToString().Trim(),
+ description = excelTable[0].Rows[i][2].ToString().Trim(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
+ }
+ catch (Exception e)
+ {
+ StuCode = "300";
+ message = e.Message;
+ }
+ return message;
+ }
+ #endregion
+
+ #region銆怑xcel鏁版嵁涓婁紶,妯″叿淇濆吇鏍囧噯銆�
+ public static string Fourteen_oneSubmit(List<DataTable> excelTable, User us, out string StuCode)
+ {
+ string message = "";
+ StuCode = "";
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //瀵煎叆妯″叿淇濆吇鏍囧噯涓昏〃
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
+ {
+ sql = @"insert into TMouldmai_Main(code,name,description,lm_user,lm_date)
+ values(@code,@name,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable[0].Rows[k][0].ToString().Trim(),
+ name = excelTable[0].Rows[k][1].ToString().Trim(),
+ description = excelTable[0].Rows[k][2].ToString().Trim(),
+ CreateDate = DateTime.Now.ToString(),
+ Operator = us.usercode
+ }
+ });
+ }
+ //瀵煎叆妯″叿淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
+ for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ {
+ sql = @"insert into TMouldmai_Deta(seq,code,name,mouldmai_main_code,chkdesc,lm_user,lm_date)
+ values(@seq,@code,@name,@mouldmai_main_code,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ seq = excelTable[1].Rows[i][1].ToString().Trim(),
+ code = excelTable[1].Rows[i][2].ToString().Trim(),
+ name = excelTable[1].Rows[i][3].ToString().Trim(),
+ mouldmai_main_code = excelTable[1].Rows[i][0].ToString().Trim(),
+ description = excelTable[1].Rows[i][4].ToString().Trim(),
+ Operator = us.usercode,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
+ else
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
}
catch (Exception e)
{
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls"
new file mode 100644
index 0000000..4899676
--- /dev/null
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\351\241\271\347\233\256.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\351\241\271\347\233\256.xls"
new file mode 100644
index 0000000..0bb2474
--- /dev/null
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\344\277\235\345\205\273\351\241\271\347\233\256.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls"
new file mode 100644
index 0000000..552b8c6
--- /dev/null
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\346\240\207\345\207\206.xls"
Binary files differ
--
Gitblit v1.9.3