From f7661ec17f87c4185bbe906fe98e114435a4da5a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 19 十月 2023 12:21:25 +0800
Subject: [PATCH] 1.更改菜单接口排序问题，模具待维修接口过滤问题、增加APP菜单图标 2.更改模具维修申请单、维修单据流水号反写问题 3.增加模具查询功能接口
---
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 15 +++
VueWebCoreApi/Models/MouldSearch/MouldMessage.cs | 65 +++++++++++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5_0.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_10.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_11.png | 0
VueWebCoreApi/Controllers/MouldManagerController.cs | 31 ++++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5_6.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_7.png | 0
VueWebCoreApi/DLL/DAL/LoginDAL.cs | 2
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 145 ++++++++++++++++++++++++++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5_8.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_9.png | 0
12 files changed, 254 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index e1428fe..32bcae9 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -569,6 +569,37 @@
#endregion
+ #region[妯″叿淇℃伅鏌ヨ,鎵弿妯″叿浜岀淮鐮乚
+ /// <summary>
+ /// 妯″叿淇℃伅鏌ヨ,鎵弿妯″叿浜岀淮鐮�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ScanMouldQrCodeMessageData")]
+ [HttpGet]
+ public JsonResult ScanMouldQrCodeMessageData(string mouldcode)
+ {
+ mes = MouldManagerBLL.ScanMouldQrCodeMessageData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇℃伅鏌ヨ鏄庣粏]
+ /// <summary>
+ /// 妯″叿淇℃伅鏌ヨ鏄庣粏
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ScanMouldQrCodeMessageSubData")]
+ [HttpGet]
+ public JsonResult ScanMouldQrCodeMessageSubData(string mouldcode)
+ {
+ mes = MouldManagerBLL.ScanMouldQrCodeMessageSubData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+
#region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
/// <summary>
/// 妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮�
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index bc3a98a..2611e96 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -221,6 +221,21 @@
#endregion
+ #region[妯″叿淇℃伅鏌ヨ,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage ScanMouldQrCodeMessageData(string mouldcode)
+ {
+ return MouldManagerDAL.ScanMouldQrCodeMessageData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿淇℃伅鏌ヨ鏄庣粏]
+ public static ToMessage ScanMouldQrCodeMessageSubData(string mouldcode)
+ {
+ return MouldManagerDAL.ScanMouldQrCodeMessageSubData(mouldcode);
+ }
+ #endregion
+
+
#region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
public static ToMessage MaintainScanMouldApplyQrCodeData(string mouldcode)
{
diff --git a/VueWebCoreApi/DLL/DAL/LoginDAL.cs b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
index 666a512..17e0c81 100644
--- a/VueWebCoreApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
@@ -267,7 +267,7 @@
string codeString = string.Join(",", menuCodes);
//鏌ヨ鑿滃崟鏁版嵁
sql = @"select menucode,menuname,menu_seq,imgurl,'0' as flag,parent_id,is_show
- from TMenu where is_show='Y' and Type=@usertype order by menu_seq";
+ from TMenu where is_show='Y' and Type=@usertype order by CAST(menu_seq as int) ASC";
dynamicParams.Add("@usertype", usertype);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 53f99eb..a7085be 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -9,6 +9,7 @@
using System.Linq;
using System.Threading.Tasks;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.MouldSearch;
using VueWebCoreApi.Tools;
namespace VueWebCoreApi.DLL.DAL
@@ -1878,6 +1879,136 @@
#endregion
+ #region[妯″叿淇℃伅鏌ヨ,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage ScanMouldQrCodeMessageData(string mouldcode)
+ {
+ string sql = "", search = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += " where code=@mouldcode ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ //鏌ユ壘妯″叿淇℃伅
+ sql = @"select code,name,spec
+ from TMouldInfo"+search;
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dt;
+ 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 ScanMouldQrCodeMessageSubData(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<MouldMessage> list = new List<MouldMessage>();
+ try
+ {
+ //鏌ユ壘妯″叿淇℃伅
+ MouldMessage moud = new MouldMessage();
+ sql = @"select code,name,spec,surp_life,resi_life,status,usestatus
+ from TMouldInfo where code=@mouldcode";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+
+ moud.mouldcode = dt.Rows[0]["code"].ToString();
+ moud.mouldname = dt.Rows[0]["name"].ToString();
+ moud.mouldspec = dt.Rows[0]["spec"].ToString();
+ moud.surp_life = dt.Rows[0]["surp_life"].ToString();
+ moud.resi_life = dt.Rows[0]["resi_life"].ToString();
+ moud.status = dt.Rows[0]["status"].ToString();
+ moud.usestatus = dt.Rows[0]["usestatus"].ToString();
+ //鏌ヨ鏈�杩戜竴娆＄偣妫�璁板綍
+ sql = @"select top 1 chk_date from TMouldchk_Proc_Main where mould_code=@mouldcode order by chk_date desc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt0.Rows.Count > 0)
+ {
+ moud.checkdate = dt0.Rows[0]["chk_date"].ToString();
+ }
+ //鏌ヨ鏈�杩戜竴娆′繚鍏昏褰�
+ sql = @"select top 1 maint_date from TMouldmaint_Proc_Main where mould_code=@mouldcode order by maint_date desc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt1.Rows.Count > 0)
+ {
+ moud.maintdate = dt1.Rows[0]["maint_date"].ToString();
+ }
+
+ //鏌ヨ鍏宠仈浜у搧
+ moud.children = new List<RelatedProduct>();
+ sql = @"select P.partcode,M.partname,M.partspec
+ from TMouldInfoPart P
+ left join TMateriel_Info M on P.partcode=M.partcode
+ where P.mouldcode=@mouldcode";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt2 = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt2.Rows.Count > 0)
+ {
+ for (int i = 0; i < dt2.Rows.Count; i++)
+ {
+ RelatedProduct mousb = new RelatedProduct();
+ mousb.partcode = dt2.Rows[i]["partcode"].ToString();
+ mousb.partname = dt2.Rows[i]["partname"].ToString();
+ mousb.partspec = dt2.Rows[i]["partspec"].ToString();
+ moud.children.Add(mousb);
+ }
+ }
+ list.Add(moud);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ 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 MaintainScanMouldApplyQrCodeData(string mouldcode)
{
@@ -2050,6 +2181,9 @@
//鍥炲啓妯″叿娓呭崟,妯″叿鐘舵��(鏁呴殰)銆佷娇鐢ㄧ姸鎬�(寰呯淮淇�)
sql = @"update TMouldInfo set status='N',usestatus='4' where code=@mouldcode";
list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ //鏇存柊鍗曟嵁娴佹按鍙�
+ List<object> list1 = SeachEncodeJob.StrEncodingUpdate(menucode, numvalue);
+ list.Add(list1[0]);
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -2087,18 +2221,19 @@
var dynamicParams = new DynamicParameters();
try
{
- if (mouldcode == "" || mouldcode == null)
+ 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,
+ A.request_person,U.username as request_name,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
+ left join TUser U on A.request_person=U.usercode
where A.status='REPA' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -2206,6 +2341,9 @@
//鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(宸茬淮淇�)
sql = @"update TMouldInfo set usestatus='5' where code=@mouldcode";
list.Add(new { str = sql, parm = new { mouldcode = mouldcode } });
+ //鏇存柊鍗曟嵁娴佹按鍙�
+ List<object> list1 = SeachEncodeJob.StrEncodingUpdate(menucode, numvalue);
+ list.Add(list1[0]);
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -2250,10 +2388,11 @@
}
//鑾峰彇妯″叿缁翠慨鍒楄〃宸茬淮淇殑鏁版嵁
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.repair_person,U.username as repair_name,A.repair_date,A.is_shutdown,
A.failure_descript
from TMould_Repair A
inner join TMouldInfo B on A.mould_code=B.code
+ left join TUser U on A.repair_person=U.usercode
where A.status='COMP' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
diff --git a/VueWebCoreApi/Models/MouldSearch/MouldMessage.cs b/VueWebCoreApi/Models/MouldSearch/MouldMessage.cs
new file mode 100644
index 0000000..f0af1c2
--- /dev/null
+++ b/VueWebCoreApi/Models/MouldSearch/MouldMessage.cs
@@ -0,0 +1,65 @@
+锘縰sing Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.MouldSearch
+{
+ public class MouldMessage
+ {
+ /// <summary>
+ /// 妯″叿缂栫爜
+ /// </summary>
+ public string mouldcode { get; set; }
+ /// <summary>
+ /// 妯″叿鍚嶇О
+ /// </summary>
+ public string mouldname { get; set; }
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ /// </summary>
+ public string mouldspec { get; set; }
+ /// <summary>
+ /// 棰勮瀵垮懡
+ /// </summary>
+ public string surp_life { get; set; }
+ /// <summary>
+ /// 鍓╀綑瀵垮懡
+ /// </summary>
+ public string resi_life { get; set; }
+ /// <summary>
+ /// 妯″叿鐘舵��
+ /// </summary>
+ public string status { get; set; }
+ /// <summary>
+ /// 浣跨敤鐘舵��
+ /// </summary>
+ public string usestatus { get; set; }
+ /// <summary>
+ /// 鏈�杩戠偣妫�
+ /// </summary>
+ public string checkdate { get; set; }
+ /// <summary>
+ /// 鏈�杩戜繚鍏�
+ /// </summary>
+ public string maintdate { get; set; }
+
+ public List<RelatedProduct> children { get; set; }
+ }
+ public class RelatedProduct
+ {
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ public string partcode { get; set; }
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string partname { get; set; }
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ /// </summary>
+ public string partspec { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_0.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_0.png
new file mode 100644
index 0000000..bcc42f8
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_0.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_10.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_10.png
new file mode 100644
index 0000000..d512935
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_10.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_11.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_11.png
new file mode 100644
index 0000000..309c8bf
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_11.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_6.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_6.png
new file mode 100644
index 0000000..197f759
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_6.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_7.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_7.png
new file mode 100644
index 0000000..6aa270f
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_7.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_8.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_8.png
new file mode 100644
index 0000000..a4ab53b
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_8.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_9.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_9.png
new file mode 100644
index 0000000..6c2981e
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_9.png
Binary files differ
--
Gitblit v1.9.3