From 6e1231595e0e72b0fa421711d34bc77d3b406a4b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 21 四月 2023 10:14:37 +0800
Subject: [PATCH] 高级排程过工单信息测试接口(实现不了) 采购到货单接口开发
---
VueWebApi/Controllers/ProductionManagementController.cs | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 5f2d3cf..9416126 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -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,7 +134,7 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[HttpGet]
- 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)
+ 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
@@ -161,7 +161,7 @@
/// <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)
+ 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
@@ -241,7 +241,7 @@
/// <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);
@@ -322,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
@@ -605,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
@@ -743,7 +743,7 @@
string data = obj["data"].ToString();
List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
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(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -788,7 +788,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);
@@ -877,7 +877,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
@@ -898,7 +898,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)
@@ -910,7 +910,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
@@ -939,7 +939,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);
@@ -973,7 +973,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
@@ -996,7 +996,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
@@ -1018,7 +1018,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>();
@@ -1033,6 +1033,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