From fac89d03c2c1fdbe81e4f8ed29f75b8bf163cbf9 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 08 十一月 2022 14:04:01 +0800
Subject: [PATCH] nothing
---
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 2 +-
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Controllers/LoginController.cs | 3 ++-
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 4 ++--
6 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 9150b03..efb8253 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index 0a6e4af..bfdd314 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -288,7 +288,8 @@
public HttpResponseMessage LoginAppAnDonMessage(int userid, string usercode, string username, string usertype)
{
mes = LoginBLL.LoginAppAnDonMessage(userid, usercode, username, usertype);
- return mes.ResponseMess(mes);
+ return TJson.toJson(mes);
+ //return mes.ResponseMess(mes);
}
#endregion
}
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 186a9cb..ebb6838 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -384,7 +384,7 @@
try
{
//鑾峰彇褰撳墠鎵爜璁惧鏄惁鐢宠缁翠慨璁板綍
- sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
+ sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
dynamicParams.Add("@eqpcode", eqpcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index e40351b..7167bfb 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -2438,7 +2438,7 @@
//鑾峰彇璁惧缁翠慨鏁版嵁
sql = @"select A.failure_descript,A.is_shutdown,A.repair_content,A.repair_part from TEqp_Repair A
left join TEqp_RepairRequest B on A.source_wo=B.docu_code
- where A.repair_code='SBWX221010016'";
+ where A.repair_code=@repair_code";
dynamicParams.Add("@repair_code", repair_code);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
DeviceRepair repair = new DeviceRepair();
@@ -2449,7 +2449,7 @@
//鑾峰彇璁惧缁翠慨鍥剧墖鏁版嵁
sql = @"select M.img1url,M.img2url from TEqp_Repair A
left join TEqp_RepairImage M on A.repair_code=M.source_wo
- where A.repair_code='SBWX221010016' and M.wo_type='COMP'";
+ where A.repair_code=@repair_code and M.wo_type='COMP'";
dynamicParams.Add("@repair_code", repair_code);
var data3 = DapperHelper.selectdata(sql, dynamicParams);
repair.repairimage = data3;
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 34d1d9f..3c7bb15 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index f5e894a..f391c41 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.3