From cf2dffc61f8c8734dc611ef9bd0eccc0bb3806ae Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 五月 2024 16:04:59 +0800
Subject: [PATCH] 1.ERP订单、MES工单列表新增顶级物料编码、顶级物料名称 2.ERP订单派发接口增加顶级物料id、顶级物料编码、顶级物料名称
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 029e753..2180029 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -95,8 +95,11 @@
string markqty = obj["markqty"].ToString(); //涓嬪崟鏁伴噺
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
+ string idTopInventory = obj["idTopInventory"].ToString(); //椤剁骇鐗╂枡id
+ string TopInventoryCode = obj["TopInventoryCode"].ToString(); //椤剁骇鐗╂枡缂栫爜
+ string TopInventoryName = obj["TopInventoryName"].ToString(); //椤剁骇鐗╂枡鍚嶇О
string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
- mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,us);
+ mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, idTopInventory, TopInventoryCode, TopInventoryName, us);
return Json(mes);
}
#endregion
@@ -124,9 +127,27 @@
[HttpPost]
public JsonResult ClosedErpOrder(string erporderid, string erpordercode)
{
- var token = HttpContext.Request.Headers["Token"].ToString();
+ var token =HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = WorkOrderBLL.ClosedErpOrder(erporderid, erpordercode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟鍙嶅叧闂璢
+ /// <summary>
+ /// ERP璁㈠崟鍙嶅叧闂�
+ /// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
+ /// <param name="erpordercode">璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "ReverseClosedErpOrder")]
+ [HttpPost]
+ public JsonResult ReverseClosedErpOrder(string erporderid, string erpordercode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.ReverseClosedErpOrder(erporderid, erpordercode, us);
return Json(mes);
}
#endregion
@@ -365,6 +386,23 @@
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = WorkOrderBLL.MesOrderBitchClosedSeave(us, wocodelist);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鍙嶅叧闂彁浜
+ /// <summary>
+ /// MES宸ュ崟鍙嶅叧闂彁浜�
+ /// </summary>
+ /// <param name="wocodelist">宸ュ崟鍙锋暟缁�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderBitchReverseClosedSeave")]
+ [HttpPost]
+ public JsonResult MesOrderBitchReverseClosedSeave([FromBody] string[] wocodelist)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderBitchReverseClosedSeave(us, wocodelist);
return Json(mes);
}
#endregion
@@ -670,6 +708,7 @@
/// <summary>
/// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
/// </summary>
+ /// <param name="reviewstatus">瀹℃牳鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
@@ -685,7 +724,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -696,7 +735,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -717,5 +756,23 @@
return Json(mes);
}
#endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="id">鎶ュ伐璁板綍id</param>
+ /// <param name="steptype">宸ュ簭绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepReportNotVerifySeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepReportNotVerifySeave(string id,string steptype)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepReportNotVerifySeave(us, id, steptype);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3