From 6fe3d6fc4e93f4cf31dc02d4f0cbc48d56c249b7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 30 六月 2023 13:35:23 +0800
Subject: [PATCH] 多车间模式接口过滤
---
VueWebApi/Controllers/ProductionManagementController.cs | 416 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 349 insertions(+), 67 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index b851546..b3f861c 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -47,6 +47,8 @@
[HttpGet]
public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
string paydatestartdate = ""; //棰勮寮�宸ュ紑濮嬫椂闂�
string paydateenddate = ""; //棰勮寮�宸ョ粨鏉熸椂闂�
string paydatestartdate1 = ""; //棰勮瀹屽伐寮�濮嬫椂闂�
@@ -63,7 +65,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -87,8 +89,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
@@ -106,7 +109,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
@@ -133,11 +136,40 @@
/// <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)
+ {
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,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.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -147,12 +179,13 @@
/// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "PartSelectRoute")]
[HttpGet]
- public HttpResponseMessage PartSelectRoute(string partcode)
+ public HttpResponseMessage PartSelectRoute(string partcode,string wkshopcode)
{
- mes = ProductionManagementBLL.PartSelectRoute(partcode);
+ mes = ProductionManagementBLL.PartSelectRoute(partcode, wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -162,13 +195,14 @@
/// 浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
- /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <returns></returns>
[Route(template: "RouteSelectWkshop")]
[HttpGet]
- public HttpResponseMessage RouteSelectWkshop(string partcode, string routecode)
+ public HttpResponseMessage RouteSelectWkshop(string partcode)
{
- mes = ProductionManagementBLL.RouteSelectWkshop(partcode, routecode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductionManagementBLL.RouteSelectWkshop(stu_torgcode, stu_torgtypecode,partcode);
return TJson.toJson(mes);
}
#endregion
@@ -184,6 +218,52 @@
public HttpResponseMessage SelectRouteStep(string routecode)
{
mes = ProductionManagementBLL.SelectRouteStep(routecode);
+ return TJson.toJson(mes);
+ }
+ #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宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AddMesOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage AddMesOrderCodeSearch()
+ {
+ mes = ProductionManagementBLL.AddMesOrderCodeSearch();
return TJson.toJson(mes);
}
#endregion
@@ -210,10 +290,10 @@
string planenddate = obj["planenddate"].ToString(); //璁″垝瀹屾垚鏃堕棿
string orderlev = obj["orderlev"].ToString(); //宸ュ崟绛夌骇
string is_aps = obj["is_aps"].ToString(); //鏄惁鎺掍骇
- string bom_id = obj["bom_id"].ToString(); //Bom涓籭d
+ 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, is_aps);
+ 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
@@ -248,7 +328,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
@@ -269,6 +349,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>
@@ -284,9 +393,11 @@
[HttpGet]
public HttpResponseMessage MesOrderStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -305,9 +416,11 @@
[HttpGet]
public HttpResponseMessage MesOrderWxStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderWxStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -326,9 +439,11 @@
[HttpGet]
public HttpResponseMessage MesOrderNgStepSearch(string orderstepqrcode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderNgStepSearch(stu_torgcode, stu_torgtypecode,orderstepqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -355,12 +470,13 @@
/// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
/// <param name="SelectType">鎿嶄綔绫诲瀷锛氬鍗忓彂鏂欐爣璇�(OUT)/澶栧崗鏀舵枡鏍囪瘑(IN)</param>
/// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
/// <returns></returns>
[Route(template: "MesOrderStepStart")]
[HttpGet]
- public HttpResponseMessage MesOrderStepStart(string OperType, string orderstepqrcode, string SelectType = null)
+ public HttpResponseMessage MesOrderStepStart(string OperType,string stu_torgcode, string orderstepqrcode, string SelectType = null)
{
- mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
+ mes = ProductionManagementBLL.MesOrderStepStart(OperType, stu_torgcode, SelectType, orderstepqrcode);
return TJson.toJson(mes);
}
#endregion
@@ -384,12 +500,15 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderStepReportSelectUserGroup")]
[HttpGet]
- public HttpResponseMessage MesOrderStepReportSelectUserGroup()
+ public HttpResponseMessage MesOrderStepReportSelectUserGroup(string wkshopcode)
{
- mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
return TJson.toJson(mes);
}
#endregion
@@ -404,7 +523,8 @@
[HttpGet]
public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
{
- mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ mes = ProductionManagementBLL.MesOrderGroupSelectUser(stu_torgcode,usergroupcode);
return TJson.toJson(mes);
}
#endregion
@@ -492,6 +612,8 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
+ string reckway = obj["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -501,7 +623,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, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -545,6 +667,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
string sqty = obj["sqty"].ToString(); //鏀舵枡鏁伴噺
@@ -552,7 +675,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
@@ -573,40 +696,29 @@
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+
+ #region[宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ /// 宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
/// </summary>
- /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</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 stu_torgcode, string orderstepqrcode, string checktype)
{
- mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode);
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(stu_torgcode,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]
@@ -617,29 +729,30 @@
}
#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 stu_torgcode = obj["stu_torgcode"].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(stu_torgcode,wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
return TJson.toJson(mes);
}
#endregion
@@ -667,9 +780,11 @@
[HttpGet]
public HttpResponseMessage MesOrderBitchClosedSearch(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)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderBitchClosedSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -684,7 +799,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);
@@ -709,6 +824,56 @@
#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>
/// 浜ц兘瑙勫垝鏌ヨ
@@ -723,7 +888,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
@@ -744,7 +909,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)
@@ -756,7 +921,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
@@ -785,7 +950,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);
@@ -819,10 +984,12 @@
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
+
+
#region[鑷姩鎺掔▼宸ュ崟鏌ヨ]
@@ -840,7 +1007,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
@@ -862,12 +1029,35 @@
/// <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>();
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[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);
@@ -896,5 +1086,97 @@
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