From cdb442a5c2948f77348ad3ee63d46bed50840f99 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 16 十月 2023 18:28:41 +0800
Subject: [PATCH] 1.APP模具点检功能接口 2.APP模具保养功能接口 3.APP模具维修申请功能接口
---
VueWebCoreApi/wwwroot/AppMenuImage/app_5_3.png | 0
VueWebCoreApi/VueWebCoreApi.csproj | 1
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 78 ++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5_4.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_2.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_5_1.png | 0
VueWebCoreApi/Tools/ImportExcelData.cs | 30 +
VueWebCoreApi/Controllers/MouldManagerController.cs | 173 ++++++++++
VueWebCoreApi/wwwroot/AppMenuImage/app_5_5.png | 0
VueWebCoreApi/Tools/ImportExcel.cs | 2
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 616 +++++++++++++++++++++++++++++++++++++
VueWebCoreApi/Controllers/LoginController.cs | 4
12 files changed, 869 insertions(+), 35 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index 41c272f..8db4513 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -24,9 +24,9 @@
private static readonly string Enterprise = AppSetting.GetAppSetting("Enterprise");
- #region[PC鐢ㄦ埛鐧诲綍]
+ #region[鐢ㄦ埛鐧诲綍(PC/APP)]
/// <summary>
- /// PC鐢ㄦ埛鐧诲綍
+ /// 鐢ㄦ埛鐧诲綍(PC/APP)
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index 4b9b018..ebc3851 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -13,7 +14,7 @@
[ApiExplorerSettings(GroupName = "妯″叿绠＄悊")]
[ApiController]
[Route("api/[controller]")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class MouldManagerController : Controller
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -436,5 +437,173 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮乚
+ /// <summary>
+ /// 妯″叿鐐规,鎵弿妯″叿浜岀淮鐮�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "CheckScanMouldQrCodeData")]
+ [HttpGet]
+ public JsonResult CheckScanMouldQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.CheckScanMouldQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯]
+ /// <summary>
+ /// 妯″叿鐐规,鎵弿妯″叿浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "CheckScanMouldTemp")]
+ [HttpGet]
+ public JsonResult CheckScanMouldTemp(string mouldcode)
+ {
+ mes = MouldManagerBLL.CheckScanMouldTemp(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规,閫夋嫨鎵爜妯″叿銆佺偣妫�鏍囧噯甯﹀嚭鐐规椤筣
+ /// <summary>
+ /// 妯″叿鐐规,閫夋嫨鎵爜妯″叿銆佺偣妫�鏍囧噯甯﹀嚭鐐规椤�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="checktempcode">鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "SelectScanMouldQrCodeItem")]
+ [HttpGet]
+ public JsonResult SelectScanMouldQrCodeItem(string mouldcode, string checktempcode)
+ {
+ mes = MouldManagerBLL.SelectScanMouldQrCodeItem(mouldcode, checktempcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规銆佹彁浜や繚瀛榏
+ /// <summary>
+ /// 妯″叿鐐规銆佹彁浜や繚瀛�
+ /// </summary>
+ /// <param name="menucode">鍔熻兘缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldCheckSave")]
+ [HttpPost]
+ public JsonResult MouldCheckSave(string menucode,AppDevicecCheck json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.MouldCheckSave(menucode,us, json);
+ return Json(mes);
+ }
+ #endregion
+
+
+
+ #region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮乚
+ /// <summary>
+ /// 妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairScanMouldQrCodeData")]
+ [HttpGet]
+ public JsonResult RepairScanMouldQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.RepairScanMouldQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮佹煡鎵句繚鍏绘爣鍑哴
+ /// <summary>
+ /// 妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮佹煡鎵句繚鍏绘爣鍑�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairScanMouldTemp")]
+ [HttpGet]
+ public JsonResult RepairScanMouldTemp(string mouldcode)
+ {
+ mes = MouldManagerBLL.RepairScanMouldTemp(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,閫夋嫨鎵爜妯″叿鍒楄〃甯﹀嚭淇濆吇椤筣
+ /// <summary>
+ /// 妯″叿淇濆吇,閫夋嫨鎵爜妯″叿鍒楄〃甯﹀嚭淇濆吇椤�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="repartempcode">淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairSelectScanMouldQrCodeItem")]
+ [HttpGet]
+ public JsonResult RepairSelectScanMouldQrCodeItem(string mouldcode, string repartempcode)
+ {
+ mes = MouldManagerBLL.RepairSelectScanMouldQrCodeItem(mouldcode, repartempcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,鎻愪氦淇濆瓨]
+ /// <summary>
+ /// 妯″叿淇濆吇,鎻愪氦淇濆瓨
+ /// </summary>
+ /// <param name="menucode">鍔熻兘缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldRepairSave")]
+ [HttpPost]
+ public JsonResult MouldRepairSave(string menucode, AppDevicecCheck json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = MouldManagerBLL.MouldRepairSave(menucode, us, json);
+ return Json(mes);
+ }
+ #endregion
+
+
+
+ #region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
+ /// <summary>
+ /// 妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MaintainScanMouldApplyQrCodeData")]
+ [HttpGet]
+ public JsonResult MaintainScanMouldApplyQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MaintainScanMouldApplyQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ /// <summary>
+ /// 璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MaintainScanMouldApplySave")]
+ [HttpPost]
+ public JsonResult MaintainScanMouldApplySave([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 mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string faultsourcecode = obj["faultsourcecode"].ToString(); //鏁呴殰鏉ユ簮缂栫爜
+ string faultdescr = obj["faultdescr"].ToString(); //鏁呴殰鎻忚堪
+ mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode, faultdescr,us, files);
+ return Json(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index 115578c..ed63581 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Microsoft.AspNetCore.Http;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -160,5 +161,80 @@
return MouldManagerDAL.SaveRepairStanedAssociationMould(repairstand_code, us, json);
}
#endregion
+
+
+
+ #region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage CheckScanMouldQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.CheckScanMouldQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯]
+ public static ToMessage CheckScanMouldTemp(string mouldcode)
+ {
+ return MouldManagerDAL.CheckScanMouldTemp(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿鐐规,閫夋嫨鎵爜妯″叿銆佺偣妫�鏍囧噯甯﹀嚭鐐规椤筣
+ public static ToMessage SelectScanMouldQrCodeItem(string mouldcode, string checktempcode)
+ {
+ return MouldManagerDAL.SelectScanMouldQrCodeItem(mouldcode,checktempcode);
+ }
+ #endregion
+
+ #region[妯″叿鐐规銆佹彁浜や繚瀛榏
+ public static ToMessage MouldCheckSave(string menucode, User us, AppDevicecCheck json)
+ {
+ return MouldManagerDAL.MouldCheckSave(menucode,us, json);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage RepairScanMouldQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.RepairScanMouldQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮佹煡鎵句繚鍏绘爣鍑哴
+ public static ToMessage RepairScanMouldTemp(string mouldcode)
+ {
+ return MouldManagerDAL.RepairScanMouldTemp(mouldcode);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,閫夋嫨鎵爜妯″叿鍒楄〃甯﹀嚭淇濆吇椤筣
+ public static ToMessage RepairSelectScanMouldQrCodeItem(string mouldcode, string repartempcode)
+ {
+ return MouldManagerDAL.RepairSelectScanMouldQrCodeItem(mouldcode,repartempcode);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇,鎻愪氦淇濆瓨]
+ public static ToMessage MouldRepairSave(string menucode, User us, AppDevicecCheck json)
+ {
+ return MouldManagerDAL.MouldRepairSave(menucode, us,json);
+ }
+ #endregion
+
+
+
+ #region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage MaintainScanMouldApplyQrCodeData(string mouldcode)
+ {
+ return MouldManagerDAL.MaintainScanMouldApplyQrCodeData(mouldcode);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
+ {
+ return MouldManagerDAL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode,faultdescr,us,files);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 273a95e..9726683 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -1,9 +1,11 @@
锘縰sing Dapper;
+using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
using System.Linq;
using System.Threading.Tasks;
using VueWebCoreApi.Models;
@@ -438,7 +440,7 @@
#endregion
#region[妯″叿鐐规椤瑰垹闄
- public static ToMessage DeleteMouldCheckItem(string checkitemcode,User us)
+ public static ToMessage DeleteMouldCheckItem(string checkitemcode, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -607,7 +609,7 @@
{
//鏂板妯″叿鐐规鏍囧噯涓昏〃
sql = @"insert into TMouldchk_Main(code,name,description,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
- list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description,lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
+ list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description, lm_user = us.usercode, lm_date = DateTime.Now.ToString() } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
//鏂板妯″叿鐐规鏍囧噯鍏宠仈鐐规椤瑰瓙琛�
@@ -653,7 +655,7 @@
list.Add(new { str = sql, parm = new { checkstaned_code = json.code } });
//淇敼鐐规鏍囧噯涓昏〃
sql = @"update TMouldchk_Main set name=@checkstaned_name,description=@checkstaned_desc where code=@checkstaned_code";
- list.Add(new { str = sql, parm = new { checkstaned_code = json.code, checkstaned_name = json.name, checkstaned_desc = json.description} });
+ list.Add(new { str = sql, parm = new { checkstaned_code = json.code, checkstaned_name = json.name, checkstaned_desc = json.description } });
//鏂板鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
for (int i = 0; i < json.Data.Rows.Count; i++)
{
@@ -791,7 +793,7 @@
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
- else
+ else
{
mes.code = "300";
mes.Message = "鏃犳ā鍏疯祫鏂�!";
@@ -1015,7 +1017,7 @@
list.Clear();
//鍒ゆ柇淇濆吇鏍囧噯椤圭洰鏄惁鏈夊叧鑱斾繚鍏绘爣鍑�,涓嶅厑璁稿垹闄�
sql = @"select * from TMouldmai_Deta
- where code=@checkitemcode";
+ where code=@maiitemcode";
dynamicParams.Add("@maiitemcode", maiitemcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
@@ -1179,17 +1181,17 @@
{
//鏂板妯″叿淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
sql = @"insert TMouldmai_Deta (seq,code,name,mouldmai_main_code,chkdesc,lm_user,lm_date)
- values(@checkitem_seq,@checkitem_code,@mouldmai_main_code,@chkdesc,@lm_user,@lm_date)";
+ values(@checkitem_seq,@checkitem_code,@checkitem_name,@mouldmai_main_code,@chkdesc,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
parm = new
{
- checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
- checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
- checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
- mouldmai_main_code=json.code,
- chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["REPAIRITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["REPAIRITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["REPAIRITEM_NAME"].ToString(),
+ mouldmai_main_code = json.code,
+ chkdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -1231,11 +1233,11 @@
str = sql,
parm = new
{
- checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["CHECKITEM_SEQ"].ToString()),
- checkitem_code = json.Data.Rows[i]["CHECKITEM_CODE"].ToString(),
- checkitem_name = json.Data.Rows[i]["CHECKITEM_NAME"].ToString(),
+ checkitem_seq = Convert.ToInt32(json.Data.Rows[i]["REPAIRITEM_SEQ"].ToString()),
+ checkitem_code = json.Data.Rows[i]["REPAIRITEM_CODE"].ToString(),
+ checkitem_name = json.Data.Rows[i]["REPAIRITEM_NAME"].ToString(),
mouldmai_main_code = json.code,
- chkdesc = json.Data.Rows[i]["CHECKITEM_DESCR"].ToString(),
+ chkdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
}
@@ -1447,5 +1449,589 @@
}
#endregion
+
+
+ #region[妯″叿鐐规,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage CheckScanMouldQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲妯″叿淇℃伅
+ sql = @"select A.code,A.name,A.spec
+ from TMouldInfo A
+ where A.code=@mouldcode and A.status='Y'";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ 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 CheckScanMouldTemp(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲妯″叿鐐规鏍囧噯
+ sql = @"select M.code,M.name from TMouldchk_Mould E
+ inner join TMouldchk_Main M on E.mouldchkmain_code=M.code
+ where E.mould_code=@mouldcode order by M.lm_date desc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ 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 SelectScanMouldQrCodeItem(string mouldcode, string checktempcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲妯″叿鍏宠仈鐨勭偣妫�椤圭洰
+ sql = @"select S.seq,S.code,S.name,S.chkdesc
+ from TMouldchk_Mould A
+ inner join TMouldchk_Main B on A.mouldchkmain_code=B.code
+ inner join TMouldchk_Deta S on B.code=S.mouldchk_main_code
+ where A.mould_code=@mouldcode and B.code=@checktempcode
+ order by S.seq asc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ dynamicParams.Add("@checktempcode", checktempcode);
+ 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 MouldCheckSave(string menucode, User us, AppDevicecCheck json)
+ {
+ var sql = "";
+ string djwo = "", 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;
+ djwo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ if (json == null || json.children.Count <= 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍐欏叆鐐规璁板綍涓昏〃
+ sql = @"insert into TMouldchk_Proc_Main(djwo,mould_code,mouldchkmain_code,chk_user,chk_date,chk_result)
+ values(@djwo,@mould_code,@mouldchkmain_code,@lm_user,@lm_date,@chk_result)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ djwo = djwo,
+ mould_code = json.code,
+ mouldchkmain_code = json.standcode,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString(),
+ chk_result = json.result
+ }
+ });
+ //寰幆鍐欏叆鐐规璁板綍瀛愯〃
+ for (int i = 0; i < json.children.Count; i++)
+ {
+ sql = @"insert into TMouldchk_Proc_Deta(seq,m_id,mouldchkdeta_code,result,chk_value,lm_user,lm_date)
+ values(@seq,CONVERT(INT,IDENT_CURRENT('TMouldchk_Proc_Main')),@mouldchkdeta_code,@result,@chk_value,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ seq = json.children[i].seq,
+ mouldchkdeta_code = json.children[i].itemcode,
+ result = json.children[i].result,
+ chk_value = json.children[i].value,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ }); ;
+ }
+ //鏇存柊鍗曟嵁娴佹按鍙�
+ List<object> list1 = SeachEncodeJob.StrEncodingUpdate(menucode, numvalue);
+ list.Add(list1[0]);
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规", "妯″叿:" + json.code, us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鐐规鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鐐规澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage RepairScanMouldQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇妯″叿淇℃伅
+ sql = @"select A.code,A.name,A.spec
+ from TMouldInfo A
+ where A.code=@mouldcode and A.status='Y' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ 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 RepairScanMouldTemp(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲妯″叿淇濆吇鏍囧噯
+ sql = @"select M.code,M.name from TMouldmai_Mould E
+ inner join TMouldchk_Main M on E.mouldmaimain_code=M.code
+ where E.mould_code=@mouldcode order by M.lm_date desc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ 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 RepairSelectScanMouldQrCodeItem(string mouldcode, string repartempcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲妯″叿鍏宠仈鐨勪繚鍏婚」鐩�
+ sql = @"select S.seq,S.code,S.name,S.chkdesc
+ from TMouldmai_Mould A
+ inner join TMouldmai_Main B on A.mouldmaimain_code=B.code
+ inner join TMouldmai_Deta S on B.code=S.mouldmai_main_code
+ where A.mould_code=@mouldcode and B.code=@repartempcode
+ order by S.seq asc";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ dynamicParams.Add("@repartempcode", repartempcode);
+ 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 MouldRepairSave(string menucode, User us, AppDevicecCheck json)
+ {
+ var sql = "";
+ string bywo = "", 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;
+ bywo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ if (json == null || json.children.Count <= 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍐欏叆淇濆吇璁板綍涓昏〃
+ 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)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ bywo = bywo,
+ mould_code = json.code,
+ mouldmaint_code = json.standcode,
+ lm_user = us.usercode,
+ lm_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)
+ values(@seq,CONVERT(INT,IDENT_CURRENT('TMouldmaint_Proc_Main')),@mouldmaideta_code,@result,@maint_value,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ seq = json.children[i].seq,
+ mouldmaideta_code = json.children[i].itemcode,
+ result = json.children[i].result,
+ maint_value = json.children[i].value,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ }); ;
+ }
+ //鏇存柊鍗曟嵁娴佹按鍙�
+ List<object> list1 = SeachEncodeJob.StrEncodingUpdate(menucode, numvalue);
+ list.Add(list1[0]);
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇", "妯″叿:" + json.code, us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "淇濆吇鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇濆吇澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[妯″叿缁翠慨鐢宠,鎵弿妯″叿浜岀淮鐮乚
+ public static ToMessage MaintainScanMouldApplyQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇褰撳墠鎵爜妯″叿鏄惁瀛樺湪宸茬敵璇锋垨宸茬淮淇姸鎬佹暟鎹�
+ sql = @"select * from TMould_RepairRequest where mould_code=@mouldcode and status<>'CONFIR'";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ //鏌ョ湅缁翠慨璁板綍閲岄潰鏄惁鏈夊凡鐢宠鏈淮淇強缁翠慨纭鐨勬暟鎹�
+ var rows = data0.AsEnumerable().Where(item => item["STATUS"].ToString().Equals("REPA")).ToArray();
+ if (rows.Length > 0)
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
+ mes.data = null;
+ }
+ }
+ else
+ {
+ //鑾峰彇瀵瑰簲妯″叿淇℃伅
+ sql = @"select A.code,A.name,A.spec
+ from TMouldInfo A
+ where A.code=@mouldcode and A.status='Y' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ 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 MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, 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;
+ }
+ else
+ {
+ List<string> wo = (List<string>)mes.data;
+ wxwo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ //缁翠慨鐢宠涓婁紶鍥剧墖
+ if (files != null && files.Count > 0)
+ {
+ for (int i = 0; i < files.Count; i++)
+ {
+ // 鐢熸垚鏂囦欢鍚�
+ var fileName = 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 = wxwo,
+ 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 = wxwo,
+ docu_date = DateTime.Now.ToString(),
+ status = "REPA",
+ mould_code = mouldcode,
+ request_person = us.usercode,
+ request_date = DateTime.Now.ToString(),
+ failure_descript = faultdescr,
+ source = faultsourcecode
+ }
+ });
+
+ 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/Tools/ImportExcel.cs b/VueWebCoreApi/Tools/ImportExcel.cs
index c6f0b4f..50f3967 100644
--- a/VueWebCoreApi/Tools/ImportExcel.cs
+++ b/VueWebCoreApi/Tools/ImportExcel.cs
@@ -1310,7 +1310,7 @@
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = excelTable[i].Rows.IndexOf(row).ToString();
- erro.ErrorField = emptyColumn.ColumnName;
+ erro.ErrorField = duplicateColumn.ColumnName;
erro.ErrorCont = "妯℃澘琛ㄥご甯�(鍞竴)鐨勫垪涓瓨鍦ㄩ噸澶嶅��,绗�" + excelTable[i].Rows.IndexOf(row).ToString() + "琛�,蹇呭～瀛楁锛�" + duplicateColumn.ColumnName + "閲嶅";
list.Add(erro);
diff --git a/VueWebCoreApi/Tools/ImportExcelData.cs b/VueWebCoreApi/Tools/ImportExcelData.cs
index 71e7ec5..6cf5cad 100644
--- a/VueWebCoreApi/Tools/ImportExcelData.cs
+++ b/VueWebCoreApi/Tools/ImportExcelData.cs
@@ -3479,8 +3479,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("妯″叿缂栫爜"))
+ select rr.Field<string>("*妯″叿缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("妯″叿缂栫爜").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3605,7 +3605,7 @@
list.Add(erro);
}
//閫氳繃妯″叿鐐规鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿鐐规椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
- var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿鐐规鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
if (ds.Rows.Count > 0)
{
@@ -3635,15 +3635,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldchk_Item where code=@code";
+ sql = @"select * from TMouldchk_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿鐐规椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿鐐规閮ㄤ綅琛�:{*妯″叿鐐规椤圭紪鍙�(鍞竴),*妯″叿鐐规椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏风偣妫�椤逛腑涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -3652,8 +3653,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿鐐规鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
@@ -3777,7 +3778,7 @@
list.Add(erro);
}
//閫氳繃妯″叿淇濆吇鏍囧噯椤电妯℃澘涓殑鏍囧噯缂栫爜鏌ヨ妯″叿淇濆吇椤归〉绛炬ā鏉夸腑瀵瑰簲鐨勬暟鎹俊鎭�
- var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
+ var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*妯″叿淇濆吇鏍囧噯缂栧彿"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
if (ds.Rows.Count > 0)
{
@@ -3807,15 +3808,16 @@
{
if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
{
- sql = @"select * from TMouldmai_Item where code=@code";
+ sql = @"select * from TMouldmai_Item where code=@code and name=@name";
dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
+ dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
- if (dt.Rows.Count < 0)
+ if (dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}";
- erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "鍦ㄦ暟鎹〃涓笉瀛樺湪";
+ erro.ErrorCont = "妯″叿淇濆吇閮ㄤ綅琛�:{*妯″叿淇濆吇椤圭紪鍙�(鍞竴),*妯″叿淇濆吇椤瑰悕绉皚瀛楁{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}鍦ㄦā鍏蜂繚鍏婚」涓笉瀛樺湪";
list.Add(erro);
}
}
@@ -3824,8 +3826,8 @@
var dt3 = from r in excelTable[1].AsEnumerable()
where !(
from rr in excelTable[0].AsEnumerable()
- select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)")
- ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿"))
+ select rr.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿(鍞竴)").Trim()
+ ).Contains(r.Field<string>("*妯″叿淇濆吇鏍囧噯缂栧彿").Trim())
select r;
List<DataRow> listRow = dt3.ToList();
if (listRow.Count > 0)
diff --git a/VueWebCoreApi/VueWebCoreApi.csproj b/VueWebCoreApi/VueWebCoreApi.csproj
index 1e87428..03e5667 100644
--- a/VueWebCoreApi/VueWebCoreApi.csproj
+++ b/VueWebCoreApi/VueWebCoreApi.csproj
@@ -48,6 +48,7 @@
<ItemGroup>
<Folder Include="InExcel\" />
<Folder Include="wwwroot\newxls\" />
+ <Folder Include="wwwroot\MouldRecordImage\" />
</ItemGroup>
<ItemGroup>
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_1.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_1.png
new file mode 100644
index 0000000..2adfdcc
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_1.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_2.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_2.png
new file mode 100644
index 0000000..e8fa27d
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_2.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_3.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_3.png
new file mode 100644
index 0000000..c639232
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_3.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_4.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_4.png
new file mode 100644
index 0000000..ad08cb7
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_4.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_5_5.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_5.png
new file mode 100644
index 0000000..13fcc9c
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_5_5.png
Binary files differ
--
Gitblit v1.9.3