From 3fb978e25d7ea25038e56ec1db950189b413718b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:17:30 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if
---
VueWebApi/Controllers/ProductionManagementController.cs | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 281 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 85e20b7..76eb730 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -8,6 +8,7 @@
using System.Net.Http;
using System.Web;
using System.Web.Http;
+using System.Web.Script.Serialization;
using VueWebApi.DLL.BLL;
using VueWebApi.Models;
using VueWebApi.Tools;
@@ -16,7 +17,7 @@
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -86,8 +87,9 @@
string markqty = obj["markqty"].ToString(); //涓嬪崟鏁伴噺
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
+ string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
return TJson.toJson(mes);
}
#endregion
@@ -187,6 +189,38 @@
}
#endregion
+ #region銆愮敓浜х鐞嗐�佸伐鍗曟柊澧炪�佺紪杈戞椂,閫夋嫨鎺掔▼鏄椂鑾峰彇鐗╂枡娓呭崟鐗堟湰鍙枫��
+ /// <summary>
+ /// 鐢熶骇绠＄悊銆佸伐鍗曟柊澧炪�佺紪杈戞椂,閫夋嫨鎺掔▼鏄椂鑾峰彇鐗╂枡娓呭崟鐗堟湰鍙�
+ /// </summary>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "JobCreationSonAddVison")]
+ [HttpGet]
+ public HttpResponseMessage JobCreationSonAddVison(string partnumber)
+ {
+ mes = ProductionManagementBLL.JobCreationSonAddVison(partnumber);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠禲
+ /// <summary>
+ /// 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+ /// </summary>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "SelectRouteOrWkshop")]
+ [HttpGet]
+ public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
+ {
+ mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
/// <summary>
/// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -208,9 +242,11 @@
string planstartdate = obj["planstartdate"].ToString(); //璁″垝寮�濮嬫椂闂�
string planenddate = obj["planenddate"].ToString(); //璁″垝瀹屾垚鏃堕棿
string orderlev = obj["orderlev"].ToString(); //宸ュ崟绛夌骇
+ string is_aps = obj["is_aps"].ToString(); //鏄惁鎺掍骇
+ string bom_id = obj["bom_id"].ToString(); //鐗╂枡娓呭崟id
string opertype = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
+ mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype, is_aps, bom_id);
return TJson.toJson(mes);
}
#endregion
@@ -489,6 +525,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string reckway = obj["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -498,7 +535,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, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -705,5 +742,245 @@
}
#endregion
+
+
+ #region[浜ц兘瑙勫垝鏂规璁剧疆鏌ヨ]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鏂规璁剧疆鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningSetupSearch")]
+ [HttpGet]
+ public HttpResponseMessage CapacityPlanningSetupSearch()
+ {
+ mes = ProductionManagementBLL.CapacityPlanningSetupSearch();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝鏂规璁剧疆鏂板]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鏂规璁剧疆鏂板
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningSetupAddUpdate")]
+ [HttpPost]
+ public HttpResponseMessage CapacityPlanningSetupAddUpdate([FromBody] JObject obj)
+ {
+ string capacitylist = obj["capacitylist"].ToString(); //鎻愪氦鏁版嵁
+ string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ JavaScriptSerializer Serializer = new JavaScriptSerializer();
+ List<CapacityPlanningSetup> objs = Serializer.Deserialize<List<CapacityPlanningSetup>>(capacitylist);
+ mes = ProductionManagementBLL.CapacityPlanningSetupAddUpdate(username, objs);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝鏂规璁剧疆鍒犻櫎]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鏂规璁剧疆鍒犻櫎
+ /// </summary>
+ /// <param name="CapSetupCode">鏂规缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningSetupDelete")]
+ [HttpPost]
+ public HttpResponseMessage CapacityPlanningSetupDelete(string capsetupcode)
+ {
+ string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.CapacityPlanningSetupDelete(username, capsetupcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝鏌ヨ]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鏌ヨ
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">椤垫暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="workshop">杞﹂棿缂栫爜</param>
+ /// <param name="devicetype">鐢熶骇鍗曞厓</param>
+ /// <param name="stustype">鏈夋晥鐘舵��</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningSearch")]
+ [HttpGet]
+ public HttpResponseMessage CapacityPlanningSearch(int page, int rows, string prop, string order,string workshop = null, string devicetype = null, string stustype = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.CapacityPlanningSearch(workshop, devicetype, stustype, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝榛樿鏂规淇濆瓨鎻愪氦]
+ /// <summary>
+ /// 浜ц兘瑙勫垝榛樿鏂规淇濆瓨鎻愪氦
+ /// </summary>
+ /// <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="capunitcode">鐢熶骇鍗曞厓缂栫爜</param>
+ /// <param name="capsetupcode">榛樿鏂规缂栫爜</param>
+ /// <param name="captplantype">璧勬簮绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanSubmit")]
+ [HttpPost]
+ public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode,string captplanid=null,string capsetupcode=null,string captplantype=null)
+ {
+ string type = ""; //鎻愪氦绫诲瀷
+ if (captplanid == "" || captplanid == null)
+ {
+ type = "Add";
+ }
+ else
+ {
+ type = "Update";
+ }
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.CapacityPlanSubmit(type,captplanid,wkshopcode,capunitcode,capsetupcode, captplantype,username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝鐐瑰嚮鏃ュ巻缁勪欢鏌ユ壘宸插叧鑱旂殑鏃ユ湡鏂规]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鐐瑰嚮鏃ュ巻缁勪欢鏌ユ壘宸插叧鑱旂殑鏃ユ湡鏂规
+ /// </summary>
+ /// <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningCalendar")]
+ [HttpGet]
+ public HttpResponseMessage CapacityPlanningCalendar(string captplanid)
+ {
+ mes = ProductionManagementBLL.CapacityPlanningCalendar(captplanid);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝鏃ュ巻鍙屽嚮鏃跺甫鍑哄搴旂殑鏂规]
+ /// <summary>
+ /// 浜ц兘瑙勫垝鏃ュ巻鍙屽嚮鏃跺甫鍑哄搴旂殑鏂规
+ /// </summary>
+ /// <param name="captplanid">浜ц兘瑙勫垝(鐢熶骇璧勬簮)id</param>
+ /// <param name="datetime">鍙屽嚮閫変腑鐨勬棩鏈�</param>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningOnclickSelect")]
+ [HttpGet]
+ public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid,string datetime)
+ {
+ mes = ProductionManagementBLL.CapacityPlanningOnclickSelect(captplanid, datetime);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[浜ц兘瑙勫垝宸ヤ綔鏃ュ巻閫夋嫨鎻愪氦]
+ /// <summary>
+ /// 浜ц兘瑙勫垝宸ヤ綔鏃ュ巻閫夋嫨鎻愪氦
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "CapacityPlanningGivePlanSubmit")]
+ [HttpPost]
+ public HttpResponseMessage CapacityPlanningGivePlanSubmit()
+ {
+ string wkshopcode = HttpContext.Current.Request["wkshopcode"].ToString();//杞﹂棿缂栫爜
+ string capunitcode = HttpContext.Current.Request["capunitcode"].ToString();//鐢熶骇鍗曞厓缂栫爜
+ string captplanid = HttpContext.Current.Request["captplanid"].ToString(); //浜ц兘瑙勫垝(鐢熶骇璧勬簮)鍒楄〃id
+ string capsetupcode = HttpContext.Current.Request["capsetupcode"].ToString(); //榛樿鏂规缂栫爜
+ string captplantype = HttpContext.Current.Request["captplantype"].ToString(); //璧勬簮绫诲瀷
+ string worklist = HttpContext.Current.Request["worklist"].ToString(); //宸ヤ綔鏃ュ巻鏁版嵁闆�
+ JavaScriptSerializer Serializer = new JavaScriptSerializer();
+ List<CapaPlan> objs = Serializer.Deserialize<List<CapaPlan>>(worklist);
+ string type = ""; //鎻愪氦绫诲瀷
+ if (captplanid == "" || captplanid == null)
+ {
+ type = "Add";
+ }
+ else
+ {
+ type = "Update";
+ }
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs,type, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+
+ #region[鑷姩鎺掔▼宸ュ崟鏌ヨ]
+ /// <summary>
+ /// 鑷姩鎺掔▼宸ュ崟鏌ヨ
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="workshop">杞﹂棿缂栫爜</param>
+ /// <param name="wocode">鐢熶骇宸ュ崟鍙�</param>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="partname">鐗╂枡鍚嶇О</param>
+ /// <returns></returns>
+ [Route(template: "AdvancedSchedulingSearch")]
+ [HttpGet]
+ public HttpResponseMessage AdvancedSchedulingSearch(int page, int rows, string prop, string order, string workshop = null, string wocode = null, string partcode = null,string partname=null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.AdvancedSchedulingSearch(workshop, wocode, partcode, partname, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁]
+ /// <summary>
+ /// 楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="botproccode">鐡堕宸ュ簭缂栫爜(棣栭亾宸ュ簭)</param>
+ /// <param name="startdate">寮�濮嬫棩鏈�</param>
+ /// <param name="enddate">缁撴潫鏃ユ湡</param>
+ /// <returns></returns>
+ [Route(template: "OnclickAdvancedSchedulingDevice")]
+ [HttpGet]
+ public HttpResponseMessage OnclickAdvancedSchedulingDevice(string wocode,string wkshpcode,string partcode,string botproccode,string startdate,string enddate)
+ {
+ List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
+ List<AdvancedSchedAlready> list1 = new List<AdvancedSchedAlready>();
+ list = ProductionManagementBLL.OnclickAdvancedSchedulingDevice(wocode, wkshpcode, partcode, startdate, enddate, ref mes); //鎺掍骇璁惧淇℃伅
+ DataTable dt = ProductionManagementBLL.AlreadyScheduling(wocode, wkshpcode, partcode, botproccode, startdate, enddate); //璁惧宸叉帓绋嬩俊鎭�
+
+ Dictionary<object, object> dList = new Dictionary<object, object>();
+ dList.Add("rus", mes);
+ dList.Add("rows", list);
+ dList.Add("Cont", dt);
+ return TJson.toJson(dList);
+ }
+ #endregion
+
+ #region[鎺掔▼鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鎺掔▼鏁版嵁鎻愪氦
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "SubmitAlreadyScheduling")]
+ [HttpPost]
+ public HttpResponseMessage SubmitAlreadyScheduling()
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ string wocode = HttpContext.Current.Request["wocode"].ToString();//宸ュ崟缂栧彿
+ string botprocecode = HttpContext.Current.Request["botprocecode"].ToString(); //鐡堕宸ュ簭缂栫爜
+ string json = HttpContext.Current.Request["json"].ToString(); //鎺掔▼鎻愪氦鏁版嵁
+ JavaScriptSerializer Serializer = new JavaScriptSerializer();
+ List<AlreadyScheduling> objs = Serializer.Deserialize<List<AlreadyScheduling>>(json);
+ mes = ProductionManagementBLL.SubmitAlreadyScheduling(username, wocode, botprocecode, objs);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3