From ee546e514efa0951bd5b309e2d54dbe53a488c74 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 22 五月 2023 16:31:49 +0800
Subject: [PATCH] 1.app生产进度看板接口开发 2.app工序检验接口开发 3.存货档案基础资料查询接口开发 4.PC工序检验接口调整
---
VueWebApi/Controllers/ProductionManagementController.cs | 181 ++++++++++++++++++++++++++++++++------------
1 files changed, 131 insertions(+), 50 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index ed8dec4..135c5b1 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -17,7 +17,7 @@
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -89,7 +89,7 @@
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, saleOrderDeliveryDate, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
return TJson.toJson(mes);
}
#endregion
@@ -107,7 +107,7 @@
{
//var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
var username = "Admin";
- mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
+ mes = ProductionManagementBLL.ClosedErpOrder(erporderid, erpordercode, username);
return TJson.toJson(mes);
}
#endregion
@@ -134,11 +134,38 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[HttpGet]
- public HttpResponseMessage MesOrderSearch(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 MesOrderSearch(int page, int rows, string prop, string order, 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 startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
+ /// <summary>
+ /// MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+ /// </summary>
+ /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MesBadOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -214,9 +241,23 @@
/// <returns></returns>
[Route(template: "SelectRouteOrWkshop")]
[HttpGet]
- public HttpResponseMessage SelectRouteOrWkshop(string partcode,string routecode,string wkshopcode)
+ public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
{
mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+ /// <summary>
+ /// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AddMesOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage AddMesOrderCodeSearch()
+ {
+ mes = ProductionManagementBLL.AddMesOrderCodeSearch();
return TJson.toJson(mes);
}
#endregion
@@ -281,7 +322,7 @@
public HttpResponseMessage ClosedMesOrder(string wocode, string m_po)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.ClosedMesOrder(username,wocode, m_po);
+ mes = ProductionManagementBLL.ClosedMesOrder(username, wocode, m_po);
return TJson.toJson(mes);
}
#endregion
@@ -302,6 +343,35 @@
#endregion
+ #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勮澶�(鑷埗)]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勮澶�(鑷埗)
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepEqpSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepEqpSearch(string orderstepqrcode = null)
+ {
+ mes = ProductionManagementBLL.MesOrderStepEqpSearch(orderstepqrcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勪緵鏂�(澶栧崗)]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇褰撳墠宸ュ簭瀵瑰簲鐨勪緵鏂�(澶栧崗)
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderWxStepEqpSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderWxStepEqpSearch(string orderstepqrcode = null)
+ {
+ mes = ProductionManagementBLL.MesOrderWxStepEqpSearch(orderstepqrcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
/// <summary>
@@ -535,7 +605,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, reckway,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
@@ -607,40 +677,28 @@
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+
+ #region[宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ /// 宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
/// </summary>
- /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <param name="orderstepqrcode">鎵弿宸ュ簭浜岀淮鐮佷俊鎭�</param>
+ /// <param name="checktype">妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)</param>
/// <returns></returns>
[Route(template: "MesOrderStepCheckSearch")]
[HttpGet]
- public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode, string checktype)
{
- mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode);
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode, checktype);
return TJson.toJson(mes);
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ #region[宸ュ簭妫�楠屾牴鎹�夋嫨鐨勬楠屾柟妗堟煡鎵炬楠岄」鐩甝
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+ /// 鍏ュ巶妫�楠�,宸ュ簭妫�楠屾牴鎹�夋嫨鐨勬楠屾柟妗堟煡鎵炬楠岄」鐩�
/// </summary>
- /// <returns></returns>
- [Route(template: "MesOrderStepCheckSelect")]
- [HttpGet]
- public HttpResponseMessage MesOrderStepCheckSelect()
- {
- mes = ProductionManagementBLL.MesOrderStepCheckSelect();
- return TJson.toJson(mes);
- }
- #endregion
-
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛╙
- /// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
- /// </summary>
- /// <param name="checkstandcode">妫�楠屾爣鍑嗙紪鐮�</param>
+ /// <param name="checkstandcode">妫�楠屾柟妗堢紪鐮�</param>
/// <returns></returns>
[Route(template: "MesOrderStepCheckItemList")]
[HttpGet]
@@ -651,29 +709,29 @@
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
+ #region[宸ュ簭妫�楠�,鎻愪氦]
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+ /// 宸ュ簭妫�楠�,鎻愪氦
/// </summary>
- /// <param name="obj">鎻愪氦淇℃伅</param>
/// <returns></returns>
[Route(template: "SaveMesOrderStepCheckItem")]
[HttpPost]
public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
{
- string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string wocode = obj["wocode"].ToString(); //宸ュ崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
- string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
- string checkusercode = obj["checkusercode"].ToString(); //妫�楠屼汉鍛樼紪鐮�
- string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
- string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
- string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
- string checkqty = obj["checkqty"].ToString(); //妫�楠屾暟閲�
- string data = obj["data"].ToString();
- List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
+ string checkstandcode = obj["checkstandcode"].ToString(); //璐ㄦ鏂规缂栫爜
+ string check_type = obj["check_type"].ToString(); //妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)
+ string sampmethod = obj["sampmethod"].ToString(); //鎶芥鏂瑰紡锛氬浐瀹氭娊妫�(FIXED) 姣斾緥鎶芥(SCARE)
+ string qualitystatus = obj["qualitystatus"].ToString(); //璐ㄩ噺鐘舵��(鍚堟牸銆佷笉鍚堟牸)
+ string labqty = obj["good_qty"].ToString(); //宸ュ簭浠诲姟鍚堟牸鏁伴噺
+ string sampleqty = obj["sampleqty"].ToString(); //鏍锋湰鏁伴噺
+ string goodqty = obj["goodqty"].ToString(); //鍚堟牸鏁伴噺
+ string ngqty = obj["ngqty"].ToString();//涓嶅悎鏍兼暟閲�
+ string checkitemcont = obj["checkitemcont"].ToString(); //妫�楠岄」鐩暟鎹�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username,json);
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(wocode, partcode,stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
return TJson.toJson(mes);
}
#endregion
@@ -718,7 +776,7 @@
[HttpPost]
public HttpResponseMessage MesOrderBitchClosedSeave(DataTable dt)
{
-
+
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = ProductionManagementBLL.MesOrderBitchClosedSeave(username, dt);
return TJson.toJson(mes);
@@ -807,7 +865,7 @@
/// <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)
+ 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
@@ -828,7 +886,7 @@
/// <returns></returns>
[Route(template: "CapacityPlanSubmit")]
[HttpPost]
- public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode,string captplanid=null,string capsetupcode=null,string captplantype=null)
+ public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode, string captplanid = null, string capsetupcode = null, string captplantype = null)
{
string type = ""; //鎻愪氦绫诲瀷
if (captplanid == "" || captplanid == null)
@@ -840,7 +898,7 @@
type = "Update";
}
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.CapacityPlanSubmit(type,captplanid,wkshopcode,capunitcode,capsetupcode, captplantype,username);
+ mes = ProductionManagementBLL.CapacityPlanSubmit(type, captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, username);
return TJson.toJson(mes);
}
#endregion
@@ -869,7 +927,7 @@
/// <returns></returns>
[Route(template: "CapacityPlanningOnclickSelect")]
[HttpGet]
- public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid,string datetime)
+ public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid, string datetime)
{
mes = ProductionManagementBLL.CapacityPlanningOnclickSelect(captplanid, datetime);
return TJson.toJson(mes);
@@ -903,7 +961,7 @@
type = "Update";
}
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs,type, username);
+ mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs, type, username);
return TJson.toJson(mes);
}
#endregion
@@ -926,7 +984,7 @@
/// <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)
+ 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
@@ -948,7 +1006,7 @@
/// <returns></returns>
[Route(template: "OnclickAdvancedSchedulingDevice")]
[HttpGet]
- public HttpResponseMessage OnclickAdvancedSchedulingDevice(string wocode,string wkshpcode,string partcode,string botproccode,string startdate,string enddate)
+ 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>();
@@ -963,6 +1021,29 @@
}
#endregion
+ #region[NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁]
+ /// <summary>
+ /// NEW楂樼骇鎺掔▼鐐瑰嚮宸ュ崟浠诲姟甯﹀嚭鐡堕宸ュ簭璁惧銆佸凡鎺掔▼浠诲姟鏁版嵁
+ /// </summary>
+ /// <param name="json">鏌ヨ鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "NewOnclickAdvancedSchedulingDevice")]
+ [HttpPost]
+ public HttpResponseMessage NewOnclickAdvancedSchedulingDevice(List<ApsOrderSerch> json)
+ {
+ List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
+ List<AdvancedSchedAlready> list1 = new List<AdvancedSchedAlready>();
+ list = ProductionManagementBLL.NewOnclickAdvancedSchedulingDevice(json, ref mes); //鎺掍骇璁惧淇℃伅
+ List<DataTable> dt = ProductionManagementBLL.NewAlreadyScheduling(json); //璁惧宸叉帓绋嬩俊鎭�
+
+ 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>
/// 鎺掔▼鏁版嵁鎻愪氦
--
Gitblit v1.9.3