From 5b4fb9c56426b5096555560a44dd365b02853ad4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 17 六月 2023 13:14:54 +0800
Subject: [PATCH] 代码加组织过滤
---
VueWebApi/Controllers/AppProductionManagementController.cs | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/Controllers/AppProductionManagementController.cs b/VueWebApi/Controllers/AppProductionManagementController.cs
index 4399430..6d8dd95 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
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -57,12 +57,13 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderStepReportSelectUserGroup")]
[HttpGet]
- public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+ public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
{
- mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+ mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -165,6 +166,7 @@
string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
string eqpcode = HttpContext.Current.Request["eqpcode"].ToString();//璁惧缂栫爜
+ string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string reckway = HttpContext.Current.Request["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
string usergroupcode = HttpContext.Current.Request["usergroupcode"].ToString();//鐝粍缂栫爜
string reportuser = HttpContext.Current.Request["reportuser"].ToString();//鎶ュ伐浜哄憳
@@ -175,7 +177,7 @@
string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -219,6 +221,7 @@
string stepseq = HttpContext.Current.Request["stepseq"].ToString();//宸ュ簭搴忓彿
string stepcode = HttpContext.Current.Request["stepcode"].ToString();//宸ュ簭缂栫爜
string wxcode = HttpContext.Current.Request["wxcode"].ToString();//澶栧崗渚涘簲鍟嗙紪鐮�
+ string inbarcode = HttpContext.Current.Request["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string inuser = HttpContext.Current.Request["inuser"].ToString();//鏀舵枡浜哄憳
string taskqty = HttpContext.Current.Request["taskqty"].ToString();//浠诲姟鏁伴噺
string sqty = HttpContext.Current.Request["sqty"].ToString();//鏀舵枡鏁伴噺
@@ -226,7 +229,40 @@
string badcode = HttpContext.Current.Request["badcode"].ToString();//涓嶈壇鍘熷洜缂栫爜
string remarks = HttpContext.Current.Request["remarks"].ToString();//澶囨敞
string username = HttpContext.Current.Request["admin"].ToString();//鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[鐢熶骇鍏ュ簱鎵弿鏉＄爜]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鎵弿鏉＄爜
+ /// </summary>
+ /// <param name="labcode">鏉＄爜缂栧彿</param>
+ /// <returns></returns>
+ [Route(template: "MesAppProductInHouseOrderBarCodeSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesAppProductInHouseOrderBarCodeSearch(string labcode)
+ {
+ mes = ProductionManagementBLL.MesAppProductInHouseOrderBarCodeSearch(labcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鎵弿鏉＄爜鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鎵弿鏉＄爜鎻愪氦
+ /// </summary>
+ /// <param name="username">鎿嶄綔浜哄憳</param>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesAppProductInHouseOrderBarCodeSave")]
+ [HttpPost]
+ public HttpResponseMessage MesAppProductInHouseOrderBarCodeSave(string username, [FromBody] JObject obj)
+ {
+ mes = ProductionManagementBLL.ProductInHouseOrderSeave(username, obj);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3