From facb807b19e232c44852a91b6b442285eddfb0f5 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 22 八月 2022 22:21:57 +0800
Subject: [PATCH] 看板接口修改,工序编辑接口修改
---
VueWebApi/Controllers/ProductionManagementController.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index e2d3bbc..5d3c0db 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -15,6 +15,7 @@
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ //[ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -75,6 +76,7 @@
[HttpPost]
public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
{
+ string erporderid = obj["erporderid"].ToString(); //璁㈠崟id
string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
@@ -84,7 +86,7 @@
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
return TJson.toJson(mes);
}
#endregion
@@ -93,15 +95,16 @@
/// <summary>
/// ERP璁㈠崟鍏抽棴
/// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
/// <param name="erpordercode">璁㈠崟鍙�</param>
/// <returns></returns>
[Route(template: "ClosedErpOrder")]
[HttpPost]
- public HttpResponseMessage ClosedErpOrder(string erpordercode)
+ public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
{
//var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
var username = "Admin";
- mes = ProductionManagementBLL.ClosedErpOrder(erpordercode, username);
+ mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
return TJson.toJson(mes);
}
#endregion
@@ -564,14 +567,14 @@
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
- string checkuser = obj["checkuser"].ToString(); //妫�楠屼汉鍛�
+ string checkusercode = obj["checkusercode"].ToString(); //妫�楠屼汉鍛樼紪鐮�
string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
string data = obj["data"].ToString();
List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkuser, checktypecode, checkresult, checkdescr, username,json);
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, username,json);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3