From 6114886bd704d575a65f174e31311c8ae912ce99 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 17 十月 2023 20:08:20 +0800
Subject: [PATCH] 1.APP登录接口 2.模具维修、维修验证功能接口 3.模具上机、模具下机功能接口 4.模具外借、模具归还功能接口
---
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 102 ++++
VueWebCoreApi/Controllers/MouldManagerController.cs | 236 +++++++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5.png | 0
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 947 ++++++++++++++++++++++++++++++++++++++
VueWebCoreApi/Controllers/LoginController.cs | 101 ++++
5 files changed, 1,359 insertions(+), 27 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index 8db4513..dd5eed9 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -24,13 +24,13 @@
private static readonly string Enterprise = AppSetting.GetAppSetting("Enterprise");
- #region[鐢ㄦ埛鐧诲綍(PC/APP)]
+ #region[鐢ㄦ埛鐧诲綍(PC)]
/// <summary>
- /// 鐢ㄦ埛鐧诲綍(PC/APP)
+ /// 鐢ㄦ埛鐧诲綍(PC)
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
- /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC)</param>
/// <returns></returns>
[Route(template: "LoginSave")]
[HttpGet]
@@ -191,7 +191,7 @@
{
try
{
- var token = HttpContext.Request.Headers["Token"].ToString();
+ var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IkFQUCIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURBUFA5OTkiLCJ0aW1lb3V0IjoiMjAyMy0xMC0xN1QxMjozMjozOC40NTYzMTE0KzA4OjAwIn0.BX_axVR1-IT3L5SP6D5o7EhPbdW9SbZcp55C3PYy5eE"; //HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = LoginBLL.LoginMenu(usercode, usertype,us);
}
@@ -239,6 +239,99 @@
}
#endregion
+ #region[APP鐢ㄦ埛鐧诲綍]
+ /// <summary>
+ /// APP鐢ㄦ埛鐧诲綍
+ /// </summary>
+ /// <param name="username">鐢ㄦ埛缂栫爜</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(APP)</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppSave")]
+ [HttpGet]
+ public JsonResult LoginAppSave(string username, string password, string usertype)
+ {
+ try
+ {
+ Dictionary<string, object> payLoad = new Dictionary<string, object>();
+ mes = LoginBLL.LoginSearch(username, password);
+ if (mes.code == "200")
+ {
+ DataTable dt = (DataTable)mes.data;
+ //jwt鐢熸垚Token鍓嶇殑鐢ㄦ埛淇℃伅
+ payLoad.Add("usercode", dt.Rows[0]["usercode"].ToString());
+ payLoad.Add("username", dt.Rows[0]["username"].ToString());
+ payLoad.Add("storg_code", dt.Rows[0]["storg_code"].ToString());
+ payLoad.Add("storg_name", dt.Rows[0]["storg_name"].ToString());
+ payLoad.Add("is_system_admin", dt.Rows[0]["is_system_admin"].ToString());
+ payLoad.Add("role_code", dt.Rows[0]["role_code"].ToString());
+ payLoad.Add("role_datapermissions", dt.Rows[0]["role_datapermissions"].ToString());
+ payLoad.Add("usertype", usertype);
+ payLoad.Add("rediskey", Enterprise + "LoginUserID" + usertype + JwtTools.FindFirstKeyByValue(payLoad, "usercode"));
+ //鑾峰彇jwt鐢熸垚token
+ mes = JwtTools.Encode(payLoad);
+
+ List<User> mss = new List<User>();
+ User ms = new User();
+ ms.usercode = dt.Rows[0]["usercode"].ToString();
+ ms.username = dt.Rows[0]["username"].ToString();
+ ms.storg_code = dt.Rows[0]["storg_code"].ToString();
+ ms.storg_name = dt.Rows[0]["storg_name"].ToString();
+ ms.is_system_admin = dt.Rows[0]["is_system_admin"].ToString();
+ ms.role_code = dt.Rows[0]["role_code"].ToString();
+ ms.role_datapermissions = dt.Rows[0]["role_datapermissions"].ToString();
+ ms.usertype = usertype;
+ ms.rediskey = Enterprise + "LoginUserID" + ms.usertype + ms.usercode;
+ ms.token = mes.data.ToString();
+ mss.Add(ms);
+
+
+ User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
+ //濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
+ if (redis.Get<User>(ms.rediskey, 0) == null)
+ {
+ //鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>(ms.rediskey, ms, redis.secondsTimeOut, 0);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
+ mes.code = "200";
+ mes.Message = "鐧诲綍鎴愬姛!";
+ mes.data = ms.token.ToString();
+ }
+ else //濡傛灉瀛樺湪
+ {
+ //鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
+ User r_loginUser = redis.Get<User>(ms.rediskey, 0);
+ //濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
+ if ((r_loginUser.rediskey).Equals(loginUser.rediskey))
+ {
+ redis.Remove(loginUser.rediskey, 0);//鍒犻櫎redis
+ redis.Set<User>(loginUser.rediskey, ms, redis.secondsTimeOut, 0);//鍐欏叆redis
+ }
+ else
+ {
+ //閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>(loginUser.rediskey, loginUser, redis.secondsTimeOut, 0);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
+ mes.data = ms;
+ mes.code = "200";
+ mes.Message = "鐧诲綍鎴愬姛!";
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+
+ return Json(mes);
+ }
+ #endregion
+
#region[APP瀵嗙爜閲嶇疆]
/// <summary>
/// APP瀵嗙爜閲嶇疆
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index ebc3851..d31c025 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -504,7 +504,6 @@
#endregion
-
#region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮乚
/// <summary>
/// 妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮�
@@ -570,7 +569,6 @@
#endregion
-
#region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
/// <summary>
/// 妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮�
@@ -605,5 +603,239 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿寰呯淮淇俊鎭垪琛╙
+ /// <summary>
+ /// 妯″叿寰呯淮淇俊鎭垪琛�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairScanMouldQrCodeDataList")]
+ [HttpGet]
+ public JsonResult RepairScanMouldQrCodeDataList(string mouldcode)
+ {
+ mes = MouldManagerBLL.RepairScanMouldQrCodeDataList(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨鎻愪氦]
+ /// <summary>
+ /// 妯″叿缁翠慨鎻愪氦
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "RepairScanMouldSave")]
+ [HttpPost]
+ public JsonResult RepairScanMouldSave([FromBody] JObject obj, List<IFormFile> files)
+ {
+ 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);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿缁翠慨寰呴獙璇佸垪琛╙
+ /// <summary>
+ /// 妯″叿缁翠慨寰呴獙璇佸垪琛�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairVerificationScanMouldData")]
+ [HttpGet]
+ public JsonResult RepairVerificationScanMouldData(string mouldcode)
+ {
+ mes = MouldManagerBLL.RepairVerificationScanMouldData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨寰呴獙璇佽鎯呬俊鎭痌
+ /// <summary>
+ /// 妯″叿缁翠慨寰呴獙璇佽鎯呬俊鎭�
+ /// </summary>
+ /// <param name="repair_code">缁翠慨鍗曞彿</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairVerificationScanMouldDataSub")]
+ [HttpGet]
+ public JsonResult RepairVerificationScanMouldDataSub(string repair_code, string mouldcode)
+ {
+ mes = MouldManagerBLL.RepairVerificationScanMouldDataSub(repair_code, mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨楠岃瘉鎻愪氦]
+ /// <summary>
+ /// 妯″叿缁翠慨楠岃瘉鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "RepairVerificationScanMouldSave")]
+ [HttpPost]
+ public JsonResult RepairVerificationScanMouldSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string repairwo = obj["repairwo"].ToString(); //缁翠慨鍗曞彿
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string result = obj["result"].ToString(); //楠岃瘉缁撴灉
+ string surp_life = obj["surp_life"].ToString(); //缁翠慨鍚庡墿浣欏鍛�
+ mes = MouldManagerBLL.RepairVerificationScanMouldSave(repairwo, mouldcode,result, surp_life,us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿涓婃満,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿涓婃満,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode"></param>
+ /// <returns></returns>
+ [Route(template: "MouldUpQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldUpQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldUpQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿涓婃満鎻愪氦]
+ /// <summary>
+ /// 妯″叿涓婃満鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldUpSave")]
+ [HttpPost]
+ public JsonResult MouldUpSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string eqp_code = obj["eqp_code"].ToString(); //璁惧缂栫爜
+ string description = obj["description"].ToString(); //涓婃満鎻忚堪
+ mes = MouldManagerBLL.MouldUpSave(mouldcode, eqp_code, description, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿涓嬫満,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿涓嬫満,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode"></param>
+ /// <returns></returns>
+ [Route(template: "MouldDownQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldDownQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldDownQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿涓嬫満鎻愪氦]
+ /// <summary>
+ /// 妯″叿涓嬫満鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldDownSave")]
+ [HttpPost]
+ public JsonResult MouldDownSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string eqp_code = obj["eqp_code"].ToString(); //璁惧缂栫爜
+ string usecount_life = obj["usecount_life"].ToString(); //鏈浣跨敤瀵垮懡(娆�)
+ string description = obj["description"].ToString(); //涓嬫満鎻忚堪
+ mes = MouldManagerBLL.MouldDownSave(mouldcode, eqp_code, usecount_life, description, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿澶栧��,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿澶栧��,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode"></param>
+ /// <returns></returns>
+ [Route(template: "MouldLendOutQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldLendOutQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldLendOutQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿澶栧�熸彁浜
+ /// <summary>
+ /// 妯″叿澶栧�熸彁浜�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldLendOutSave")]
+ [HttpPost]
+ public JsonResult MouldLendOutSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string description = obj["description"].ToString(); //澶栧�熸弿杩�
+ mes = MouldManagerBLL.MouldLendOutSave(mouldcode, description, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿褰掕繕,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿褰掕繕,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode"></param>
+ /// <returns></returns>
+ [Route(template: "MouldReturnQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldReturnQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldReturnQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿褰掕繕鎻愪氦]
+ /// <summary>
+ /// 妯″叿褰掕繕鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldReturnSave")]
+ [HttpPost]
+ public JsonResult MouldReturnSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string description = obj["description"].ToString(); //褰掕繕鎻忚堪
+ mes = MouldManagerBLL.MouldReturnSave(mouldcode, description, us);
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index ed63581..ac3aabc 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -163,7 +163,6 @@
#endregion
-
#region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮乚
public static ToMessage CheckScanMouldQrCodeData(string mouldcode)
{
@@ -222,7 +221,6 @@
#endregion
-
#region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
public static ToMessage MaintainScanMouldApplyQrCodeData(string mouldcode)
{
@@ -236,5 +234,105 @@
return MouldManagerDAL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode,faultdescr,us,files);
}
#endregion
+
+
+ #region[妯″叿寰呯淮淇俊鎭垪琛╙
+ public static ToMessage RepairScanMouldQrCodeDataList(string mouldcode)
+ {
+ return MouldManagerDAL.RepairScanMouldQrCodeDataList(mouldcode);
+ }
+ #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)
+ {
+ return MouldManagerDAL.RepairScanMouldSave(menucode,docu_code, mouldcode,faultdescr,is_stoprepair,repaircontent,us,files);
+ }
+ #endregion
+
+
+ #region[妯″叿缁翠慨寰呴獙璇佸垪琛╙
+ public static ToMessage RepairVerificationScanMouldData(string mouldcode)
+ {
+ return MouldManagerDAL.RepairVerificationScanMouldData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨寰呴獙璇佽鎯呬俊鎭痌
+ public static ToMessage RepairVerificationScanMouldDataSub(string repair_code, string mouldcode)
+ {
+ return MouldManagerDAL.RepairVerificationScanMouldDataSub(repair_code,mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨楠岃瘉鎻愪氦]
+ public static ToMessage RepairVerificationScanMouldSave(string repairwo, string mouldcode, string result,string surp_life, User us)
+ {
+ return MouldManagerDAL.RepairVerificationScanMouldSave(repairwo, mouldcode,result, surp_life, us);
+ }
+ #endregion
+
+
+ #region[妯″叿涓婃満,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldUpQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldUpQrCodeData(mouldcode);
+ }
+ #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[妯″叿涓嬫満,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldDownQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldDownQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿涓嬫満鎻愪氦]
+ public static ToMessage MouldDownSave(string mouldcode, string eqp_code, string usecount_life, string description, User us)
+ {
+ return MouldManagerDAL.MouldDownSave(mouldcode, eqp_code, usecount_life, description, us);
+ }
+ #endregion
+
+
+
+ #region[妯″叿澶栧��,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldLendOutQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldLendOutQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿澶栧�熸彁浜
+ public static ToMessage MouldLendOutSave(string mouldcode, string description, User us)
+ {
+ return MouldManagerDAL.MouldLendOutSave(mouldcode, description,us);
+ }
+ #endregion
+
+
+ #region[妯″叿褰掕繕,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldReturnQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MouldReturnQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿褰掕繕鎻愪氦]
+ public static ToMessage MouldReturnSave(string mouldcode, string description, User us)
+ {
+ return MouldManagerDAL.MouldReturnSave(mouldcode, description,us);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 9726683..e65c2b4 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -256,12 +256,18 @@
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";
+ select mould_code from TMould_RepairRequest where mould_code=@devicecode
+ union all
+ select mould_code from TMould_UpDownReord where mould_code=@devicecode
+ union all
+ select mould_code from TMould_LendOutReord where mould_code=@devicecode
+ union all
+ select mould_code from TMould_InOutReord where mould_code=@devicecode";
dynamicParams.Add("@devicecode", mouldcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -1450,7 +1456,6 @@
#endregion
-
#region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮乚
public static ToMessage CheckScanMouldQrCodeData(string mouldcode)
{
@@ -1875,7 +1880,6 @@
#endregion
-
#region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
public static ToMessage MaintainScanMouldApplyQrCodeData(string mouldcode)
{
@@ -1883,6 +1887,41 @@
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)
+ {
+ 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:
+ break;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+
//鑾峰彇褰撳墠鎵爜妯″叿鏄惁瀛樺湪宸茬敵璇锋垨宸茬淮淇姸鎬佹暟鎹�
sql = @"select * from TMould_RepairRequest where mould_code=@mouldcode and status<>'CONFIR'";
dynamicParams.Add("@mouldcode", mouldcode);
@@ -1907,7 +1946,7 @@
else
{
//鑾峰彇瀵瑰簲妯″叿淇℃伅
- sql = @"select A.code,A.name,A.spec
+ sql = @"select A.code,A.name,A.spec,A.surp_life,A.resi_life
from TMouldInfo A
where A.code=@mouldcode and A.status='Y' ";
dynamicParams.Add("@mouldcode", mouldcode);
@@ -1941,12 +1980,159 @@
public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
{
var sql = "";
- string wxwo = "", numvalue = "";
+ string sqwo = "", numvalue = "";
List<object> list = new List<object>();
try
{
list.Clear();
mes = SeachEncodeJob.EncodingSeach(menucode); //APP绔ā鍏风淮淇敵璇风敓鎴愬崟鍙�
+ if (mes.code == "300")
+ {
+ return mes;
+ }
+ else
+ {
+ List<string> wo = (List<string>)mes.data;
+ sqwo = wo[0].ToString(); //鑾峰彇鐢宠缁翠慨鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ //缁翠慨鐢宠涓婁紶鍥剧墖
+ if (files != null && files.Count > 0)
+ {
+ for (int i = 0; i < files.Count; i++)
+ {
+ // 鐢熸垚鏂囦欢鍚�
+ var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
+
+ // 鎷兼帴鏂囦欢淇濆瓨璺緞
+ var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
+
+ // 淇濆瓨鏂囦欢
+ using (var stream = new FileStream(filePath, FileMode.Create))
+ {
+ files[i].CopyToAsync(stream);
+ }
+ //寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
+ sql = @"insert into TMould_RepairImage(source_wo,wo_type,img1url)
+ values(@source_wo,@wo_type,@img1url)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ source_wo = sqwo,
+ wo_type = "REPA",
+ img1url = filePath
+ }
+ });
+ }
+ }
+ //鍐欏叆缁翠慨鐢宠璁板綍琛�
+ sql = @"insert into TMould_RepairRequest(docu_code,docu_date,status,mould_code,request_person,request_date,failure_descript,source)
+ values(@docu_code,@docu_date,@status,@mould_code,@request_person,@request_date,@failure_descript,@source)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ docu_code = sqwo,
+ docu_date = DateTime.Now.ToString(),
+ status = "REPA",
+ mould_code = mouldcode,
+ request_person = us.usercode,
+ request_date = DateTime.Now.ToString(),
+ failure_descript = faultdescr,
+ source = faultsourcecode
+ }
+ });
+ //鍥炲啓妯″叿娓呭崟,妯″叿鐘舵��(鏁呴殰)銆佷娇鐢ㄧ姸鎬�(寰呯淮淇�)
+ sql = @"update TMouldInfo set status='N',usestatus='4' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ 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 RepairScanMouldQrCodeDataList(string mouldcode)
+ {
+ string sql = "", search = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (mouldcode == "" || mouldcode == null)
+ {
+ search += "and B.code=@mouldcode ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ //鑾峰彇妯″叿缁翠慨鍒楄〃宸茬敵璇锋湭缁翠慨鐨勬暟鎹�
+ sql = @"select A.docu_code,B.code as mouldcode,B.name as mouldname,B.spec as mouldspec,B.surp_life,B.resi_life,
+ A.request_person,A.request_date,
+ (case when A.source='A' then '鐐规' when A.source='B' then '淇濆吇' when A.source='D' then '鎵嬪伐' end) as source,
+ A.failure_descript
+ from TMould_RepairRequest A
+ inner join TMouldInfo B on A.mould_code=B.code
+ where A.status='REPA' " + search;
+ 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 = data;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #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)
+ {
+ var sql = "";
+ string wxwo = "", numvalue = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ mes = SeachEncodeJob.EncodingSeach(menucode); //APP绔ā鍏风淮淇敓鎴愬崟鍙�
if (mes.code == "300")
{
return mes;
@@ -1963,7 +2149,7 @@
for (int i = 0; i < files.Count; i++)
{
// 鐢熸垚鏂囦欢鍚�
- var fileName = 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);
@@ -1982,44 +2168,767 @@
parm = new
{
source_wo = wxwo,
- wo_type = "REPA",
+ wo_type = "COMP",
img1url = filePath
}
});
}
}
- //鍐欏叆缁翠慨鐢宠璁板綍琛�
- sql = @"insert into TMould_RepairRequest(docu_code,docu_date,status,mould_code,request_person,request_date,failure_descript,source)
- values(@docu_code,@docu_date,@status,@mould_code,@request_person,@request_date,@failure_descript,@source)";
+ //鍐欏叆缁翠慨璁板綍琛�
+ sql = @"insert into TMould_Repair(repair_code,docu_date,status,mould_code,repair_person,repair_date,repair_content,failure_descript,is_shutdown,source_wo)
+ values(@repair_code,@docu_date,@status,@mould_code,@repair_person,@repair_date,@repair_content,@failure_descript,@is_shutdown,@source_wo)";
list.Add(new
{
str = sql,
parm = new
{
- docu_code = wxwo,
+ repair_code = wxwo,
docu_date = DateTime.Now.ToString(),
- status = "REPA",
+ status = "COMP",
mould_code = mouldcode,
- request_person = us.usercode,
- request_date = DateTime.Now.ToString(),
+ repair_person = us.usercode,
+ repair_date = DateTime.Now.ToString(),
+ repair_content = repaircontent,
failure_descript = faultdescr,
- source = faultsourcecode
+ is_shutdown = is_stoprepair,
+ source_wo = docu_code
}
});
-
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TMould_RepairRequest set status=@status where docu_code=@docu_code and mould_code=@mouldcode";
+ list.Add(new { str = sql, parm = new { docu_code = docu_code, mouldcode = mouldcode, status = "COMP" } });
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(宸茬淮淇�)
+ sql = @"update TMouldInfo set usestatus='5' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠鎴愬姛!";
+ mes.Message = "缁翠慨鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠澶辫触!";
+ mes.Message = "缁翠慨澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿缁翠慨寰呴獙璇佸垪琛╙
+ public static ToMessage RepairVerificationScanMouldData(string mouldcode)
+ {
+ string sql = "", search = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (mouldcode == "" || mouldcode == null)
+ {
+ search += "and B.code=@mouldcode ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ //鑾峰彇妯″叿缁翠慨鍒楄〃宸茬淮淇殑鏁版嵁
+ sql = @"select A.repair_code,B.code as mouldcode,B.name as mouldname,B.spec as mouldspec,B.surp_life,B.resi_life,
+ A.repair_person,A.repair_date,A.is_shutdown,
+ A.failure_descript
+ from TMould_Repair A
+ inner join TMouldInfo B on A.mould_code=B.code
+ where A.status='COMP' " + search;
+ 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 = data;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨寰呴獙璇佽鎯呬俊鎭痌
+ public static ToMessage RepairVerificationScanMouldDataSub(string repair_code, string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ Dictionary<string, object> dict = new Dictionary<string, object>();
+ try
+ {
+ //鏍规嵁璁炬ā鍏风紪鐮佽幏鍙栫淮淇鎯�
+ sql = @"select repair_code,failure_descript,is_shutdown,repair_content,repair_part
+ from TMould_Repair
+ where repair_code=@repair_code and mould_code=mouldcode";
+ dynamicParams.Add("@repair_code", repair_code);
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ dict.Add("failure_descript", data.Rows[0]["failure_descript"].ToString()); //鏁呴殰鎻忚堪
+
+ //鑾峰彇鏁呴殰涓婁紶鍥剧墖
+ sql = @"select img1url from TMould_RepairImage where source_wo=@source_wo and wo_type='COMP'";
+ dynamicParams.Add("@source_wo", data.Rows[0]["repair_code"].ToString());
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ dict.Add("failure_descriptimg", data0); //鏁呴殰涓婁紶鍥剧墖
+ }
+ dict.Add("repair_content", data.Rows[0]["repair_content"].ToString()); //缁翠慨鍐呭
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dict;
+ }
+ 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 RepairVerificationScanMouldSave(string repairwo, string mouldcode, string result, string surp_life, User us)
+ {
+ var sql = ""; decimal surplife = 0;
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //楠岃瘉缁撴灉涓篛K涓旈獙璇佸悗鐨勫墿浣欏鍛�>0
+ if (result == "OK" && decimal.Parse(surp_life) > 0)
+ {
+ surplife = decimal.Parse(surp_life);
+ }
+ //鏍规嵁妯″叿缁翠慨鍗曟煡鎵炬簮鍗�(缁翠慨鐢宠鍗�)
+ sql = @"select source_wo from TMould_Repair where repair_code=@repairwo";
+ dynamicParams.Add("@repairwo", repairwo);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ //鏇存柊璁惧缁翠慨璁板綍楠岃瘉浜哄憳銆侀獙璇佹椂闂淬�侀獙璇佺粨鏋溿�侀獙璇佺姸鎬�
+ sql = @"update TMould_Repair set status=@status,is_verifi=@is_verifi,verify_result=@verify_result,verify_person=@verify_person,verify_date=@verify_date,verify_surplife=@verify_surplife
+ where repair_code=@repair_code and mould_code=@mould_code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ status = "CONFIR",
+ is_verifi = "Y",
+ verify_result = result,
+ verify_person = us.usercode,
+ verify_date = DateTime.Now.ToString(),
+ repair_code = repairwo,
+ mould_code = mouldcode,
+ verify_surplife = surplife
+ }
+ });
+ //鏇存柊缁翠慨鐢宠鍗曠姸鎬�
+ sql = @"update TMould_RepairRequest set status=@status where docu_code=@docu_code and mould_code=@mouldcode";
+ list.Add(new { str = sql, parm = new { docu_code = data.Rows[0]["source_wo"].ToString(), mouldcode = mouldcode, status = "CONFIR" } });
+ if (result == "OK")
+ {
+
+ if (surplife > 0)
+ {
+ //鍥炲啓妯″叿娓呭崟,妯″叿鐘舵��(姝ｅ父),浣跨敤鐘舵��(宸茬淮淇�),鍓╀綑瀵垮懡(娆�)
+ sql = @"update TMouldInfo set status='Y',usestatus='6',resi_life=@resi_life where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, resi_life = surp_life } });
+ }
+ else
+ {
+ //鍥炲啓妯″叿娓呭崟,妯″叿鐘舵��(姝ｅ父),浣跨敤鐘舵��(宸茬淮淇�)
+ sql = @"update TMouldInfo set status='Y',usestatus='6' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ }
+ }
+ else
+ {
+ //鍥炲啓妯″叿娓呭崟,妯″叿鐘舵��(鏁呴殰),浣跨敤鐘舵��(宸茬淮淇�)
+ sql = @"update TMouldInfo set status='N',usestatus='6' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ }
+ 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 MouldUpQrCodeData(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 MouldUpSave(string mouldcode, string eqp_code, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆涓婁笅鏈烘満璁板綍琛�(涓婃満鎿嶄綔)
+ sql = @"insert into TMould_UpDownReord(mould_code,type,eqp_code,description,is_up,lm_user,lm_date)
+ values(@mould_code,@type,@eqp_code,@description,@is_up,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "UP",
+ eqp_code = eqp_code,
+ description = description,
+ is_up = "Y",
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(涓婃満)
+ sql = @"update TMouldInfo set usestatus='2' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ 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 MouldDownQrCodeData(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 A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ M.surp_life,M.resi_life,A.eqp_code,E.name as eqp_name
+ from TMould_UpDownReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ where A.mould_code=@mouldcode and A.is_up='Y'";
+ 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 MouldDownSave(string mouldcode, string eqp_code, string usecount_life, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆涓婁笅鏈烘満璁板綍琛�(涓嬫満鎿嶄綔)
+ sql = @"insert into TMould_UpDownReord(mould_code,type,usecount_life,eqp_code,description,is_up,lm_user,lm_date)
+ values(@mould_code,@type,@eqp_code,@description,@is_up,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "DOWN",
+ usecount_life = decimal.Parse(usecount_life),
+ eqp_code = eqp_code,
+ description = description,
+ is_up = "N",
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍥炲啓涓婃満璁板綍涓婃満鏍囪瘑(娓呴櫎)
+ sql = @"update TMould_UpDownReord set is_up='N' where mould_code=@mouldcode and eqp_code=@eqp_code";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, eqp_code = eqp_code } });
+ //鍥炲啓妯″叿娓呭崟
+ if (decimal.Parse(usecount_life) > 0)
+ {
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(涓嬫満),鍓╀綑瀵垮懡
+ sql = @"update TMouldInfo set usestatus='3',resi_life=resi_life-@resi_life where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, resi_life = decimal.Parse(usecount_life) } });
+ }
+ else
+ {
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(涓嬫満)
+ sql = @"update TMouldInfo set usestatus='3' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ }
+
+ 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 MouldLendOutQrCodeData(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 MouldLendOutSave(string mouldcode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆澶栧�熷綊杩樿褰曡〃(澶栧�熸搷浣�)
+ sql = @"insert into TMould_LendOutReord(mould_code,type,description,is_ledout,lm_user,lm_date)
+ values(@mould_code,@type,@description,@is_ledout,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "OUT",
+ description = description,
+ is_ledout = "Y",
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(澶栧��)
+ sql = @"update TMouldInfo set usestatus='7' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+
+ 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 MouldReturnQrCodeData(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 A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ M.surp_life,M.resi_life
+ from TMould_LendOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ where A.mould_code=@mouldcode and A.is_ledout='Y'";
+ 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 MouldReturnSave(string mouldcode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鍐欏叆妯″叿澶栧�熻褰曡〃(涓嬫満鎿嶄綔)
+ sql = @"insert into TMould_LendOutReord(mould_code,type,description,is_ledout,lm_user,lm_date)
+ values(@mould_code,@type,@description,@is_ledout,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "IN",
+ description = description,
+ is_ledout = "N",
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ //鍥炲啓妯″叿澶栧�熻褰曡〃澶栧�熸爣璇�(娓呴櫎)
+ sql = @"update TMould_LendOutReord set is_ledout='N' where mould_code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(褰掕繕)
+ sql = @"update TMouldInfo set usestatus='8' where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+
+ 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;
}
}
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5.png
new file mode 100644
index 0000000..b6cce43
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5.png
Binary files differ
--
Gitblit v1.9.3