From cf032c737f9574fe308c033d7ad10a12096059fc Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 12 十月 2023 17:08:00 +0800
Subject: [PATCH] 1.模具清单功能接口(新增、修改、删除、导入) 2.模具点检项目接口(新增、修改、删除、导入) 3.存货树形基础数据接口
---
VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs | 24
VueWebCoreApi/Controllers/QualityManagementController.cs | 14
VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs | 30 +
VueWebCoreApi/Tools/ImportExcelData.cs | 421 ++++++++++++++----
VueWebCoreApi/Controllers/MouldManagerController.cs | 161 +++++++
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 30 +
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 489 ++++++++++++++++++++++
VueWebCoreApi/wwwroot/Excel/模具点检项目.xls | 0
VueWebCoreApi/ApiGroup/OpenApiGroup.cs | 20
VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs | 7
VueWebCoreApi/Tools/ExcelList.cs | 8
VueWebCoreApi/VueWebCoreApi.csproj | 1
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 56 ++
VueWebCoreApi/wwwroot/Excel/模具清单.xls | 0
VueWebCoreApi/DLL/BLL/QualityManagementBLL.cs | 7
VueWebCoreApi/Controllers/GeneralBasicDataController.cs | 14
16 files changed, 1,151 insertions(+), 131 deletions(-)
diff --git a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
index 35e8a2d..df42ce0 100644
--- a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
+++ b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
@@ -18,24 +18,26 @@
鐗╂枡绠＄悊 = 4,
[Description("璁惧绠＄悊")]
璁惧绠＄悊 = 5,
+ [Description("妯″叿绠＄悊")]
+ 妯″叿绠＄悊 = 6,
[Description("宸ュ崟绠＄悊")]
- 宸ュ崟绠＄悊 = 6,
+ 宸ュ崟绠＄悊 = 7,
[Description("缁熻鎶ヨ〃")]
- 缁熻鎶ヨ〃 = 7,
+ 缁熻鎶ヨ〃 = 8,
[Description("璐ㄩ噺绠＄悊")]
- 璐ㄩ噺绠＄悊 = 8,
+ 璐ㄩ噺绠＄悊 = 9,
[Description("鍛ㄦ湡浠诲姟")]
- 鍛ㄦ湡浠诲姟 = 9,
+ 鍛ㄦ湡浠诲姟 = 10,
[Description("绯荤粺璁剧疆")]
- 绯荤粺璁剧疆 = 10,
+ 绯荤粺璁剧疆 = 11,
[Description("閫氱敤鍩虹璧勬枡")]
- 閫氱敤鍩虹璧勬枡 = 11,
+ 閫氱敤鍩虹璧勬枡 = 12,
[Description("鐣呮嵎閫欵RP鍩虹鏁版嵁鍚屾")]
- 鐣呮嵎閫欵RP鍩虹鏁版嵁鍚屾 = 12,
+ 鐣呮嵎閫欵RP鍩虹鏁版嵁鍚屾 = 13,
[Description("Excel瀵煎叆")]
- Excel瀵煎叆 = 13,
+ Excel瀵煎叆 = 14,
[Description("鍗曟嵁鎵撳嵃")]
- 鍗曟嵁鎵撳嵃 = 14
+ 鍗曟嵁鎵撳嵃 = 15
}
}
diff --git a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
index b56d142..75cc388 100644
--- a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
+++ b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
@@ -220,5 +220,19 @@
return Json(mes);
}
#endregion
+
+ #region[瀛樿揣鏍戝瀷鍩虹璧勬枡]
+ /// <summary>
+ /// 瀛樿揣鏍戝瀷鍩虹璧勬枡
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "InventoryTreePermissions")]
+ [HttpGet]
+ public JsonResult InventoryTreePermissions()
+ {
+ mes = GeneralBasicDataBLL.InventoryTreePermissions();
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
new file mode 100644
index 0000000..beecc71
--- /dev/null
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -0,0 +1,161 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.BLL;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.Controllers
+{
+ [ApiExplorerSettings(GroupName = "妯″叿绠＄悊")]
+ [ApiController]
+ [Route("api/[controller]")]
+ //[ChannelActionFilter]
+ public class MouldManagerController : Controller
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisHelper redis = new RedisHelper();
+
+ #region[妯″叿娓呭崟鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 妯″叿娓呭崟鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="mouldstaus">妯″叿鐘舵��</param>
+ /// <param name="onstate">浣跨敤鐘舵��</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="createuser">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldMangerSearch")]
+ [HttpGet]
+ public JsonResult MouldMangerSearch(string mouldstaus = null, string onstate = null,string mouldcode=null,string mouldname=null,string mouldspec=null,string createuser=null,string createdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (createuser != "" && createuser != null)
+ {
+ opendate = createuser.Split('~')[0].ToString();
+ closedate = createuser.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldMangerSearch(mouldstaus, onstate, mouldcode, mouldname, mouldspec, createuser, opendate, closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鏂板缂栬緫]
+ /// <summary>
+ /// 妯″叿娓呭崟鏂板缂栬緫
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateMouldManger")]
+ [HttpPost]
+ public JsonResult AddUpdateMouldManger([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string mouldname = obj["mouldname"].ToString(); //妯″叿鍚嶇О
+ string mouldspec = obj["mouldspec"].ToString(); //妯″叿瑙勬牸
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string surplife = obj["surplife"].ToString(); //棰勮瀵垮懡
+ string resilife = obj["resilife"].ToString(); //鍓╀綑瀵垮懡
+ string status = obj["status"].ToString(); //妯″叿鐘舵��
+ string mouldpart = obj["mouldpart"].ToString(); //鍏宠仈浜у搧
+ string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
+ mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, surplife, resilife, status, mouldpart, opertype, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鍒犻櫎]
+ /// <summary>
+ /// 妯″叿娓呭崟鍒犻櫎
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteMouldManger")]
+ [HttpPost]
+ public JsonResult DeleteMouldManger(string mouldcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.DeleteMouldManger(mouldcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鐐规椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 妯″叿鐐规椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="checkitemcode">鐐规閮ㄤ綅缂栫爜</param>
+ /// <param name="checkitemname">鐐规閮ㄤ綅鍚嶇О</param>
+ /// <param name="checkdescr">鐐规瑕佹眰</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldCheckItemSearch")]
+ [HttpGet]
+ public JsonResult MouldCheckItemSearch(int page, int rows, string prop, string order, string checkitemcode = null, string checkitemname = null, string checkdescr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldCheckItemSearch(checkitemcode, checkitemname, checkdescr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 妯″叿鐐规椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateMouldCheckItem")]
+ [HttpPost]
+ public JsonResult AddUpdateMouldCheckItem([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string checkitemid = obj["id"].ToString(); //妯″叿鐐规椤筰d(涓婚敭)
+ string checkitemcode = obj["checkitemcode"].ToString(); //妯″叿鐐规閮ㄤ綅缂栫爜
+ string checkitemname = obj["checkitemname"].ToString(); //妯″叿鐐规閮ㄤ綅鍚嶇О
+ string checkitemdescr = obj["checkitemdescr"].ToString(); //妯″叿鐐规閮ㄤ綅瑕佹眰
+ string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
+ mes = MouldManagerBLL.AddUpdateMouldCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, us, opertype);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规椤瑰垹闄
+ /// <summary>
+ /// 妯″叿鐐规椤瑰垹闄�
+ /// </summary>
+ /// <param name="checkitemcode">妯″叿鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteMouldCheckItem")]
+ [HttpPost]
+ public JsonResult DeleteMouldCheckItem(string checkitemcode)
+ {
+ mes = MouldManagerBLL.DeleteMouldCheckItem(checkitemcode);
+ return Json(mes);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/Controllers/QualityManagementController.cs b/VueWebCoreApi/Controllers/QualityManagementController.cs
index 501a7ab..994e741 100644
--- a/VueWebCoreApi/Controllers/QualityManagementController.cs
+++ b/VueWebCoreApi/Controllers/QualityManagementController.cs
@@ -185,6 +185,20 @@
}
#endregion
+ #region[宸ュ簭璐ㄦ鏂规鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 宸ュ簭璐ㄦ鏂规鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "QualityStepCheckItemSelect")]
+ [HttpGet]
+ public JsonResult QualityStepCheckItemSelect()
+ {
+ mes = QualityManagementBLL.QualityStepCheckItemSelect();
+ return Json(mes);
+ }
+ #endregion
+
#region[宸ュ簭璐ㄦ鏂规鏂板/缂栬緫鎻愪氦]
/// <summary>
/// 宸ュ簭璐ㄦ鏂规鏂板/缂栬緫鎻愪氦
diff --git a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
index 6873359..e32b27c 100644
--- a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
@@ -115,5 +115,12 @@
return GeneralBasicDataDAL.CustomerPermissions();
}
#endregion
+
+ #region[瀛樿揣鏍戝瀷鍩虹璧勬枡]
+ public static ToMessage InventoryTreePermissions()
+ {
+ return GeneralBasicDataDAL.InventoryTreePermissions();
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
new file mode 100644
index 0000000..34d4445
--- /dev/null
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -0,0 +1,56 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.DAL;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.BLL
+{
+ public class MouldManagerBLL
+ {
+ #region[妯″叿娓呭崟鍒楄〃鏌ヨ]
+ public static ToMessage MouldMangerSearch(string mouldstaus, string onstate, string mouldcode, string mouldname, string mouldspec, string createuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ return MouldManagerDAL.MouldMangerSearch(mouldstaus, onstate, mouldcode, mouldname, mouldspec, createuser, opendate, closedate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鏂板缂栬緫]
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string warehousecode, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ {
+ return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, surplife, resilife, status, mouldpart, opertype, us);
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鍒犻櫎]
+ public static ToMessage DeleteMouldManger(string mouldcode, User us)
+ {
+ return MouldManagerDAL.DeleteMouldManger(mouldcode, us);
+ }
+ #endregion
+
+
+ #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);
+ }
+ #endregion
+
+ #region[妯″叿鐐规椤规柊澧炵紪杈慮
+ public static ToMessage AddUpdateMouldCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, User us, string opertype)
+ {
+ return MouldManagerDAL.AddUpdateMouldCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, us, opertype);
+ }
+ #endregion
+
+ #region[妯″叿鐐规椤瑰垹闄
+ public static ToMessage DeleteMouldCheckItem(string checkitemcode)
+ {
+ return MouldManagerDAL.DeleteMouldCheckItem(checkitemcode);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/DLL/BLL/QualityManagementBLL.cs b/VueWebCoreApi/DLL/BLL/QualityManagementBLL.cs
index 5d335f1..5e0448c 100644
--- a/VueWebCoreApi/DLL/BLL/QualityManagementBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/QualityManagementBLL.cs
@@ -68,6 +68,13 @@
}
#endregion
+ #region[宸ュ簭璐ㄦ鏂规鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage QualityStepCheckItemSelect()
+ {
+ return QualityManagementDAL.QualityStepCheckItemSelect();
+ }
+ #endregion
+
#region[宸ュ簭璐ㄦ鏂规鏂板/缂栬緫鎻愪氦]
public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr, string stepcode, string checkitem, string type, User us)
{
diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index 454b8e1..c8df2f4 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -62,11 +62,11 @@
case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.TwentyThree(savePath, out StuCode);
break;
- case "12"://宸ヨ娓呭崟
- Message = ImportExcelData.Twelve(savePath, out StuCode);
+ case "12"://妯″叿娓呭崟
+ Message = ImportExcelData.Twelve(dataTable, out StuCode);
break;
- case "13"://宸ヨ鐐规
- Message = ImportExcelData.Thirteen(savePath, out StuCode);
+ case "13"://妯″叿鐐规椤圭洰
+ Message = ImportExcelData.Thirteen(dataTable, out StuCode);
break;
case "14"://宸ヨ淇濆吇
Message = ImportExcelData.Fourteen(savePath, out StuCode);
@@ -160,11 +160,11 @@
case "23"://璁惧淇濆吇鏍囧噯
list = ImportExcelData.TwentyThreeData(savePath, out stuCode, out message, out count);
break;
- case "12"://宸ヨ娓呭崟
- list = ImportExcelData.TwelveData(savePath, out stuCode, out message, out count);
+ case "12"://妯″叿娓呭崟
+ list = ImportExcelData.TwelveData(dataTable, out stuCode, out message, out count);
break;
- case "13"://宸ヨ鐐规
- list = ImportExcelData.ThirteenData(savePath, out stuCode, out message, out count);
+ 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);
@@ -250,11 +250,11 @@
case "23"://璁惧淇濆吇鏍囧噯
Message = ImportExcelData.TwentyThreeSubmit(savePath, User, out StuCode);
break;
- case "12"://宸ヨ娓呭崟
- Message = ImportExcelData.TwelveSubmit(savePath, User, out StuCode);
+ case "12"://妯″叿娓呭崟
+ Message = ImportExcelData.TwelveSubmit(dataTable, us, out StuCode);
break;
- case "13"://宸ヨ鐐规
- Message = ImportExcelData.ThirteenSubmit(savePath, User, out StuCode);
+ case "13"://妯″叿鐐规椤圭洰
+ Message = ImportExcelData.ThirteenSubmit(dataTable, us, out StuCode);
break;
case "14"://宸ヨ淇濆吇
Message = ImportExcelData.FourteenSubmit(savePath, User, out StuCode);
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index 783980c..c30445c 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -436,5 +436,35 @@
return mes;
}
#endregion
+
+ #region[瀛樿揣鏍戝瀷鍩虹璧勬枡]
+ public static ToMessage InventoryTreePermissions()
+ {
+ var sql = "";
+ 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";
+ var data = DapperHelper.selectdata(sql, 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
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
new file mode 100644
index 0000000..e965a11
--- /dev/null
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -0,0 +1,489 @@
+锘縰sing Dapper;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.Models;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.DAL
+{
+ public class MouldManagerDAL
+ {
+ public static DataTable dt; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static bool res; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+ public static string strProcName = ""; //瀹氫箟鍏ㄥ眬sql鍙橀噺
+ public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
+ public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
+
+ #region[妯″叿娓呭崟鍒楄〃鏌ヨ]
+ public static ToMessage MouldMangerSearch(string mouldstaus, string onstate, string mouldcode, string mouldname, string mouldspec, string createuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldstaus != "" && mouldstaus != null)
+ {
+ search += "and A.status=@mouldstaus ";
+ dynamicParams.Add("@mouldstaus", mouldstaus);
+ }
+ if (onstate != "" && onstate != null)
+ {
+ search += "and A.usestaus=@onstate ";
+ dynamicParams.Add("@onstate", onstate);
+ }
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and A.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and A.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (createuser != "" && createuser != null)
+ {
+ search += "and U.username like '%'+@createuser+'%' ";
+ dynamicParams.Add("@createuser", createuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.status,A.usestaus,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
+ where A.code = B.mouldcode
+ FOR XML PATH('')), 1, 1, '') AS partcode,
+ A.lm_user as usercode,U.username,A.lm_date
+ from TMouldInfo A
+ left join TSecStck S on A.warehousecode=S.code
+ left join (
+ select distinct mouldcode from TMouldInfoPart
+ ) M on A.code=M.mouldcode
+ 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 AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string warehousecode, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ try
+ {
+ 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
+ {
+ str = sql,
+ parm = new
+ {
+ code = mouldcode,
+ name = mouldname,
+ spec = mouldspec,
+ status = status,
+ usestatus = "0",//浣跨敤鐘舵�侊細鍦ㄥ簱/鍑哄簱/涓婃満/涓嬫満/缁翠慨/澶栧��(0,1,2,3,4,5)
+ warehousecode = warehousecode,
+ surp_life = surplife,
+ resi_life = resilife,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍐欏叆妯″叿鍏宠仈浜у搧琛�
+ List<string> mouldParts = JsonConvert.DeserializeObject<List<string>>(mouldpart);
+ for (int i = 0; i < mouldParts.Count; i++)
+ {
+ sql = @"insert into TMouldInfoPart(mouldcode,partcode,lm_user,lm_date)
+ values(@mouldcode,@partcode,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mouldcode = mouldcode,
+ partcode = mouldParts[i].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿:" + mouldcode, 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 = @"update TMouldInfo set name=@name,spec=@spec,status=@status,warehousecode=@warehousecode,
+ surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = mouldcode,
+ name = mouldname,
+ spec = mouldspec,
+ status = status,
+ warehousecode = warehousecode,
+ surp_life = surplife,
+ resi_life = resilife,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍒犻櫎妯″叿鍏宠仈浜у搧琛�
+ sql = @"delete from TMouldInfoPart where mouldcode=@mouldcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mouldcode = mouldcode
+ }
+ });
+ //鍐欏叆妯″叿鍏宠仈浜у搧琛�
+ List<string> mouldParts = JsonConvert.DeserializeObject<List<string>>(mouldpart);
+ for (int i = 0; i < mouldParts.Count; i++)
+ {
+ sql = @"insert into TMouldInfoPart(mouldcode,partcode,lm_user,lm_date)
+ values(@mouldcode,@partcode,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mouldcode = mouldcode,
+ partcode = mouldParts[i].ToString(),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿:" + mouldcode, 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 DeleteMouldManger(string mouldcode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇妯″叿鏄惁瀛樺湪鐐规璁板綍銆佷繚鍏汇�佺淮淇�佷笂涓嬫満銆佸嚭鍏ュ簱璁板綍,涓嶅厑璁稿垹闄�
+ sql = @"select mould_code from TMouldchk_Proc_Main where mould_code=@devicecode
+ union all
+ select mould_code from TMouldmaint_Proc_Main where mould_code=@devicecode
+ union all
+ select mould_code from TMould_RepairRequest where mould_code=@devicecode";
+ dynamicParams.Add("@devicecode", mouldcode);
+ 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 TMouldInfo where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ //鍒犻櫎妯″叿鍏宠仈浜у搧琛�
+ sql = @"delete TMouldInfoPart where mouldcode=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ //鍒犻櫎妯″叿缁戝畾鐐规鏍囧噯琛�
+ sql = @"delete TMouldchk_Mould where mould_code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ //鍒犻櫎妯″叿缁戝畾淇濆吇鏍囧噯琛�
+ sql = @"delete TMouldmai_Mould where mould_code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ 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 MouldMangerSearch(string checkitemcode, string checkitemname, string checkdescr, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (checkitemcode != "" && checkitemcode != null)
+ {
+ search += "and A.code like '%'+@checkitemcode+'%' ";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ }
+ if (checkitemname != "" && checkitemname != null)
+ {
+ search += "and A.name like '%'+@checkitemname+'%' ";
+ dynamicParams.Add("@checkitemname", checkitemname);
+ }
+ if (checkdescr != "" && checkdescr != null)
+ {
+ search += "and A.description like '%'+@checkdescr+'%' ";
+ dynamicParams.Add("@checkdescr", checkdescr);
+ }
+ 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 TMouldchk_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 AddUpdateMouldCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, User us, string opertype)
+ {
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (opertype == "Add")
+ {
+ var sql = @"insert into TMouldchk_Item(code,name,description,lm_user,lm_date)
+ values(@checkitemcode,@checkitemname,@checkitemdescr,@usercode,@CreateDate)";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ dynamicParams.Add("@checkitemname", checkitemname);
+ dynamicParams.Add("@checkitemdescr", checkitemdescr);
+ dynamicParams.Add("@usercode", us.usercode);
+ 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")
+ {
+ var sql = @"update TMouldchk_Item set name=@checkitemname,description=@checkitemdescr,
+ lm_user=@usercode,lm_date=@CreateDate
+ where id=@checkitemid";
+ dynamicParams.Add("@checkitemid", checkitemid);
+ dynamicParams.Add("@checkitemname", checkitemname);
+ dynamicParams.Add("@checkitemdescr", checkitemdescr);
+ dynamicParams.Add("@usercode", us.usercode);
+ 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 DeleteMouldCheckItem(string checkitemcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍒ゆ柇鐐规鏍囧噯椤圭洰鏄惁鏈夊叧鑱旂偣妫�鏍囧噯,涓嶅厑璁稿垹闄�
+ sql = @"select * from TMouldchk_Deta
+ where code=@checkitemcode";
+ dynamicParams.Add("@checkitemcode", checkitemcode);
+ 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_Item where code=@checkitemcode";
+ list.Add(new { str = sql, parm = new { checkitemcode = checkitemcode } });
+ 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
+
+ }
+}
diff --git a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
index 070cb4c..57c9540 100644
--- a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
@@ -449,8 +449,8 @@
when A.suitobject='PY'
then
STUFF(( SELECT ';' + name
- FROM T_Dict
- where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + A.suitpart + ';')>0
+ FROM TMateriel_Class
+ where PATINDEX('%;' + RTRIM(TMateriel_Class.code) + ';%',';' + A.suitpart + ';')>0
FOR XML PATH('')), 1, 1,'')
end as suitpartname
from TStepCheckStandard A
@@ -490,6 +490,30 @@
dynamicParams.Add("@qualityinsptcode", qualityinsptcode);
var data = DapperHelper.selectdata(sql, 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 QualityStepCheckItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇宸ュ簭鐐规椤圭洰鏁版嵁
+ sql = @"select code,name,descr from TStepCheckItem";
+ var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -761,7 +785,7 @@
stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
}
//閫氳繃鎵弿浜岀淮鐮佷俊鎭煡鎵句换鍔′俊鎭�
- sql = @"select A.wo_code,A.good_qty,M.partcode,M.partname,M.partspec,M.stocktype_code,S.stepcode,S.stepname
+ sql = @"select A.wo_code,A.good_qty,M.partcode,M.partname,M.partspec,M.idinventoryclass as stocktype_code,S.stepcode,S.stepname
from TK_Wrk_Step A
inner join TK_Wrk_Man P on A.wo_code=P.wo_code
left join TMateriel_Info M on P.materiel_code=M.partcode
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index a4e754c..081886c 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -26,9 +26,11 @@
//new ScoreReport("22","璁惧鐐规鏍囧噯"),
//new ScoreReport("11","璁惧淇濆吇椤圭洰"),
//new ScoreReport("23","璁惧淇濆吇鏍囧噯"),
- //new ScoreReport("12","宸ヨ娓呭崟"),
- //new ScoreReport("13","宸ヨ鐐规"),
- //new ScoreReport("14","宸ヨ淇濆吇"),
+ new ScoreReport("12","妯″叿娓呭崟"),
+ new ScoreReport("13","妯″叿鐐规椤圭洰"),
+ new ScoreReport("13_1","妯″叿鐐规鏍囧噯"),
+ new ScoreReport("14","妯″叿淇濆吇椤圭洰"),
+ new ScoreReport("14_1","妯″叿淇濆吇鏍囧噯"),
new ScoreReport("15","宸ュ簭璁剧疆"),
//new ScoreReport("16","宸ヨ壓璺嚎"),
//new ScoreReport("24","鑺傛媿宸ヤ环"),
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index e838b33..e0724aa 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1033,52 +1033,83 @@
}
#endregion
- #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ娓呭崟妯℃澘銆�
- public static string Twelve(string FileCode, out string code)
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿娓呭崟妯℃澘銆�
+ public static string Twelve(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- DataTable excelTable = new DataTable();
- excelTable = ImportExcel.ExcelToTable(FileCode);
- if (excelTable.Columns.Count != 7)
+ if (excelTable.Count != 2)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "瀵煎叆妯℃澘涓嶇鍚堣鑼�,璇锋鏌heet鏁�";
+ return Message;
+
}
- else if (excelTable.Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns.Count != 7)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
- else if (excelTable.Columns[1].ColumnName != "宸ヨ缂栧彿(鍞竴)")
+ else if (excelTable[1].Columns.Count != 2)
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ return Message;
}
- else if (excelTable.Columns[2].ColumnName != "宸ヨ鍚嶇О锛堝敮涓�锛�")
+ else if (excelTable[0].Columns[0].ColumnName != "*妯″叿缂栧彿(鍞竴)")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*妯″叿缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable.Columns[3].ColumnName != "宸ヨ绫诲瀷")
+ else if (excelTable[1].Columns[1].ColumnName != "*妯″叿鍚嶇О")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*妯″叿鍚嶇О}";
+ return Message;
}
- else if (excelTable.Columns[4].ColumnName != "鍨嬭厰鏁伴噺")
+ else if (excelTable[1].Columns[2].ColumnName != "瑙勬牸鍨嬪彿")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑙勬牸鍨嬪彿}";
+ return Message;
}
- else if (excelTable.Columns[5].ColumnName != "鐞嗚瀵垮懡锛堟锛�")
+ else if (excelTable[1].Columns[3].ColumnName != "*鐘舵��")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
+ return Message;
}
- else if (excelTable.Columns[6].ColumnName != "浣跨敤鐘舵��")
+ else if (excelTable[1].Columns[4].ColumnName != "*浠撳簱缂栫爜")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*浠撳簱缂栫爜}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[5].ColumnName != "棰勮瀵垮懡(娆�)")
+ {
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[6].ColumnName != "鍓╀綑瀵垮懡(娆�)")
+ {
+ code = "301";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+ return Message;
+ }
+ else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
+ {
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕妯″叿缂栫爜}";
+ return Message;
+ }
+ else if (excelTable[0].Columns[1].ColumnName != "浜у搧缂栫爜")
+ {
+ code = "301";
+ Message = "妯″叿鍏宠仈浜у搧妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕浜у搧缂栫爜}";
+ return Message;
}
else
{
@@ -1089,82 +1120,41 @@
}
#endregion
- #region銆怑xcel妯℃澘涓婁紶楠岃瘉,宸ヨ鐐规妯℃澘銆�
- public static string Thirteen(string FileCode, out string code)
+ #region銆怑xcel妯℃澘涓婁紶楠岃瘉,妯″叿鐐规椤规ā鏉裤��
+ public static string Thirteen(List<DataTable> excelTable, out string code)
{
string Message = "";
code = "";
- List<DataTable> excelTable = new List<DataTable>();
- excelTable = ImportExcel.ExcelToTableList(FileCode);
- if (excelTable.Count != 2)
+ if (excelTable.Count != 1)
{
- 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[0].Columns[0].ColumnName != "*鐐规椤圭洰缂栧彿(鍞竴)")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
+ code = "301";
+ Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�1鍒楀簲涓簕*鐐规椤圭洰缂栧彿(鍞竴)}";
+ return Message;
}
- else if (excelTable[0].Columns[0].ColumnName != "搴忓彿")
+ else if (excelTable[0].Columns[1].ColumnName != "*鐐规椤圭洰鍚嶇О")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�2鍒楀簲涓簕*鐐规椤圭洰鍚嶇О}";
+ return Message;
}
- else if (excelTable[0].Columns[1].ColumnName != "鐐规鏍囧噯(鍞竴)")
+ else if (excelTable[0].Columns[2].ColumnName != "瑕佹眰鎻忚堪")
{
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[0].Columns[2].ColumnName != "鏍囧噯鍚嶇О锛堝敮涓�锛�")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[0].ColumnName != "搴忓彿")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[1].ColumnName != "鐐规鏍囧噯")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[2].ColumnName != "鏍囧噯鍚嶇О")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[3].ColumnName != "SEQ(閮ㄤ綅椤哄簭)")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[4].ColumnName != "閮ㄤ綅鏉＄爜锛堝敮涓�锛�")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[5].ColumnName != "閮ㄤ綅鍚嶇О")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[6].ColumnName != "鐐规瑕佹眰")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
- }
- else if (excelTable[1].Columns[7].ColumnName != "鐐规鍛ㄦ湡")
- {
- code = "300";
- Message = "妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚�";
+ code = "301";
+ Message = "妯″叿鐐规椤圭洰妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�3鍒楀簲涓簕瑕佹眰鎻忚堪}";
+ return Message;
}
else
{
@@ -3299,30 +3289,169 @@
}
#endregion
- #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,宸ヨ娓呭崟銆�
- public static List<ExcelErro> TwelveData(string FileCode, out string StuCode, out string message, out int count)
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿娓呭崟銆�
+ public static List<ExcelErro> TwelveData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
{
message = "";
StuCode = "";
count = 0;
string sql = "";
DataTable dt;
+ var dynamicParams = new DynamicParameters();
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 TMouldInfo 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 TMouldInfo 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);
+ }
+ }
+ }
+ //妯″叿鍏宠仈浜у搧琛�
+ for (int j = 0; j < excelTable[1].Rows.Count; j++)
+ {
+ if (excelTable[1].Rows[j][1].ToString().Trim() != null && excelTable[1].Rows[j][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TMateriel_Info where partcode=@partcode";
+ dynamicParams.Add("@partcode", excelTable[1].Rows[j][1].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[j][1].ToString().Trim() + "涓嶅瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ //鍒ゆ柇妯″叿鍏宠仈浜у搧琛ㄦ槸鍚︽湁鏁版嵁
+ if (excelTable[1].Rows.Count > 0)
+ {
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ 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> ThirteenData(string FileCode, out string StuCode, out string message, out int count)
+ #region銆怑xcel涓婁紶鏁版嵁楠岃瘉,妯″叿鐐规椤圭洰銆�
+ public static List<ExcelErro> ThirteenData(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 TMouldchk_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 TMouldchk_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[1].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
@@ -4863,14 +4992,68 @@
}
#endregion
- #region銆怑xcel鏁版嵁涓婁紶,宸ヨ娓呭崟銆�
- public static string TwelveSubmit(string FileCode, string User, out string StuCode)
+ #region銆怑xcel鏁版嵁涓婁紶,妯″叿娓呭崟銆�
+ public static string TwelveSubmit(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 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
+ {
+ str = sql,
+ parm = new
+ {
+ code = excelTable[0].Rows[k][0].ToString().Trim(),
+ name = excelTable[0].Rows[k][1].ToString().Trim(),
+ spec = excelTable[0].Rows[k][2].ToString().Trim(),
+ status = excelTable[0].Rows[k][3].ToString().Trim()=="姝ｅ父"?"Y":"N",
+ usestatus = "0",//浣跨敤鐘舵�侊細鍦ㄥ簱/鍑哄簱/涓婃満/涓嬫満/缁翠慨/澶栧��(0,1,2,3,4,5)
+ warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
+ surp_life =decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()),
+ resi_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim()),
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鍐欏叆妯″叿鍏宠仈浜у搧琛�
+ for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ {
+ sql = @"insert into TMouldInfoPart(mouldcode,partcode,lm_user,lm_date)
+ values(@mouldcode,@partcode,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mouldcode = excelTable[1].Rows[i][0].ToString().Trim(),
+ partcode = excelTable[1].Rows[i][1].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)
{
@@ -4881,14 +5064,46 @@
}
#endregion
- #region銆怑xcel鏁版嵁涓婁紶,宸ヨ鐐规銆�
- public static string ThirteenSubmit(string FileCode, string User, out string StuCode)
+ #region銆怑xcel鏁版嵁涓婁紶,妯″叿鐐规椤圭洰銆�
+ public static string ThirteenSubmit(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 TMouldchk_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)
{
diff --git a/VueWebCoreApi/VueWebCoreApi.csproj b/VueWebCoreApi/VueWebCoreApi.csproj
index a9b7f3d..1e87428 100644
--- a/VueWebCoreApi/VueWebCoreApi.csproj
+++ b/VueWebCoreApi/VueWebCoreApi.csproj
@@ -47,7 +47,6 @@
<ItemGroup>
<Folder Include="InExcel\" />
- <Folder Include="wwwroot\File\newxls\" />
<Folder Include="wwwroot\newxls\" />
</ItemGroup>
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls"
new file mode 100644
index 0000000..de60cfe
--- /dev/null
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\346\270\205\345\215\225.xls"
Binary files differ
diff --git "a/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\351\241\271\347\233\256.xls" "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\351\241\271\347\233\256.xls"
new file mode 100644
index 0000000..773ed55
--- /dev/null
+++ "b/VueWebCoreApi/wwwroot/Excel/\346\250\241\345\205\267\347\202\271\346\243\200\351\241\271\347\233\256.xls"
Binary files differ
--
Gitblit v1.9.3