From 3e9b79b84905b1cf7a282d1bf03e6de3e85b91bb Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 02 十一月 2023 15:52:22 +0800
Subject: [PATCH] 1.生产开报工、报表增加销售订单号查询字段及列表字段
---
VueWebApi/Controllers/ProductionManagementController.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 5dbf07b..e6b6aab 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -98,6 +98,22 @@
}
#endregion
+ #region[ERP璁㈠崟鎵归噺涓嬭揪]
+ /// <summary>
+ /// ERP璁㈠崟鎵归噺涓嬭揪
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MarkBatchSaveErpOrder")]
+ [HttpPost]
+ public HttpResponseMessage MarkBatchSaveErpOrder(List<ErpOrderBatch> obj)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MarkBatchSaveErpOrder(obj, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[ERP璁㈠崟鍏抽棴]
/// <summary>
/// ERP璁㈠崟鍏抽棴
@@ -264,12 +280,13 @@
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="is_steprice">鏄惁宸ヤ环绠℃帶</param>
/// <returns></returns>
[Route(template: "SelectRouteOrWkshop")]
[HttpGet]
- public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
+ public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode,string is_steprice)
{
- mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
+ mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode, is_steprice);
return TJson.toJson(mes);
}
#endregion
@@ -785,6 +802,7 @@
/// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="ordertype">鍗曟嵁绫诲瀷</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -798,13 +816,13 @@
/// <returns></returns>
[Route(template: "MesOrderBitchClosedSearch")]
[HttpGet]
- public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null,string saleordercode=null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3