From 925394b1b7f61a2c2a15fdaa0ecd0763214ccda1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 30 五月 2023 18:01:29 +0800
Subject: [PATCH] 增加App报工、工序检验功能
---
VueWebApi/Controllers/AppDeviceManageController.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/Controllers/AppDeviceManageController.cs b/VueWebApi/Controllers/AppDeviceManageController.cs
index a5bebdf..1196265 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
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -156,11 +157,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 +175,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 +184,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 +208,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 +292,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