From 37b39b9748eaaa7900271d83a94698299d53fed4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 18 十月 2023 20:00:52 +0800
Subject: [PATCH] 1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改
---
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 41 +++
VueWebCoreApi/Models/MouldVerify/MouldModel.cs | 32 +++
VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs | 6
VueWebCoreApi/wwwroot/Excel/模具清单.xls | 0
VueWebCoreApi/Tools/ImportExcelData.cs | 28 +-
VueWebCoreApi/Controllers/MouldManagerController.cs | 119 +++++++++--
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 333 +++++++++++++++++++++++++++++---
VueWebCoreApi/Controllers/LoginController.cs | 2
8 files changed, 474 insertions(+), 87 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index dd5eed9..a22b43a 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -191,7 +191,7 @@
{
try
{
- var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IkFQUCIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURBUFA5OTkiLCJ0aW1lb3V0IjoiMjAyMy0xMC0xN1QxMjozMjozOC40NTYzMTE0KzA4OjAwIn0.BX_axVR1-IT3L5SP6D5o7EhPbdW9SbZcp55C3PYy5eE"; //HttpContext.Request.Headers["Token"].ToString();
+ var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = LoginBLL.LoginMenu(usercode, usertype,us);
}
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index d31c025..e1428fe 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.MouldVerify;
using VueWebCoreApi.Tools;
namespace VueWebCoreApi.Controllers
@@ -70,13 +71,12 @@
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);
+ mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
return Json(mes);
}
#endregion
@@ -584,22 +584,24 @@
}
#endregion
- #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ #region[妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨]
/// <summary>
- /// 璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨
+ /// 妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨
/// </summary>
+ /// <param name="menucode">鍔熻兘缂栧彿</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="faultsourcecode">鏁呴殰鏉ユ簮</param>
+ /// <param name="faultdescr">鏁呴殰鎻忚堪</param>
/// <returns></returns>
[Route(template: "MaintainScanMouldApplySave")]
[HttpPost]
- public JsonResult MaintainScanMouldApplySave([FromBody] JObject obj, List<IFormFile> files)
+ public JsonResult MaintainScanMouldApplySave([FromForm] string menucode, [FromForm] string mouldcode,[FromForm] string faultsourcecode,[FromForm] string faultdescr)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- string menucode = obj["menucode"].ToString(); //鍔熻兘缂栫爜
- string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
- string faultsourcecode = obj["faultsourcecode"].ToString(); //鏁呴殰鏉ユ簮缂栫爜
- string faultdescr = obj["faultdescr"].ToString(); //鏁呴殰鎻忚堪
- mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode, faultdescr,us, files);
+ var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
+ mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
+ mes.Message = menucode;
return Json(mes);
}
#endregion
@@ -624,20 +626,21 @@
/// <summary>
/// 妯″叿缁翠慨鎻愪氦
/// </summary>
+ /// <param name="menucode">鍔熻兘缂栧彿</param>
+ /// <param name="docu_code">缁翠慨鐢宠鍗曞彿</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="faultdescr">鏁呴殰鎻忚堪</param>
+ /// <param name="is_stoprepair">涓嬫満缁翠慨</param>
+ /// <param name="repaircontent">缁翠慨鍐呭</param>
/// <returns></returns>
[Route(template: "RepairScanMouldSave")]
[HttpPost]
- public JsonResult RepairScanMouldSave([FromBody] JObject obj, List<IFormFile> files)
+ public JsonResult RepairScanMouldSave([FromForm] string menucode, [FromForm] string docu_code, [FromForm] string mouldcode, [FromForm] string faultdescr, [FromForm] string is_stoprepair,[FromForm] string repaircontent)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- string menucode = obj["menucode"].ToString(); //鍔熻兘缂栧彿
- string docu_code = obj["docu_code"].ToString(); //缁翠慨鐢宠鍗曞彿
- string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
- string faultdescr = obj["faultdescr"].ToString(); //鏁呴殰鎻忚堪
- string is_stoprepair = obj["is_stoprepair"].ToString(); //涓嬫満缁翠慨
- string repaircontent = obj["repaircontent"].ToString(); //缁翠慨鍐呭
- mes = MouldManagerBLL.RepairScanMouldSave(menucode,docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent,us, files);
+ var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
+ mes = MouldManagerBLL.RepairScanMouldSave(menucode, docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent, us, files);
return Json(mes);
}
#endregion
@@ -700,7 +703,7 @@
/// <summary>
/// 妯″叿涓婃満,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldUpQrCodeData")]
[HttpGet]
@@ -736,7 +739,7 @@
/// <summary>
/// 妯″叿涓嬫満,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldDownQrCodeData")]
[HttpGet]
@@ -773,7 +776,7 @@
/// <summary>
/// 妯″叿澶栧��,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldLendOutQrCodeData")]
[HttpGet]
@@ -808,7 +811,7 @@
/// <summary>
/// 妯″叿褰掕繕,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldReturnQrCodeData")]
[HttpGet]
@@ -837,5 +840,77 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MouldInWareHouseQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldInWareHouseQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldInWareHouseQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍏ュ簱鎻愪氦]
+ /// <summary>
+ /// 妯″叿鍏ュ簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldInWareHouseSave")]
+ [HttpPost]
+ public JsonResult MouldInWareHouseSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string description = obj["description"].ToString(); //鍏ュ簱鎻忚堪
+ mes = MouldManagerBLL.MouldInWareHouseSave(mouldcode, warehousecode,description, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄簱,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿鍑哄簱,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MouldOutWareHouseQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldOutWareHouseQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldOutWareHouseQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄簱鎻愪氦]
+ /// <summary>
+ /// 妯″叿鍑哄簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldOutWareHouseSave")]
+ [HttpPost]
+ public JsonResult MouldOutWareHouseSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string description = obj["description"].ToString(); //鍑哄簱鎻忚堪
+ mes = MouldManagerBLL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index ac3aabc..bc3a98a 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -19,9 +19,9 @@
#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)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, 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);
+ return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
}
#endregion
@@ -229,7 +229,7 @@
#endregion
#region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
- public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
+ public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, IFormFileCollection files)
{
return MouldManagerDAL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode,faultdescr,us,files);
}
@@ -244,7 +244,7 @@
#endregion
#region[妯″叿缁翠慨鎻愪氦]
- public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, List<IFormFile> files)
+ public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, IFormFileCollection files)
{
return MouldManagerDAL.RepairScanMouldSave(menucode,docu_code, mouldcode,faultdescr,is_stoprepair,repaircontent,us,files);
}
@@ -280,14 +280,12 @@
}
#endregion
-
#region[妯″叿涓婃満鎻愪氦]
public static ToMessage MouldUpSave(string mouldcode, string eqp_code, string description, User us)
{
return MouldManagerDAL.MouldUpSave(mouldcode,eqp_code,description,us);
}
#endregion
-
#region[妯″叿涓嬫満,鎵弿妯″叿缂栫爜]
@@ -303,7 +301,6 @@
return MouldManagerDAL.MouldDownSave(mouldcode, eqp_code, usecount_life, description, us);
}
#endregion
-
#region[妯″叿澶栧��,鎵弿妯″叿缂栫爜]
@@ -334,5 +331,35 @@
return MouldManagerDAL.MouldReturnSave(mouldcode, description,us);
}
#endregion
+
+
+ #region[妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldInWareHouseQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldInWareHouseQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿鍏ュ簱鎻愪氦]
+ public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ return MouldManagerDAL.MouldInWareHouseSave(mouldcode, warehousecode, description, us);
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄簱,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldOutWareHouseQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldOutWareHouseQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄簱鎻愪氦]
+ public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ return MouldManagerDAL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index e65c2b4..53f99eb 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -72,19 +72,20 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
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
- 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;
+ A.surp_life,(select isnull(sum(usecount_life),0) from TMould_UpDownReord R where R.mould_code=A.code) 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 = "鏌ヨ鎴愬姛!";
@@ -103,7 +104,7 @@
#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)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -113,8 +114,8 @@
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)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
+ values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -124,8 +125,6 @@
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,
@@ -171,7 +170,7 @@
if (opertype == "Update")
{
//淇敼妯″叿娓呭崟琛�
- sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,warehousecode=@warehousecode,
+ sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,
surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
list.Add(new
{
@@ -182,7 +181,6 @@
name = mouldname,
spec = mouldspec,
status = status,
- warehousecode = warehousecode,
surp_life = surplife,
resi_life = resilife,
lm_user = us.usercode,
@@ -1814,7 +1812,7 @@
//鍐欏叆淇濆吇璁板綍涓昏〃
sql = @"insert into TMouldmaint_Proc_Main(bywo,mould_code,mouldmaint_code,maint_result,maint_user,maint_date)
- values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@lm_user,@lm_date)";
+ values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@maint_user,@maint_date)";
list.Add(new
{
str = sql,
@@ -1823,15 +1821,15 @@
bywo = bywo,
mould_code = json.code,
mouldmaint_code = json.standcode,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString(),
+ maint_user = us.usercode,
+ maint_date = DateTime.Now.ToString(),
maint_result = json.result
}
});
//寰幆鍐欏叆淇濆吇璁板綍瀛愯〃
for (int i = 0; i < json.children.Count; i++)
{
- sql = @"insert into TEqpmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date)
+ sql = @"insert into TMouldmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date)
values(@seq,CONVERT(INT,IDENT_CURRENT('TMouldmaint_Proc_Main')),@mouldmaideta_code,@result,@maint_value,@lm_user,@lm_date)";
list.Add(new
{
@@ -1976,8 +1974,8 @@
}
#endregion
- #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
- public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
+ #region[妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, IFormFileCollection files)
{
var sql = "";
string sqwo = "", numvalue = "";
@@ -2001,16 +1999,20 @@
{
for (int i = 0; i < files.Count; i++)
{
+ IFormFile file = files[i];
+ string imgName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+
// 鐢熸垚鏂囦欢鍚�
- var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
+ //var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
// 鎷兼帴鏂囦欢淇濆瓨璺緞
- var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
+ //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
- // 淇濆瓨鏂囦欢
+ // 淇濆瓨鏂囦欢var stream = new FileStream(filePath, FileMode.Create)
using (var stream = new FileStream(filePath, FileMode.Create))
{
- files[i].CopyToAsync(stream);
+ files[i].CopyTo(stream);
}
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
sql = @"insert into TMould_RepairImage(source_wo,wo_type,img1url)
@@ -2124,7 +2126,7 @@
#endregion
#region[妯″叿缁翠慨鎻愪氦]
- public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, List<IFormFile> files)
+ public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, IFormFileCollection files)
{
var sql = "";
string wxwo = "", numvalue = "";
@@ -2148,16 +2150,20 @@
{
for (int i = 0; i < files.Count; i++)
{
+ IFormFile file = files[i];
+ string imgName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+
// 鐢熸垚鏂囦欢鍚�
- var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
+ //var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
// 鎷兼帴鏂囦欢淇濆瓨璺緞
- var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
+ //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
- // 淇濆瓨鏂囦欢
+ // 淇濆瓨鏂囦欢var stream = new FileStream(filePath, FileMode.Create)
using (var stream = new FileStream(filePath, FileMode.Create))
{
- files[i].CopyToAsync(stream);
+ files[i].CopyTo(stream);
}
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
sql = @"insert into TMould_RepairImage(source_wo,wo_type,img1url)
@@ -2413,7 +2419,6 @@
return mes;
}
#endregion
-
#region[妯″叿涓婃満,鎵弿妯″叿缂栫爜]
@@ -2942,5 +2947,261 @@
return mes;
}
#endregion
+
+
+ #region[妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldInWareHouseQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鍒ゆ柇褰撳墠妯″叿褰撳墠浣跨敤鐘舵��
+ sql = @"select code,name,spec,status,usestatus,surp_life,resi_life
+ from TMouldInfo where code=@mouldcode";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ if (dt.Rows[0]["status"].ToString() == "Y")
+ {
+ switch (dt.Rows[0]["usestatus"].ToString())
+ {
+ case "0": //鍦ㄥ簱
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ case "2": //涓婃満
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ case "7": //澶栧��
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ default:
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dt;
+ break;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍏ュ簱鎻愪氦]
+ public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍏ュ簱鎿嶄綔)
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "IN",
+ warehouse_code = warehousecode,
+ description = description,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍏ュ簱),浠撳簱缂栫爜
+ sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });
+
+ 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 MouldOutWareHouseQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鍒ゆ柇褰撳墠妯″叿褰撳墠浣跨敤鐘舵��
+ sql = @"select * from TMouldInfo where code=@mouldcode ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ if (dt.Rows[0]["status"].ToString() == "Y")
+ {
+ //鍒ゆ柇褰撳墠妯″叿鏄惁鍦ㄥ鍊熺姸鎬�
+ sql = @"select M.code as mould_code,M.name as mould_name,M.spec as mould_spec,
+ M.surp_life,M.resi_life,M.warehousecode,C.name as warehousename
+ from TMouldInfo M
+ left join TSecStck C on M.warehousecode=C.code
+ where M.code=@mouldcode and M.usestatus='0'";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍑哄簱鎻愪氦]
+ public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍑哄簱鎿嶄綔)
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "OUT",
+ warehouse_code = warehousecode,
+ description = description,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍑哄簱),娓呴櫎浠撳簱缂栫爜
+ sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });
+
+ 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
}
}
diff --git a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
index 0bb40c2..f9015be 100644
--- a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
@@ -32,10 +32,10 @@
union ALL
select e.menucode, e.parent_id, e.menuname,e.menu_seq,e.Type
from TMenu e
- inner join RecursiveCTE r ON e.menucode = r.parent_id
+ inner join RecursiveCTE r ON e.menucode = r.parent_id
)
- select menucode, parent_id, menuname,Type
- from RecursiveCTE order by menu_seq";
+ select distinct menucode, parent_id, menuname,Type,menu_seq
+ from RecursiveCTE order by menucode, parent_id,Type,menu_seq";
var data = DapperHelper.selecttable(sql);
if (data.Rows.Count > 0)
{
diff --git a/VueWebCoreApi/Models/MouldVerify/MouldModel.cs b/VueWebCoreApi/Models/MouldVerify/MouldModel.cs
new file mode 100644
index 0000000..e59393b
--- /dev/null
+++ b/VueWebCoreApi/Models/MouldVerify/MouldModel.cs
@@ -0,0 +1,32 @@
+锘縰sing Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.MouldVerify
+{
+ public class MouldModel
+ {
+ /// <summary>
+ /// 鍔熻兘缂栫爜
+ /// </summary>
+ public string menucode { get; set; }
+ /// <summary>
+ /// 妯″叿缂栫爜
+ /// </summary>
+ public string mouldcode { get; set; }
+ /// <summary>
+ /// 鏁呴殰鏉ユ簮
+ /// </summary>
+ public string faultsourcecode { get; set; }
+ /// <summary>
+ /// 鏁呴殰鎻忚堪
+ /// </summary>
+ public string faultdescr { get; set; }
+ /// <summary>
+ /// 鏁呴殰鍥剧墖
+ /// </summary>
+ public List<IFormFile> files { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 6cf5cad..8d2194d 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -1045,7 +1045,7 @@
return Message;
}
- else if (excelTable[0].Columns.Count != 7)
+ else if (excelTable[0].Columns.Count != 6)
{
code = "301";
Message = "妯″叿娓呭崟妯℃澘涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -1081,22 +1081,16 @@
Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�4鍒楀簲涓簕*鐘舵�亇";
return Message;
}
- else if (excelTable[0].Columns[4].ColumnName != "*浠撳簱缂栫爜")
+ else if (excelTable[0].Columns[4].ColumnName != "棰勮瀵垮懡(娆�)")
{
code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕*浠撳簱缂栫爜}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�5鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "棰勮瀵垮懡(娆�)")
+ else if (excelTable[0].Columns[5].ColumnName != "鍓╀綑瀵垮懡(娆�)")
{
code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕棰勮瀵垮懡(娆�)}";
- return Message;
- }
- else if (excelTable[0].Columns[6].ColumnName != "鍓╀綑瀵垮懡(娆�)")
- {
- code = "301";
- Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�7鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
+ Message = "妯″叿娓呭崟妯℃澘锛氳〃澶翠俊鎭笉绗﹀悎瑙勮寖,绗�6鍒楀簲涓簕鍓╀綑瀵垮懡(娆�)}";
return Message;
}
else if (excelTable[1].Columns[0].ColumnName != "妯″叿缂栫爜")
@@ -5395,8 +5389,8 @@
//瀵煎叆妯″叿娓呭崟
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)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
+ values(@code,@name,@spec,@status,@usestatus,@surp_life,@resi_life,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -5405,11 +5399,9 @@
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()),
+ status = excelTable[0].Rows[k][3].ToString().Trim(),
+ surp_life =decimal.Parse(excelTable[0].Rows[k][4].ToString().Trim()==""?"0": excelTable[0].Rows[k][4].ToString().Trim()),
+ resi_life = decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()==""?"0":excelTable[0].Rows[k][5].ToString().Trim()),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
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"
index de60cfe..8badc07 100644
--- "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"
Binary files differ
--
Gitblit v1.9.3