From 36ce82f94805fb73459ac28aaa4ebdb5900c8d65 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 29 八月 2022 17:24:08 +0800
Subject: [PATCH] 修改设备保养项(去除保养周期) 新增设备保养App扫描设备(工位)接口
---
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Controllers/AppDeviceManageController.cs | 22 +++
VueWebApi/Models/EqpRepair.cs | 18 +++
VueWebApi/DLL/BLL/DeviceManagerBLL.cs | 10 +-
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 12 +-
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 4
VueWebApi/Tools/ImportExcelData.cs | 52 ++++-----
VueWebApi/bin/VueWebApi.xml | 14 ++
VueWebApi/DLL/BLL/AppDeviceManageBLL.cs | 13 ++
VueWebApi/VueWebApi.csproj | 1
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Logs/2022-08-29.TXT | 0
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 43 ++++++++
VueWebApi/Controllers/DeviceManagerController.cs | 10 -
VueWebApi/obj/Release/Package/PackageTmp/Excel/设备保养项目.xls | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 14 ++
VueWebApi/Excel/设备保养项目.xls | 0
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 78 +++++++--------
21 files changed, 189 insertions(+), 104 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index ea90646..0d540dd 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/AppDeviceManageController.cs b/VueWebApi/Controllers/AppDeviceManageController.cs
index d1dd7e1..da69830 100644
--- a/VueWebApi/Controllers/AppDeviceManageController.cs
+++ b/VueWebApi/Controllers/AppDeviceManageController.cs
@@ -24,11 +24,11 @@
/// </summary>
/// <param name="eqpcode">璁惧缂栫爜</param>
/// <returns></returns>
- [Route(template: "ScanDeviceQrCodeData")]
+ [Route(template: "CheckScanDeviceQrCodeData")]
[HttpGet]
- public HttpResponseMessage ScanDeviceQrCodeData(string eqpcode)
+ public HttpResponseMessage CheckScanDeviceQrCodeData(string eqpcode)
{
- mes = AppDeviceManageBLL.ScanDeviceQrCodeData(eqpcode);
+ mes = AppDeviceManageBLL.CheckScanDeviceQrCodeData(eqpcode);
return TJson.toJson(mes);
}
#endregion
@@ -63,5 +63,21 @@
return TJson.toJson(mes);
}
#endregion
+
+
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ /// <summary>
+ /// 瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
+ /// </summary>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairScanDeviceQrCodeData")]
+ [HttpGet]
+ public HttpResponseMessage RepairScanDeviceQrCodeData(string eqpcode)
+ {
+ mes = AppDeviceManageBLL.RepairScanDeviceQrCodeData(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index 9a74360..985c415 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -343,7 +343,6 @@
/// <param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
/// <param name="maidescr">淇濆吇瑕佹眰</param>
/// <param name="isqrcode">閫変腑鎵爜</param>
- /// <param name="cycle">淇濆吇鍛ㄦ湡</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -351,11 +350,11 @@
/// <returns></returns>
[Route(template: "DeviceMaiItemSearch")]
[HttpGet]
- public HttpResponseMessage DeviceMaiItemSearch(int page, int rows, string prop, string order,string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null, string cycle = null)
+ public HttpResponseMessage DeviceMaiItemSearch(int page, int rows, string prop, string order,string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -374,11 +373,10 @@
string maiitemcode = obj["maiitemcode"].ToString(); //璁惧淇濆吇閮ㄤ綅缂栫爜
string maiitemname = obj["maiitemname"].ToString(); //璁惧淇濆吇閮ㄤ綅鍚嶇О
string maiitemdescr = obj["maiitemdescr"].ToString(); //璁惧淇濆吇閮ㄤ綅瑕佹眰
- string cycle = obj["cycle"].ToString(); //璁惧鐐规閮ㄤ綅鍛ㄦ湡
string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, OperType);
+ mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -578,7 +576,7 @@
/// <returns></returns>
[Route(template: "AddUpdateDeviceRepairStandArd")]
[HttpPost]
- public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, RoutEdit json)
+ public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, username);
diff --git a/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs b/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
index 825fbc8..9c1258f 100644
--- a/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
+++ b/VueWebApi/DLL/BLL/AppDeviceManageBLL.cs
@@ -11,9 +11,9 @@
public class AppDeviceManageBLL
{
#region[鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
- public static ToMessage ScanDeviceQrCodeData(string eqpcode)
+ public static ToMessage CheckScanDeviceQrCodeData(string eqpcode)
{
- return AppDeviceManageDAL.ScanDeviceQrCodeData(eqpcode);
+ return AppDeviceManageDAL.CheckScanDeviceQrCodeData(eqpcode);
}
#endregion
@@ -30,5 +30,14 @@
return AppDeviceManageDAL.AppDeviceCheckSave(username,json);
}
#endregion
+
+
+
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage RepairScanDeviceQrCodeData(string eqpcode)
+ {
+ return AppDeviceManageDAL.RepairScanDeviceQrCodeData(eqpcode);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
index 5e56a94..6659c42 100644
--- a/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -129,16 +129,16 @@
#region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
- public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, int startNum, int endNum, string prop, string order)
{
- return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
+ return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
}
#endregion
#region[璁惧淇濆吇椤规柊澧炵紪杈慮
- public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, string usercode, string operType)
{
- return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, operType);
+ return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, operType);
}
#endregion
@@ -224,7 +224,7 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
- public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, RoutEdit json, string username)
+ public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, string username)
{
return DeviceManagerDAL.AddUpdateDeviceRepairStandArd(opertype, json, username);
}
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 4dd4d7c..e37816c 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -21,7 +21,7 @@
#region[鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
- public static ToMessage ScanDeviceQrCodeData(string eqpcode)
+ public static ToMessage CheckScanDeviceQrCodeData(string eqpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -188,5 +188,46 @@
return mes;
}
#endregion
+
+
+
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage RepairScanDeviceQrCodeData(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍙婃墍灞炶溅闂�
+ sql = @"select A.code,A.name,T.org_code as wksp_code,T.org_name as wksp_name,E.eqpchkmain_code
+ from TEqpInfo A
+ left join TOrganization T on A.wksp_code=T.org_code
+ left join TEqpchk_Eqp E on A.code=E.eqp_code
+ where A.code=@eqpcode and A.enable='Y' and T.description='W'";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ 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
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index b4df942..6357af2 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -663,27 +663,27 @@
{
if (checkitemcode != "" && checkitemcode != null)
{
- search += "and code like '%'+@checkitemcode+'%' ";
+ search += "and A.code like '%'+@checkitemcode+'%' ";
dynamicParams.Add("@checkitemcode", checkitemcode);
}
if (checkitemname != "" && checkitemname != null)
{
- search += "and name like '%'+@checkitemname+'%' ";
+ search += "and A.name like '%'+@checkitemname+'%' ";
dynamicParams.Add("@checkitemname", checkitemname);
}
if (checkdescr != "" && checkdescr != null)
{
- search += "and description=@checkdescr ";
+ search += "and A.description=@checkdescr ";
dynamicParams.Add("@checkdescr", checkdescr);
}
if (isqrcode != "" && isqrcode != null)
{
- search += "and isscan=@isqrcode ";
+ search += "and A.isscan=@isqrcode ";
dynamicParams.Add("@isqrcode", isqrcode);
}
if (cycle != "" && cycle != null)
{
- search += "and isscan=@cycle ";
+ search += "and A.cycle=@cycle ";
dynamicParams.Add("@cycle", cycle);
}
if (search == "")
@@ -693,8 +693,10 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
- from TEqpchk_Item where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.description,A.isscan,A.cycle,U.username as lm_user,A.lm_date
+ from TEqpchk_Item A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -842,7 +844,7 @@
#region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
- public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
+ public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -850,28 +852,23 @@
{
if (maiitemcode != "" && maiitemcode != null)
{
- search += "and code like '%'+@maiitemcode+'%' ";
+ search += "and A.code like '%'+@maiitemcode+'%' ";
dynamicParams.Add("@maiitemcode", maiitemcode);
}
if (maiitemname != "" && maiitemname != null)
{
- search += "and name like '%'+@maiitemname+'%' ";
+ search += "and A.name like '%'+@maiitemname+'%' ";
dynamicParams.Add("@maiitemname", maiitemname);
}
if (maidescr != "" && maidescr != null)
{
- search += "and description=@maidescr ";
+ search += "and A.description=@maidescr ";
dynamicParams.Add("@maidescr", maidescr);
}
if (isqrcode != "" && isqrcode != null)
{
- search += "and isscan=@isqrcode ";
+ search += "and A.isscan=@isqrcode ";
dynamicParams.Add("@isqrcode", isqrcode);
- }
- if (cycle != "" && cycle != null)
- {
- search += "and isscan=@cycle ";
- dynamicParams.Add("@cycle", cycle);
}
if (search == "")
{
@@ -880,8 +877,10 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
- from TEqpmai_Item where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.description,A.isscan,U.username as lm_user,A.lm_date
+ from TEqpmai_Item A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -900,20 +899,19 @@
#endregion
#region[璁惧淇濆吇椤规柊澧炵紪杈慮
- public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
+ public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, string usercode, string operType)
{
var dynamicParams = new DynamicParameters();
try
{
if (operType == "Add")
{
- var sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
- values(@maiitemcode,@maiitemname,@checkitemdescr,@isqrcode,@cycle,@usercode,@CreateDate)";
+ var sql = @"insert into TEqpmai_Item(code,name,description,isscan,lm_user,lm_date)
+ values(@maiitemcode,@maiitemname,@checkitemdescr,@isqrcode,@usercode,@CreateDate)";
dynamicParams.Add("@maiitemcode", maiitemcode);
dynamicParams.Add("@maiitemname", maiitemname);
dynamicParams.Add("@maiitemdescr", maiitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
- dynamicParams.Add("@cycle", cycle);
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
int cont = DapperHelper.SQL(sql, dynamicParams);
@@ -934,14 +932,13 @@
}
if (operType == "Update")
{
- var sql = @"update TEqpmai_Item set name=@maiitemname,description=@maiitemdescr,isscan=@isqrcode,cycle=@cycle,
+ var sql = @"update TEqpmai_Item set name=@maiitemname,description=@maiitemdescr,isscan=@isqrcode,
lm_user=@usercode,lm_date=@CreateDate
where id=@maiitemid";
dynamicParams.Add("@maiitemid", maiitemid);
dynamicParams.Add("@maiitemname", maiitemname);
dynamicParams.Add("@maiitemdescr", maiitemdescr);
dynamicParams.Add("@isqrcode", isqrcode);
- dynamicParams.Add("@cycle", cycle);
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
int cont = DapperHelper.SQL(sql, dynamicParams);
@@ -1210,7 +1207,7 @@
list.Add(new { str = sql, parm = new { checkstaned_code = json.code } });
//淇敼鐐规鏍囧噯涓昏〃
sql = @"update TEqpchk_Main set name=@checkstaned_name,description=@checkstaned_desc,iscontr=@iscontr 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,iscontr = json.enable } });
//鏂板鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
for (int i = 0; i < json.Data.Rows.Count; i++)
{
@@ -1350,7 +1347,7 @@
// where A.eqpchkmain_code=@checkstand_code and A.is_delete<>'1' and B.is_delete<>'1'
// ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
sql = @"select * from(
- select AA.code,AA.name,(case when BB.eqpchkmain_code is null then 'N' else 'Y' end) flag,(case when AA.eqpchkmain_code is null then 'N' else 'Y' end) flage1
+ select AA.code,AA.name,'E' as type,(case when BB.eqpchkmain_code is null then 'N' else 'Y' end) flag,(case when AA.eqpchkmain_code is null then 'N' else 'Y' end) flage1
from(
select A.code,A.name,B.eqpchkmain_code
from TEqpInfo A
@@ -1494,7 +1491,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,is_repaireqp,lm_user,lm_date
+ var sql = @"select id,code,name,description,is_repaireqp,main_cycle,lm_user,lm_date
from TEqpmai_Main where is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1550,11 +1547,12 @@
where code=@repairstand_code and is_delete<>'1'";
dynamicParams.Add("@repairstand_code", repairstand_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
- RoutEdit rout = new RoutEdit();
+ EqpRepair rout = new EqpRepair();
if (data.Rows.Count > 0)
{
rout.code = data.Rows[0]["CODE"].ToString();
rout.name = data.Rows[0]["NAME"].ToString();
+ rout.repaircycle= data.Rows[0]["MAIN_CYCLE"].ToString();
rout.description = data.Rows[0]["DESCRIPTION"].ToString();
}
else
@@ -1589,7 +1587,7 @@
#endregion
#region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
- public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, RoutEdit json, string username)
+ public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, string username)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -1599,13 +1597,13 @@
if (opertype == "Add")
{
//鏂板璁惧淇濆吇鏍囧噯涓昏〃
- sql = @"insert into TEqpmai_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 = username, lm_date = DateTime.Now.ToString() } });
+ sql = @"insert into TEqpmai_Main(code,name,description,main_cycle,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,main_cycle=json.repaircycle, lm_user = username, lm_date = DateTime.Now.ToString() } });
for (int i = 0; i < json.Data.Rows.Count; i++)
{
//鏂板璁惧淇濆吇鏍囧噯鍏宠仈淇濆吇椤瑰瓙琛�
- sql = @"insert TEqpmai_Deta (seq,code,name,eapmai_code,cycle,chk_desc,isscan,lm_user,lm_date)
- values(@repairitem_seq,@repairitem_code,@repairitem_name,@code,@cycle,@repairdesc,@isscan,@lm_user,@lm_date)";
+ sql = @"insert TEqpmai_Deta (seq,code,name,eapmai_code,chk_desc,isscan,lm_user,lm_date)
+ values(@repairitem_seq,@repairitem_code,@repairitem_name,@code,@repairdesc,@isscan,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -1615,7 +1613,6 @@
repairitem_code = json.Data.Rows[i]["REPAIRITEM_CODE"].ToString(),
repairitem_name = json.Data.Rows[i]["REPAIRITEM_NAME"].ToString(),
code = json.code,
- cycle = json.Data.Rows[i]["CYCLE"].ToString(),
repairdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
isscan = json.Data.Rows[i]["ISSCAN"].ToString(),
lm_user = username,
@@ -1645,13 +1642,13 @@
sql = @"delete from TEqpmai_Deta where eapmai_code=@repairstaned_code";
list.Add(new { str = sql, parm = new { repairstaned_code = json.code } });
//淇敼淇濆吇鏍囧噯涓昏〃
- sql = @"update TEqpmai_Main set name=@repairstaned_name,description=@repairstaned_desc where code=@repairstaned_code";
- list.Add(new { str = sql, parm = new { repairstaned_code = json.code, repairstaned_name = json.name, repairstaned_desc = json.description } });
+ sql = @"update TEqpmai_Main set name=@repairstaned_name,description=@repairstaned_desc,main_cycle=@main_cycle where code=@repairstaned_code";
+ list.Add(new { str = sql, parm = new { repairstaned_code = json.code, repairstaned_name = json.name, repairstaned_desc = json.description, main_cycle =json.repaircycle} });
//鏂板鐐规鏍囧噯鍏宠仈鐐规椤圭洰瀛愯〃
for (int i = 0; i < json.Data.Rows.Count; i++)
{
- sql = @"insert TEqpmai_Deta (seq,code,name,eapmai_code,cycle,chk_desc,isscan,lm_user,lm_date)
- values(@repairitem_seq,@repairitem_code,@repairitem_name,@code,@cycle,@repairdesc,@isscan,@lm_user,@lm_date)";
+ sql = @"insert TEqpmai_Deta (seq,code,name,eapmai_code,chk_desc,isscan,lm_user,lm_date)
+ values(@repairitem_seq,@repairitem_code,@repairitem_name,@code,@repairdesc,@isscan,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -1661,7 +1658,6 @@
repairitem_code = json.Data.Rows[i]["REPAIRITEM_CODE"].ToString(),
repairitem_name = json.Data.Rows[i]["REPAIRITEM_NAME"].ToString(),
code = json.code,
- cycle = json.Data.Rows[i]["CYCLE"].ToString(),
repairdesc = json.Data.Rows[i]["REPAIRITEM_DESCR"].ToString(),
isscan = json.Data.Rows[i]["ISSCAN"].ToString(),
lm_user = username,
@@ -1787,7 +1783,7 @@
// where A.eapmai_code=@repairstand_code and A.is_delete<>'1' and B.is_delete<>'1'
// ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
sql = @"select * from(
- select AA.code,AA.name,(case when BB.eapmai_code is null then 'N' else 'Y' end) flag,(case when AA.eapmai_code is null then 'N' else 'Y' end) flage1
+ select AA.code,AA.name,'E' as type,(case when BB.eapmai_code is null then 'N' else 'Y' end) flag,(case when AA.eapmai_code is null then 'N' else 'Y' end) flage1
from(
select A.code,A.name,B.eapmai_code
from TEqpInfo A
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 770ca17..9393548 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -138,7 +138,7 @@
}
if (i == Convert.ToInt32(ordernum)) //鏈�鍚庝竴鍗曟椂
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
list.Add(new
{
str = sql,
@@ -161,7 +161,7 @@
else
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
list.Add(new
{
str = sql,
diff --git "a/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls" "b/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
index b594159..1b4fc48 100644
--- "a/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
+++ "b/VueWebApi/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
Binary files differ
diff --git a/VueWebApi/Logs/2022-08-29.TXT b/VueWebApi/Logs/2022-08-29.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-08-29.TXT
diff --git a/VueWebApi/Models/EqpRepair.cs b/VueWebApi/Models/EqpRepair.cs
new file mode 100644
index 0000000..5b47561
--- /dev/null
+++ b/VueWebApi/Models/EqpRepair.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class EqpRepair
+ {
+ public string code { get; set; }
+ public string name { get; set; }
+ public string enable { get; set; }
+ public string repaircycle { get; set; }
+ public string description { get; set; }
+ public DataTable Data { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index f717403..3df743b 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2022-08-26T09:02:52.4614637Z;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2022-08-29T09:21:17.7779579Z;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -696,16 +696,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>08/26/2022 17:02:47</publishTime>
+ <publishTime>08/29/2022 17:21:11</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/26/2022 17:02:47</publishTime>
+ <publishTime>08/29/2022 17:21:11</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/26/2022 17:02:46</publishTime>
+ <publishTime>08/29/2022 17:21:11</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -789,7 +789,7 @@
<publishTime>07/22/2022 11:26:24</publishTime>
</File>
<File Include="Excel/璁惧淇濆吇椤圭洰.xls">
- <publishTime>08/17/2022 10:40:51</publishTime>
+ <publishTime>08/29/2022 12:08:02</publishTime>
</File>
<File Include="Excel/璁惧鐐规椤圭洰.xls">
<publishTime>08/17/2022 09:56:57</publishTime>
@@ -1449,7 +1449,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/26/2022 17:02:51</publishTime>
+ <publishTime>08/29/2022 17:21:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 0057bdd..4d64a78 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -737,19 +737,13 @@
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�3鍒楀簲涓簕淇濆吇椤圭洰鍚嶇О}";
return Message;
}
- else if (excelTable[0].Columns[3].ColumnName != "淇濆吇鍛ㄦ湡")
- {
- code = "300";
- Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇鍛ㄦ湡}";
- return Message;
- }
- else if (excelTable[0].Columns[4].ColumnName != "鏄惁鎵爜")
+ else if (excelTable[0].Columns[3].ColumnName != "鏄惁鎵爜")
{
code = "300";
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕鏄惁鎵爜}";
return Message;
}
- else if (excelTable[0].Columns[5].ColumnName != "淇濆吇椤圭洰瑕佹眰")
+ else if (excelTable[0].Columns[4].ColumnName != "淇濆吇椤圭洰瑕佹眰")
{
code = "300";
Message = "璁惧淇濆吇椤圭洰妯℃澘涓嶇鍚堣鑼冿細琛ㄥご淇℃伅涓嶇鍚堣鑼�,绗�4鍒楀簲涓簕淇濆吇椤圭洰瑕佹眰}";
@@ -2727,26 +2721,26 @@
for (int i = 0; i < excelTable.Rows.Count; i++)
{
string Type = "", IsScan = "";
- switch (excelTable.Rows[i][3].ToString().Trim())
- {
- case "骞�":
- Type = "Y";
- break;
- case "瀛�":
- Type = "S";
- break;
- case "鏈�":
- Type = "M";
- break;
- case "鍛�":
- Type = "W";
- break;
- case "鏃�":
- Type = "D";
- break;
- default:
- break;
- }
+ //switch (excelTable.Rows[i][3].ToString().Trim())
+ //{
+ // case "骞�":
+ // Type = "Y";
+ // break;
+ // case "瀛�":
+ // Type = "S";
+ // break;
+ // case "鏈�":
+ // Type = "M";
+ // break;
+ // case "鍛�":
+ // Type = "W";
+ // break;
+ // case "鏃�":
+ // Type = "D";
+ // break;
+ // default:
+ // break;
+ //}
switch (excelTable.Rows[i][4].ToString().Trim())
{
case "鏄�":
@@ -2769,7 +2763,7 @@
name = excelTable.Rows[i][2].ToString().Trim(),
descr = excelTable.Rows[i][5].ToString().Trim(),
isscan = IsScan,
- cycle = Type,
+ cycle = "",
Operator = User,
CreateDate = DateTime.Now.ToString()
}
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 09dfdad..8f0e92a 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -330,6 +330,7 @@
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\EqpRepair.cs" />
<Compile Include="Models\ExcelErro.cs" />
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 7b68fb0..6d0c2e0 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index d9e1e37..5599dc5 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -506,7 +506,7 @@
</summary>
<param name="documentPath">The physical path to XML document.</param>
</member>
- <member name="M:VueWebApi.Controllers.AppDeviceManageController.ScanDeviceQrCodeData(System.String)">
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.CheckScanDeviceQrCodeData(System.String)">
<summary>
鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
</summary>
@@ -526,6 +526,13 @@
</summary>
<param name="username">鐧诲綍浜哄憳(鐐规浜�)</param>
<param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairScanDeviceQrCodeData(System.String)">
+ <summary>
+ 瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
+ </summary>
+ <param name="eqpcode">璁惧缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -916,7 +923,7 @@
<param name="checkitemcode">璁惧鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMaiItemSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMaiItemSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
璁惧淇濆吇椤瑰垪琛ㄦ煡璇�
</summary>
@@ -924,7 +931,6 @@
<param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
<param name="maidescr">淇濆吇瑕佹眰</param>
<param name="isqrcode">閫変腑鎵爜</param>
- <param name="cycle">淇濆吇鍛ㄦ湡</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -1027,7 +1033,7 @@
<param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.AddUpdateDeviceRepairStandArd(System.String,VueWebApi.Models.RoutEdit)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.AddUpdateDeviceRepairStandArd(System.String,VueWebApi.Models.EqpRepair)">
<summary>
璁惧淇濆吇鏍囧噯鏂板缂栬緫
</summary>
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
index b594159..1b4fc48 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\344\277\235\345\205\273\351\241\271\347\233\256.xls"
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 7b68fb0..6d0c2e0 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index d9e1e37..5599dc5 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -506,7 +506,7 @@
</summary>
<param name="documentPath">The physical path to XML document.</param>
</member>
- <member name="M:VueWebApi.Controllers.AppDeviceManageController.ScanDeviceQrCodeData(System.String)">
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.CheckScanDeviceQrCodeData(System.String)">
<summary>
鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
</summary>
@@ -526,6 +526,13 @@
</summary>
<param name="username">鐧诲綍浜哄憳(鐐规浜�)</param>
<param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.AppDeviceManageController.RepairScanDeviceQrCodeData(System.String)">
+ <summary>
+ 瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
+ </summary>
+ <param name="eqpcode">璁惧缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -916,7 +923,7 @@
<param name="checkitemcode">璁惧鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMaiItemSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMaiItemSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
璁惧淇濆吇椤瑰垪琛ㄦ煡璇�
</summary>
@@ -924,7 +931,6 @@
<param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
<param name="maidescr">淇濆吇瑕佹眰</param>
<param name="isqrcode">閫変腑鎵爜</param>
- <param name="cycle">淇濆吇鍛ㄦ湡</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -1027,7 +1033,7 @@
<param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.AddUpdateDeviceRepairStandArd(System.String,VueWebApi.Models.RoutEdit)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.AddUpdateDeviceRepairStandArd(System.String,VueWebApi.Models.EqpRepair)">
<summary>
璁惧淇濆吇鏍囧噯鏂板缂栬緫
</summary>
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 768faab..1a73c3a 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-381130c0169b46e9923444e6a74044fb28bd1180
+248d9ccaf03385be1c49da731abd00e286709822
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 7b68fb0..6d0c2e0 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3