From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 ：单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端：外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表：(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发
---
VueWebApi/Controllers/BasicSettingController.cs | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 228 insertions(+), 12 deletions(-)
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index e796224..3fe5bdc 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;
@@ -17,6 +18,7 @@
{
[RoutePrefix(prefix: "api/BasicSetting")]
[ControllerGroup("鍩虹璁剧疆","鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilter]
public class BasicSettingController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -77,8 +79,10 @@
string OrganName = obj["OrganName"].ToString(); //缁勭粐鍚嶇О
string Operator = obj["Operator"].ToString(); //鎿嶄綔浜哄憳
int SupUnit = Convert.ToInt32(obj["SupUnit"].ToString());//涓婄骇鍗曚綅
+ string RightCode = obj["RightCode"].ToString(); //鑿滃崟鍔熻兘缂栫爜
+ string numvalue = obj["numvalue"].ToString(); //娴佹按鍙�
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateOrganization(OrganType, OrganCode, OrganName, Operator, SupUnit, OperType);
+ mes = BasicSettingBLL.AddUpdateOrganization(OrganType, OrganCode, OrganName, Operator, SupUnit, RightCode, numvalue, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -139,6 +143,20 @@
}
#endregion
+ #region[鐢ㄦ埛鎵�灞炵彮缁刔
+ /// <summary>
+ /// 鐢ㄦ埛鎵�灞炵彮缁�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "UserGroup")]
+ [HttpGet]
+ public HttpResponseMessage UserGroup()
+ {
+ mes = BasicSettingBLL.UserGroup();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
/// <summary>
/// 鐢ㄦ埛娓呭崟鏂板缂栬緫
@@ -155,12 +173,13 @@
string Password = obj["Password"].ToString(); //瀵嗙爜
string Enable = obj["Enable"].ToString(); //鍦ㄨ亴鐘舵��
string StuOrg = obj["StuOrg"].ToString(); //閫夋嫨缁勭粐缂栫爜
+ string groupcode= obj["groupcode"].ToString(); //鎵�灞炵彮缁勭紪鐮�
string wagetype = obj["wagetype"].ToString(); //宸ヨ祫绫诲瀷
string Mobile = obj["Mobile"].ToString(); //鑱旂郴鏂瑰紡
string Email = obj["Email"].ToString(); //鐢靛瓙閭
string Operator = obj["Operator"].ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, StuOrg, wagetype, Mobile, Email, Operator, OperType);
+ mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, StuOrg, groupcode, wagetype, Mobile, Email, Operator, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -222,7 +241,7 @@
/// <returns></returns>
[Route(template: "ImportUserExcel")]
[HttpPost]
- public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files)
+ public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files,string username)
{
string savePath;
if (files == null || files.ContentLength <= 0)
@@ -232,7 +251,6 @@
}
else
{
- var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鐧诲綍鐢ㄦ埛鍚�
string filename = Path.GetFileName(files.FileName);
int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
string fileEx = System.IO.Path.GetExtension(filename);//鑾峰彇涓婁紶鏂囦欢鐨勬墿灞曞悕
@@ -276,6 +294,58 @@
}
return TJson.toJson(mes);
+ }
+ #endregion
+
+
+ #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
+ /// <summary>
+ /// 鐢ㄦ埛缁勫垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupSearch")]
+ [HttpGet]
+ public HttpResponseMessage UserGroupSearch(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);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勬柊澧瀅
+ /// <summary>
+ /// 鐢ㄦ埛缁勬柊澧�
+ /// </summary>
+ /// <param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupAdd")]
+ [HttpPost]
+ public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ mes = BasicSettingBLL.UserGroupAdd(json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勫垹闄
+ /// <summary>
+ /// 鐢ㄦ埛缁勫垹闄�
+ /// </summary>
+ /// <param name="UserGrupCode">鐢ㄦ埛缁勭紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupDelete")]
+ [HttpPost]
+ public HttpResponseMessage UserGroupDelete(string UserGrupCode)
+ {
+ mes = BasicSettingBLL.UserGroupDelete(UserGrupCode);
+ return TJson.toJson(mes);
}
#endregion
@@ -546,15 +616,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 = "Admin";//HttpContext.Current.Request.Cookies["admin"].Value.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
@@ -563,13 +631,161 @@
/// <summary>
/// 寰�鏉ュ崟浣嶅垹闄�
/// </summary>
- /// <param name="unitid">寰�鏉ュ崟浣岻D</param>
+ /// <param name="unitcode">寰�鏉ュ崟浣嶇紪鐮�</param>
/// <returns></returns>
[Route(template: "DeleteCurrentUnit")]
[HttpPost]
- public HttpResponseMessage DeleteCurrentUnit(string unitid)
+ public HttpResponseMessage DeleteCurrentUnit(string unitcode)
{
- mes = BasicSettingBLL.DeleteCurrentUnit(unitid);
+ mes = BasicSettingBLL.DeleteCurrentUnit(unitcode);
+ 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
--
Gitblit v1.9.3