From 3ed9cb86be252941e35b6ccfc9be24642751ef46 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 09 十一月 2022 21:34:24 +0800
Subject: [PATCH] 修改报工列表查询接口、修改报工自制工序首道、末道数量判断接口开发
---
VueWebApi/Controllers/ProductionManagementController.cs | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 240 insertions(+), 0 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 85e20b7..2cf346d 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;
@@ -642,6 +643,57 @@
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <param name="reporttype">鎶ュ伐绫诲瀷</param>
+ /// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="reportuser">鎶ュ伐浜哄憳</param>
+ /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepVerifySearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepVerifySearch(string reporttype,string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string reportdateopendate = ""; //鏀舵枡寮�濮嬫椂闂�
+ string reportdateclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportdateopendate = reportdate.Split('~')[0].ToString();
+ reportdateclosedate = reportdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.MesOrderStepVerifySearch(reporttype,wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepVerifySeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepVerifySeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepVerifySeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
#region[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
/// <summary>
/// MES宸ュ崟鏌ヨ
@@ -705,5 +757,193 @@
}
#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