From bfa0a4079b2ac3f363826b7e329115f88b4bf0f5 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 22 十一月 2023 10:49:20 +0800
Subject: [PATCH] 生产开报工查询增加销售单号查询
---
VueWebApi/Controllers/AppDeviceManageController.cs | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/VueWebApi/Controllers/AppDeviceManageController.cs b/VueWebApi/Controllers/AppDeviceManageController.cs
index a5bebdf..3a10f40 100644
--- a/VueWebApi/Controllers/AppDeviceManageController.cs
+++ b/VueWebApi/Controllers/AppDeviceManageController.cs
@@ -14,6 +14,7 @@
{
[RoutePrefix(prefix: "api/AppDeviceManage")]
[ControllerGroup("App璁惧绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilterAttributeApp]
public class AppDeviceManageController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -35,17 +36,33 @@
}
#endregion
- #region[鏃ュ父鐐规,閫夋嫨鎵爜璁惧鍒楄〃甯﹀嚭鐐规椤筣
+ #region[鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯]
/// <summary>
- /// 鏃ュ父鐐规,閫夋嫨鎵爜璁惧鍒楄〃甯﹀嚭鐐规椤�
+ /// 鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵剧偣妫�鏍囧噯
/// </summary>
/// <param name="eqpcode">璁惧缂栫爜</param>
/// <returns></returns>
+ [Route(template: "CheckScanDeviceTemp")]
+ [HttpGet]
+ public HttpResponseMessage CheckScanDeviceTemp(string eqpcode)
+ {
+ mes = AppDeviceManageBLL.CheckScanDeviceTemp(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鏃ュ父鐐规,閫夋嫨鎵爜璁惧銆佺偣妫�鏍囧噯甯﹀嚭鐐规椤筣
+ /// <summary>
+ /// 鏃ュ父鐐规,閫夋嫨鎵爜璁惧銆佺偣妫�鏍囧噯甯﹀嚭鐐规椤�
+ /// </summary>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="checktempcode">鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
[Route(template: "SelectScanDeviceQrCodeItem")]
[HttpGet]
- public HttpResponseMessage SelectScanDeviceQrCodeItem(string eqpcode)
+ public HttpResponseMessage SelectScanDeviceQrCodeItem(string eqpcode,string checktempcode)
{
- mes = AppDeviceManageBLL.SelectScanDeviceQrCodeItem(eqpcode);
+ mes = AppDeviceManageBLL.SelectScanDeviceQrCodeItem(eqpcode, checktempcode);
return TJson.toJson(mes);
}
#endregion
@@ -82,17 +99,33 @@
}
#endregion
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵句繚鍏绘爣鍑哴
+ /// <summary>
+ /// 瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮佹煡鎵句繚鍏绘爣鍑�
+ /// </summary>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RepairScanDeviceTemp")]
+ [HttpGet]
+ public HttpResponseMessage RepairScanDeviceTemp(string eqpcode)
+ {
+ mes = AppDeviceManageBLL.RepairScanDeviceTemp(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[鏃ュ父淇濆吇,閫夋嫨鎵爜璁惧鍒楄〃甯﹀嚭淇濆吇椤筣
/// <summary>
/// 鏃ュ父淇濆吇,閫夋嫨鎵爜璁惧鍒楄〃甯﹀嚭淇濆吇椤�
/// </summary>
/// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="repartempcode">淇濆吇鏍囧噯缂栫爜</param>
/// <returns></returns>
[Route(template: "RepairSelectScanDeviceQrCodeItem")]
[HttpGet]
- public HttpResponseMessage RepairSelectScanDeviceQrCodeItem(string eqpcode)
+ public HttpResponseMessage RepairSelectScanDeviceQrCodeItem(string eqpcode,string repartempcode)
{
- mes = AppDeviceManageBLL.RepairSelectScanDeviceQrCodeItem(eqpcode);
+ mes = AppDeviceManageBLL.RepairSelectScanDeviceQrCodeItem(eqpcode, repartempcode);
return TJson.toJson(mes);
}
#endregion
@@ -156,11 +189,11 @@
/// 璁惧缁翠慨鍒楄〃
/// </summary>
/// <returns></returns>
- [Route(template: "RepairScanDeviceQrCodeData")]
+ [Route(template: "RepairScanDeviceQrCodeDataList")]
[HttpGet]
- public HttpResponseMessage RepairScanDeviceQrCodeData()
+ public HttpResponseMessage RepairScanDeviceQrCodeDataList()
{
- mes = AppDeviceManageBLL.RepairScanDeviceQrCodeData();
+ mes = AppDeviceManageBLL.RepairScanDeviceQrCodeDataList();
return TJson.toJson(mes);
}
#endregion
@@ -174,6 +207,7 @@
[HttpPost]
public HttpResponseMessage RepairScanDeviceSave()
{
+ string docu_code = HttpContext.Current.Request["docu_code"].ToString();//缁翠慨鐢宠鍗曞彿
string username = HttpContext.Current.Request["username"].ToString();//鎿嶄綔浜哄憳
string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
string wkshpcode = HttpContext.Current.Request["wkshpcode"].ToString(); //杞﹂棿缂栫爜
@@ -182,7 +216,7 @@
string repaircontent = HttpContext.Current.Request["repaircontent"].ToString(); //缁翠慨鍐呭
string replaceparts = HttpContext.Current.Request["replaceparts"].ToString(); //鏇存崲澶囦欢
HttpFileCollection files = HttpContext.Current.Request.Files;
- mes = AppDeviceManageBLL.RepairScanDeviceSave(username, eqpcode, wkshpcode, faultdescr, is_stoprepair, repaircontent, replaceparts, files);
+ mes = AppDeviceManageBLL.RepairScanDeviceSave(docu_code, username, eqpcode, wkshpcode, faultdescr, is_stoprepair, repaircontent, replaceparts, files);
return TJson.toJson(mes);
}
#endregion
@@ -206,14 +240,15 @@
/// <summary>
/// 缁翠慨楠岃瘉璇︽儏淇℃伅
/// </summary>
+ /// <param name="repair_code">缁翠慨鍗曞彿</param>
/// <param name="eqpcode">璁惧缂栫爜</param>
/// <param name="wkshpcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "RepairVerificationScanDeviceDataSub")]
[HttpGet]
- public HttpResponseMessage RepairVerificationScanDeviceDataSub(string eqpcode,string wkshpcode)
+ public HttpResponseMessage RepairVerificationScanDeviceDataSub(string repair_code, string eqpcode, string wkshpcode)
{
- mes = AppDeviceManageBLL.RepairVerificationScanDeviceDataSub(eqpcode,wkshpcode);
+ mes = AppDeviceManageBLL.RepairVerificationScanDeviceDataSub(repair_code, eqpcode, wkshpcode);
return TJson.toJson(mes);
}
#endregion
@@ -289,5 +324,37 @@
+ #region[瀹夌伅鍝嶅簲鎵弿宸ヤ綅/璁惧]
+ /// <summary>
+ /// 瀹夌伅鍝嶅簲鎵弿宸ヤ綅/璁惧
+ /// </summary>
+ /// <param name="eqpcode">璁惧/宸ヤ綅缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "AppDeviceAnDengLampResponseScanSearch")]
+ [HttpPost]
+ public HttpResponseMessage AppDeviceAnDengLampResponseScanSearch(string eqpcode)
+ {
+ mes = AppDeviceManageBLL.AppDeviceAnDengLampResponseScanSearch(eqpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅鍝嶅簲鎻愪氦]
+ /// <summary>
+ /// 瀹夌伅鍝嶅簲鎻愪氦
+ /// </summary>
+ /// <param name="username">鐧诲綍浜哄憳</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AppDeviceAnDengLampResponseSave")]
+ [HttpPost]
+ public HttpResponseMessage AppDeviceAnDengLampResponseSave(string username, string eqpcode, string wkshpcode, List<ObjectData> json)
+ {
+ mes = AppDeviceManageBLL.AppDeviceAnDengLampResponseSave(username, eqpcode, wkshpcode, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3