From 48aa43a04f8d8a0964d9d8a206e329f400fd5b89 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 07 八月 2023 18:10:04 +0800
Subject: [PATCH] 1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 mes工单查询、报废补单增加销售订单号
---
VueWebApi/Controllers/AppProductionManagementController.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 03e22af..1246def 100644
--- a/VueWebApi/Controllers/AppProductionManagementController.cs
+++ b/VueWebApi/Controllers/AppProductionManagementController.cs
@@ -13,7 +13,7 @@
{
[RoutePrefix(prefix: "api/AppProductionManagement")]
[ControllerGroup("App鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- //[ChannelActionFilterAttributeApp]
+ [ChannelActionFilterAttributeApp]
public class AppProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -25,15 +25,16 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氬紑宸�(寮�濮�/鎶ュ伐)/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
/// </summary>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
/// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
/// <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
/// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
/// <returns></returns>
[Route(template: "MesOrderStepStart")]
[HttpGet]
- public HttpResponseMessage MesOrderStepStart(string OperType, string orderstepqrcode, string SelectType = null)
+ public HttpResponseMessage MesOrderStepStart(string stu_torgcode, string OperType, string orderstepqrcode, string SelectType = null)
{
- mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
+ mes = ProductionManagementBLL.MesOrderStepStart(OperType, stu_torgcode, SelectType, orderstepqrcode);
return TJson.toJson(mes);
}
#endregion
@@ -57,12 +58,15 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
/// </summary>
+ /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
+ /// <param name="stu_torgtypecode">缁勭粐绫诲瀷</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderStepReportSelectUserGroup")]
[HttpGet]
- public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+ public HttpResponseMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode, string wkshopcode)
{
- mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+ mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -71,13 +75,14 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭牴鎹敓浜х彮缁勬煡鎵句汉鍛樺垪琛�
/// </summary>
+ /// <param name="stu_torgcode">缁勭粐缂栫爜</param>
/// <param name="usergroupcode">鐝粍缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderGroupSelectUser")]
[HttpGet]
- public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
+ public HttpResponseMessage MesOrderGroupSelectUser(string stu_torgcode, string usergroupcode)
{
- mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
+ mes = ProductionManagementBLL.MesOrderGroupSelectUser(stu_torgcode,usergroupcode);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3