From 61eedf1c07cc2c338e84f48712f210b35e716cfb Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 31 七月 2023 11:18:48 +0800
Subject: [PATCH] ERP单据同步增加车间过滤
---
VueWebApi/Controllers/ProductionManagementController.cs | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 1acdf21..d2fd207 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
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -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
@@ -105,8 +107,7 @@
[HttpPost]
public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
{
- //var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- var username = "Admin";
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = ProductionManagementBLL.ClosedErpOrder(erporderid, erpordercode, username);
return TJson.toJson(mes);
}
@@ -136,9 +137,11 @@
[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)
{
+ 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(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ 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
@@ -175,12 +178,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
@@ -190,13 +194,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
@@ -387,9 +392,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
@@ -408,9 +415,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
@@ -429,9 +438,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
@@ -458,12 +469,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
@@ -487,12 +499,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
@@ -507,7 +522,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
@@ -684,14 +700,15 @@
/// <summary>
/// 宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
/// </summary>
+ /// <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, string checktype)
+ public HttpResponseMessage MesOrderStepCheckSearch(string stu_torgcode, string orderstepqrcode, string checktype)
{
- mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode, checktype);
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(stu_torgcode,orderstepqrcode, checktype);
return TJson.toJson(mes);
}
#endregion
@@ -720,6 +737,7 @@
[HttpPost]
public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
{
+ string stu_torgcode = obj["stu_torgcode"].ToString(); //鎵�灞炵粍缁囩紪鍙�
string wocode = obj["wocode"].ToString(); //宸ュ崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
@@ -733,7 +751,7 @@
string ngqty = obj["ngqty"].ToString();//涓嶅悎鏍兼暟閲�
string checkitemcont = obj["checkitemcont"].ToString(); //妫�楠岄」鐩暟鎹�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(stu_torgcode,wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
return TJson.toJson(mes);
}
#endregion
@@ -761,9 +779,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
--
Gitblit v1.9.3