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/SystemSettingController.cs | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/VueWebApi/Controllers/SystemSettingController.cs b/VueWebApi/Controllers/SystemSettingController.cs
index 1d22ee6..4c266d6 100644
--- a/VueWebApi/Controllers/SystemSettingController.cs
+++ b/VueWebApi/Controllers/SystemSettingController.cs
@@ -1,9 +1,11 @@
锘縰sing Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
using VueWebApi.DLL.BLL;
using VueWebApi.Tools;
@@ -12,6 +14,7 @@
{
[RoutePrefix(prefix: "api/SystemSetting")]
[ControllerGroup("绯荤粺璁剧疆", "鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilter]
public class SystemSettingController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -29,7 +32,7 @@
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
- [Route(template: "EncodingRules ")]
+ [Route(template: "EncodingRules")]
[HttpGet]
public HttpResponseMessage EncodingRules(string rightname = null, string prefix = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
@@ -55,7 +58,7 @@
string prefix = obj["prefix"].ToString(); //鍥哄畾瀛楃
string filingdate = obj["filingdate"].ToString(); //鎻愪氦鏃ユ湡
string incbit = obj["incbit"].ToString(); //鑷浣嶆暟
- string lm_user = obj["lm_user"].ToString(); //鎿嶄綔浜哄憳
+ var lm_user = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = SystemSettingBLL.SaveEncodingRules(rightcode, rightname,prefix, filingdate, incbit, lm_user);
return TJson.toJson(mes);
}
@@ -75,5 +78,69 @@
return TJson.toJson(mes);
}
#endregion
+
+
+
+ #region[杞﹂棿鍏憡鍒楄〃]
+ /// <summary>
+ /// 杞﹂棿鍏憡鍒楄〃
+ /// </summary>
+ /// <param name="wkspcode">杞﹂棿缂栫爜</param>
+ /// <param name="ancetitle">鍏憡涓婚</param>
+ /// <param name="ancecont">鍏憡鍐呭</param>
+ /// <param name="cancel">鏄惁鎾ら攢</param>
+ /// <param name="level">鍏憡绛夌骇</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "SystemAnnouncementSearch")]
+ [HttpGet]
+ public HttpResponseMessage SystemAnnouncementSearch(string wkspcode = null, string ancetitle = null,string ancecont=null,string cancel=null,string level=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 = SystemSettingBLL.SystemAnnouncementSearch(wkspcode, ancetitle, ancecont, cancel, level, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿鍏憡鏂板缂栬緫鎻愪氦]
+ /// <summary>
+ /// 杞﹂棿鍏憡鏂板缂栬緫鎻愪氦
+ /// </summary>
+ /// <param name="id">id</param>
+ /// <param name="dt">杞﹂棿闆嗗悎</param>
+ /// <param name="ancetitle">鍏憡涓婚</param>
+ /// <param name="ancecont">鍏憡鍐呭</param>
+ /// <param name="level">鍏憡绛夌骇</param>
+ /// <param name="cancel">鏄惁鎾ら攢</param>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "SystemAnnouncementAddUpdate")]
+ [HttpPost]
+ public HttpResponseMessage SystemAnnouncementAddUpdate(DataTable dt,string ancetitle,string ancecont,string level,string cancel,string opertype, string id = null)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = SystemSettingBLL.SystemAnnouncementAddUpdate(id,dt, ancetitle, ancecont, cancel, level, username, opertype);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿鍏憡鍒犻櫎]
+ /// <summary>
+ /// 杞﹂棿鍏憡鍒犻櫎
+ /// </summary>
+ /// <param name="id">id</param>
+ /// <returns></returns>
+ [Route(template: "SystemAnnouncementDelete")]
+ [HttpPost]
+ public HttpResponseMessage SystemAnnouncementDelete(string id)
+ {
+ mes = SystemSettingBLL.SystemAnnouncementDelete(id);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3