From c8b1ba855be2663a1da3444c54d8af5a202a4b7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:33:32 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/Controllers/AppDeviceManageController.cs | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/VueWebApi/Controllers/AppDeviceManageController.cs b/VueWebApi/Controllers/AppDeviceManageController.cs
index 1196265..3a10f40 100644
--- a/VueWebApi/Controllers/AppDeviceManageController.cs
+++ b/VueWebApi/Controllers/AppDeviceManageController.cs
@@ -14,7 +14,7 @@
{
[RoutePrefix(prefix: "api/AppDeviceManage")]
[ControllerGroup("App璁惧绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- //[ChannelActionFilterAttributeApp]
+ [ChannelActionFilterAttributeApp]
public class AppDeviceManageController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -36,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
@@ -83,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
--
Gitblit v1.9.3