From 770c681572301c938d7b9adcc60d9aad9d1dd604 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:37:03 +0800
Subject: [PATCH] 1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp) 4.增加生成系统条码接口(自定义)
---
VueWebApi/Controllers/ProductionManagementController.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 5d80988..09fb41f 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -188,6 +188,20 @@
}
#endregion
+ #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+ /// <summary>
+ /// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AddMesOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage AddMesOrderCodeSearch()
+ {
+ mes = ProductionManagementBLL.AddMesOrderCodeSearch();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
/// <summary>
/// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -490,6 +504,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -499,7 +514,7 @@
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -542,6 +557,7 @@
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -550,7 +566,7 @@
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.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
@@ -894,5 +910,96 @@
return TJson.toJson(mes);
}
#endregion
+
+
+ #region[鐢熶骇鍏ュ簱鏉＄爜琛ユ墦]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鏉＄爜琛ユ墦
+ /// </summary>
+ /// <param name="ordercode">宸ュ崟缂栧彿</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseLabCode")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseLabCode(string ordercode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseLabCode(ordercode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟
+ /// </summary>
+ /// <param name="ordertype">鍗曟嵁绫诲瀷</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseWkshopOrder")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseWkshopOrder(string ordertype, string wkshopcode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseWkshopOrder(ordertype, wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱淇℃伅鏌ヨ]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+ /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="orderdate">宸ュ崟鏃ユ湡</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseOrderSearch(string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string orderdate = null)
+ {
+ string startorderdate = ""; //宸ュ崟寮�濮嬫椂闂�
+ string endorderdate = ""; //宸ュ崟缁撴潫鏃堕棿
+ if (orderdate != "" && orderdate != null)
+ {
+ startorderdate = orderdate.Split('~')[0].ToString();
+ endorderdate = orderdate.Split('~')[1].ToString();
+ }
+ mes = ProductionManagementBLL.ProductInHouseOrderSearch(wkshopcode, erpordercode, mesordercode, partcode, partname, partspec, startorderdate, endorderdate);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙穄
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage ProductInHouseOrderCodeSearch(string rightcode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseOrderCodeSearch(rightcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鏄庣粏鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSeave")]
+ [HttpPost]
+ public HttpResponseMessage ProductInHouseOrderSeave([FromBody] JObject obj)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.ProductInHouseOrderSeave(username, obj);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3