From 807f6688a99d9958fedf3e9be2bba8c9afd78969 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 21 十一月 2024 15:59:06 +0800
Subject: [PATCH] 1.ERP订单查看子件信息接口 2.订单下达、批量下达、订单列表、工单列表、报工列表等增加字段(总量、总料) 3.增加订单导出功能、修改工单导出接口
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 10738d4..cd12a4e 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -72,6 +72,29 @@
}
#endregion
+ #region[ERP璁㈠崟瀛愪欢淇℃伅鏌ヨ]
+ /// <summary>
+ /// ERP璁㈠崟瀛愪欢淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="MoDID">鐢熶骇璁㈠崟鏄庣粏ID</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "ErpOrderSubItemSearch")]
+ [HttpGet]
+ public JsonResult ErpOrderSubItemSearch(string MoDID = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = WorkOrderBLL.ErpOrderSubItemSearch(MoDID,startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
#region[ERP璁㈠崟涓嬭揪]
/// <summary>
/// ERP璁㈠崟涓嬭揪
@@ -101,7 +124,9 @@
string customercode = obj["customercode"].ToString(); //瀹㈡埛缂栫爜
string customername = obj["customername"].ToString(); //瀹㈡埛鍚嶇О
string colour = obj["colour"].ToString(); //棰滆壊
- mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, injectnumber,customercode,customername,colour, us);
+ string weight = obj["weight"].ToString(); //閲嶉噺
+ string totalnumber = obj["totalnumber"].ToString(); //鎬绘枡
+ mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, injectnumber,customercode,customername,colour,weight,totalnumber,us);
return Json(mes);
}
#endregion
@@ -154,6 +179,47 @@
}
#endregion
+ #region[ERP璁㈠崟瀵煎嚭]
+ /// <summary>
+ /// ERP璁㈠崟瀵煎嚭
+ /// </summary>
+ /// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞崟鍙�</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="paystartdate">棰勮寮�宸ユ椂闂�</param>
+ /// <param name="payenddate">棰勮瀹屽伐鏃堕棿</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <returns></returns>
+ [Route(template: "ErpOrderExcelSearch")]
+ [HttpGet]
+ public JsonResult ErpOrderExcelSearch(string erporderstus = null, string wkshopcode = null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string paydatestartdate = ""; //棰勮寮�宸ュ紑濮嬫椂闂�
+ string paydateenddate = ""; //棰勮寮�宸ョ粨鏉熸椂闂�
+ string paydatestartdate1 = ""; //棰勮瀹屽伐寮�濮嬫椂闂�
+ string paydateenddate2 = ""; //棰勮瀹屽伐缁撴潫鏃堕棿
+ if (paystartdate != "" && paystartdate != null)
+ {
+ paydatestartdate = paystartdate.Split('~')[0].ToString();
+ paydateenddate = paystartdate.Split('~')[1].ToString();
+ }
+ if (payenddate != "" && payenddate != null)
+ {
+ paydatestartdate1 = payenddate.Split('~')[0].ToString();
+ paydateenddate2 = payenddate.Split('~')[1].ToString();
+ }
+ mes = WorkOrderBLL.ErpOrderExcelSearch(erporderstus, wkshopcode, erpordercode, saleordercode, partcode, partname, partspec, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser);
+ return Json(mes);
+ }
+ #endregion
+
+
#region[MES宸ュ崟鏌ヨ]
/// <summary>
--
Gitblit v1.9.3