From 8b3020c92010076e03d0314f1719083444063626 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 20 十一月 2023 11:26:05 +0800
Subject: [PATCH] 1.生产开报工，修改开工数量功能 2.车间看板，左上产线加工任务增加开工数量字段 3.修改用户清单，用户名称查询无数据问题
---
VueWebApi/Controllers/BasicSettingController.cs | 246 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 222 insertions(+), 24 deletions(-)
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index 6c08983..5ad62a2 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Data;
using System.IO;
using System.Linq;
using System.Net;
@@ -41,9 +42,11 @@
[HttpGet]
public HttpResponseMessage OrganizationSearch(string OrgCode=null, string OrgName=null, string OrgType=null, string UserName=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 description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.OrganizationSearch(OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
+ mes = BasicSettingBLL.OrganizationSearch(stu_torgcode, description, OrgCode, OrgName, OrgType, UserName,startNum,endNum,prop,order);
return TJson.toJson(mes);
}
#endregion
@@ -91,12 +94,13 @@
/// 缁勭粐鏋舵瀯鍒犻櫎
/// </summary>
/// <param name="orgid">缁勭粐id</param>
+ /// <param name="orgcode">缁勭粐缂栫爜</param>
/// <returns></returns>
[Route(template: "DeleteOrganization")]
[HttpPost]
- public HttpResponseMessage DeleteOrganization(int orgid)
+ public HttpResponseMessage DeleteOrganization(int orgid,string orgcode)
{
- mes = BasicSettingBLL.DeleteOrganization(orgid);
+ mes = BasicSettingBLL.DeleteOrganization(orgid, orgcode);
return TJson.toJson(mes);
}
#endregion
@@ -110,6 +114,7 @@
/// <param name="UserCode">鐢ㄦ埛缂栫爜</param>
/// <param name="UserName">鐢ㄦ埛鍚嶇О</param>
/// <param name="StuOrg">鎵�灞炵粍缁�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="wagetype">宸ヨ祫绫诲瀷</param>
/// <param name="Enable">鍦ㄨ亴鐘舵��</param>
/// <param name="page">椤电爜</param>
@@ -119,11 +124,11 @@
/// <returns></returns>
[Route(template: "UserSearch")]
[HttpGet]
- public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string description=null, string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, description, wagetype, Enable, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -137,7 +142,9 @@
[HttpGet]
public HttpResponseMessage UserOrganization()
{
- mes = BasicSettingBLL.UserOrganization();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.UserOrganization(stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -151,7 +158,9 @@
[HttpGet]
public HttpResponseMessage UserGroup()
{
- mes = BasicSettingBLL.UserGroup();
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.UserGroup(stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -203,12 +212,14 @@
/// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ
/// </summary>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <returns></returns>
[Route(template: "UserAssociationRole")]
[HttpGet]
- public HttpResponseMessage UserAssociationRole(string usercode)
+ public HttpResponseMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
{
- mes = BasicSettingBLL.UserAssociationRole(usercode);
+ mes = BasicSettingBLL.UserAssociationRole(usercode, stu_torgcode, description);
return TJson.toJson(mes);
}
#endregion
@@ -218,16 +229,18 @@
/// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
/// </summary>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
[Route(template: "SaveUserAssoctRole")]
[HttpPost]
- public HttpResponseMessage SaveUserAssoctRole(string usercode, List<RoleUserSubmit> json)
+ public HttpResponseMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
{
//JavaScriptSerializer Serializer = new JavaScriptSerializer();
//List<RoleUserSubmit> objs = new List<RoleUserSubmit>();
//objs = Serializer.Deserialize<List<RoleUserSubmit>>(json);
- mes= BasicSettingBLL.SaveUserAssoctRole(usercode, json);
+ mes= BasicSettingBLL.SaveUserAssoctRole(usercode, stu_torgcode, description, json);
return TJson.toJson(mes);
}
#endregion
@@ -301,6 +314,10 @@
/// <summary>
/// 鐢ㄦ埛缁勫垪琛ㄦ煡璇�
/// </summary>
+ /// <param name="groupcode">鐝粍缂栫爜</param>
+ /// <param name="groupname">鐝粍鍚嶇О</param>
+ /// <param name="stu_torgcode">鎵�灞炵粍缁�</param>
+ /// <param name="description">鎵�灞炵粍缁囩被鍨�</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -308,27 +325,28 @@
/// <returns></returns>
[Route(template: "UserGroupSearch")]
[HttpGet]
- public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode=null,string description=null, int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.UserGroupSearch(startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserGroupSearch(groupcode, groupname, stu_torgcode, description, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
- #region[鐢ㄦ埛缁勬柊澧瀅
+ #region[鐢ㄦ埛缁勬柊澧炪�佷慨鏀筣
/// <summary>
/// 鐢ㄦ埛缁勬柊澧�
/// </summary>
+ /// <param name="type">鎻愪氦绫诲瀷(Add/Update)</param>
/// <param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
/// <returns></returns>
[Route(template: "UserGroupAdd")]
[HttpPost]
- public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
+ public HttpResponseMessage UserGroupAdd(string type,List<GroupUser> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
- mes = BasicSettingBLL.UserGroupAdd(json, username);
+ mes = BasicSettingBLL.UserGroupAdd(type,json, username);
return TJson.toJson(mes);
}
#endregion
@@ -348,6 +366,21 @@
}
#endregion
+ #region[鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛榏
+ /// <summary>
+ /// 鐢ㄦ埛缁勬煡鐪嬪叧鑱斾汉鍛�
+ /// </summary>
+ /// <param name="groupcode">鐝粍缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "GroupUserProject")]
+ [HttpGet]
+ public HttpResponseMessage GroupUserProject(string groupcode)
+ {
+ mes = BasicSettingBLL.GroupUserProject(groupcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[瑙掕壊绫诲瀷鍒楄〃鏌ヨ]
@@ -363,9 +396,11 @@
[HttpGet]
public HttpResponseMessage RoleTypeSearch(int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.RoleTypeSearch(startNum, endNum, prop, order);
+ mes = BasicSettingBLL.RoleTypeSearch(stu_torgcode, description,startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -409,9 +444,11 @@
[HttpGet]
public HttpResponseMessage RoleTypeSelect()
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
try
{
- mes = BasicSettingBLL.RoleTypeSelect();
+ mes = BasicSettingBLL.RoleTypeSelect(stu_torgcode, description);
}
catch (Exception e)
{
@@ -439,9 +476,11 @@
[HttpGet]
public HttpResponseMessage RoleSearch(string RoleCode = null, string RoleName = null, string RoleTypeCode = null, string CreateUser = 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 description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.RoleSearch(RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.RoleSearch(stu_torgcode,description, RoleCode, RoleName, RoleTypeCode, CreateUser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -459,11 +498,12 @@
string RoleId = obj["RoleId"].ToString(); //瑙掕壊id(涓婚敭)
string RoleCode = obj["RoleCode"].ToString(); //瑙掕壊缂栫爜
string RoleName = obj["RoleName"].ToString(); //瑙掕壊鍚嶇О
+ string stu_torgcode = obj["stu_torgcode"].ToString(); //鎵�灞炵粍缁囩紪鐮�
string RoleTypeCode = obj["RoleTypeCode"].ToString(); //瑙掕壊绫诲瀷缂栫爜
string description = obj["description"].ToString(); //瑙掕壊鎻忚堪
var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, RoleTypeCode, description, usercode, OperType);
+ mes = BasicSettingBLL.AddUpdateRole(RoleId, RoleCode, RoleName, stu_torgcode,RoleTypeCode, description, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -615,15 +655,13 @@
string unitid = obj["id"].ToString(); //寰�鏉ュ崟浣峣d(涓婚敭)
string unitcode = obj["unitcode"].ToString(); //寰�鏉ュ崟浣嶇紪鐮佺紪鐮�
string unitname = obj["unitname"].ToString(); //寰�鏉ュ崟浣嶅悕绉�
- string mtypecode = obj["mtypecode"].ToString(); //澶栬喘渚涙柟缂栫爜
- string btypecode = obj["btypecode"].ToString(); //澶栧崗渚涙柟缂栫爜
- string htypecode = obj["htypecode"].ToString(); //瀹㈡埛缂栫爜
+ string typecode = obj["typecode"].ToString(); //鍗曚綅灞炴�х紪鐮�
string person = obj["person"].ToString(); //鑱旂郴浜�
string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
+ mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, typecode, person, contact, description, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -642,5 +680,165 @@
return TJson.toJson(mes);
}
#endregion
+
+
+ #region[瀹夌伅绯荤粺/杞﹂棿鏌ヨ]
+ [Route(template: "AnDengShopSearch")]
+ [HttpGet]
+ public HttpResponseMessage AnDengShopSearch()
+ {
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = BasicSettingBLL.AnDengShopSearch(stu_torgcode, description);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AnDengTypeSearch")]
+ [HttpGet]
+ public HttpResponseMessage AnDengTypeSearch()
+ {
+ mes = BasicSettingBLL.AnDengTypeSearch();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫柊澧瀅
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫柊澧�
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateAnDengType")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateAnDengType(List<ObjectData> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ mes = BasicSettingBLL.AddUpdateAnDengType(json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬪垹闄
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬪垹闄�
+ /// </summary>
+ /// <param name="andengtypecode">瀹夌伅鍛煎彨绫诲瀷缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteAnDengType")]
+ [HttpPost]
+ public HttpResponseMessage DeleteAnDengType(string andengtypecode)
+ {
+ mes = BasicSettingBLL.DeleteAnDengType(andengtypecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏌ヨ缁戝畾鐨勫搷搴斾汉鍛榏
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鏌ヨ缁戝畾鐨勫搷搴斾汉鍛�
+ /// </summary>
+ /// <param name="wkshopcode">閫変腑鐨勮溅闂寸紪鐮�</param>
+ /// <param name="calltypecode">閫変腑鐨勫懠鍙被鍨嬬紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "AnDengResponUserSearch")]
+ [HttpGet]
+ public HttpResponseMessage AnDengResponUserSearch(string wkshopcode,string calltypecode)
+ {
+ mes = BasicSettingBLL.AnDengResponUserSearch(wkshopcode, calltypecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鏌ヨ宸茬粦瀹氱殑鍝嶅簲浜哄憳]
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鏌ヨ宸茬粦瀹氱殑鍝嶅簲浜哄憳
+ /// </summary>
+ /// <param name="wkshopcode">閫変腑鐨勮溅闂寸紪鐮�</param>
+ /// <param name="calltypecode">閫変腑鐨勫懠鍙被鍨嬬紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "AnDengDigoResponUserSearch")]
+ [HttpGet]
+ public HttpResponseMessage AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
+ {
+ mes = BasicSettingBLL.AnDengDialogResponUserSearch(wkshopcode, calltypecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鎻愪氦]
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鏂板鍝嶅簲浜哄憳鎻愪氦
+ /// </summary>
+ /// <param name="wkshopcode">閫変腑鐨勮溅闂寸紪鐮�</param>
+ /// <param name="calltypecode">閫変腑鐨勫懠鍙被鍨嬬紪鐮�</param>
+ /// <param name="enable">鍏佽鍏抽棴</param>
+ /// <param name="json">鍝嶅簲浜哄憳鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AnDengDigoResponUserSeave")]
+ [HttpPost]
+ public HttpResponseMessage AnDengDigoResponUserSeave(string wkshopcode, string calltypecode,string enable,DataTable json)
+ {
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ mes = BasicSettingBLL.AnDengDigoResponUserSeave(wkshopcode, calltypecode, enable, usercode,json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍏佽鍏抽棴]
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍏佽鍏抽棴
+ /// </summary>
+ /// <param name="wkshopcode">閫変腑鐨勮溅闂寸紪鐮�</param>
+ /// <param name="calltypecode">閫変腑鐨勫懠鍙被鍨嬬紪鐮�</param>
+ /// <param name="enable">鍏佽鍏抽棴</param>
+ /// <returns></returns>
+ [Route(template: "AnDengResponUserCloseSeave")]
+ [HttpPost]
+ public HttpResponseMessage AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable)
+ {
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ mes = BasicSettingBLL.AnDengResponUserCloseSeave(wkshopcode, calltypecode, enable, usercode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍒犻櫎]
+ /// <summary>
+ /// 瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍒犻櫎
+ /// </summary>
+ /// <param name="id">瀛恑d</param>
+ /// <param name="ando_cogfigid">涓籭d</param>
+ /// <returns></returns>
+ [Route(template: "AnDengResponUserDeleteSeave")]
+ [HttpPost]
+ public HttpResponseMessage AnDengResponUserDeleteSeave(string id, string ando_cogfigid)
+ {
+ mes = BasicSettingBLL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ /// <summary>
+ /// 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+ /// </summary>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WhkspIsEqpSearch")]
+ [HttpGet]
+ public HttpResponseMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ mes = BasicSettingBLL.WhkspIsEqpSearch(wkshpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3