From 1e8ea8ab3c8bd260f855cea27f5710bda782cce3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 09 五月 2024 17:02:11 +0800
Subject: [PATCH] 圣沣看板接口开发 app 首件、巡检、完工检图标
---
VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png | 0
VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs | 2
VueWebCoreApi/DLL/BLL/ProductModelBLL.cs | 28 +
VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png | 0
VueWebCoreApi/wwwroot/AppMenuImage/app_8_3.png | 0
VueWebCoreApi/Tools/ExcelList.cs | 10
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 567 ++++++++++++++---------------
VueWebCoreApi/Controllers/KanBanManagerentController.cs | 142 ++++++-
VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs | 76 +++
VueWebCoreApi/Controllers/ProductModelController.cs | 51 ++
VueWebCoreApi/Startup.cs | 2
VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs | 259 ++++++++++---
VueWebCoreApi/appsettings.json | 3
13 files changed, 728 insertions(+), 412 deletions(-)
diff --git a/VueWebCoreApi/Controllers/KanBanManagerentController.cs b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
index 942d390..42b83f5 100644
--- a/VueWebCoreApi/Controllers/KanBanManagerentController.cs
+++ b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.Http;
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Tools;
@@ -17,55 +18,140 @@
ToMessage mes = new ToMessage();
RedisCommon redis = new RedisCommon();
- #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笂,閲囪喘寰呭叆搴揮
/// <summary>
- /// 杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭�
+ /// 鍦ｆ玻浠撳簱鐪嬫澘宸︿笂,閲囪喘寰呭叆搴�
/// </summary>
- /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ProcureOutsourcLeftTop")]
+ [HttpGet]
+ public JsonResult ProcureOutsourcLeftTop()
+ {
+ mes = KanBanManagerentBLL.ProcureOutsourcLeftTop();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笅,閿�鍞緟鍙戣揣]
+ /// <summary>
+ /// 鍦ｆ玻浠撳簱鐪嬫澘宸︿笅,閿�鍞緟鍙戣揣
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ProductConsignmentLeftBottom")]
+ [HttpGet]
+ public JsonResult ProductConsignmentLeftBottom()
+ {
+ mes = KanBanManagerentBLL.ProductConsignmentLeftBottom();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笂,杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕TOP5]
+ /// <summary>
+ /// 鍦ｆ玻浠撳簱鐪嬫澘鍙充笂,杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕TOP5
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ProcureOutsourcRightTop")]
+ [HttpGet]
+ public JsonResult ProcureOutsourcRightTop()
+ {
+ mes = KanBanManagerentBLL.ProcureOutsourcRightTop();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笅,杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕TOP5]
+ /// <summary>
+ /// 鍦ｆ玻浠撳簱鐪嬫澘鍙充笅,杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕TOP5
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ProductionStockedInRightBottom")]
+ [HttpGet]
+ public JsonResult ProductionStockedInRightBottom()
+ {
+ mes = KanBanManagerentBLL.ProductionStockedInRightBottom();
+ return Json(mes);
+ }
+ #endregion
+
+
+
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘宸︿笂,鐢熶骇寰呭叆搴揮
+ /// <summary>
+ /// 鍦ｆ玻鐢熶骇鐪嬫澘宸︿笂,鐢熶骇寰呭叆搴�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ProductionStockedInLeftTop")]
+ [HttpGet]
+ public JsonResult ProductionStockedInLeftTop()
+ {
+ mes = KanBanManagerentBLL.ProductionStockedInLeftTop();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘鍙充笂,杩戜竴鍛ㄧ敓浜у緟鍏ュ簱浜у搧鎺掕TOP10]
+ /// <summary>
+ /// 鍦ｆ玻鐢熶骇鐪嬫澘鍙充笂,杩戜竴鍛ㄧ敓浜у緟鍏ュ簱浜у搧鎺掕TOP10
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ProductionStockedInRightTop")]
+ [HttpGet]
+ public JsonResult ProductionStockedInRightTop()
+ {
+ mes = KanBanManagerentBLL.ProductionStockedInRightTop();
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ /// <summary>
+ /// 鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭�
+ /// </summary>
/// <returns></returns>
[Route(template: "WorkShopProduceTopData")]
[HttpGet]
- public JsonResult WorkShopProduceTopData(string wkshopcode)
+ public JsonResult WorkShopProduceTopData()
{
- mes = KanBanManagerentBLL.WorkShopProduceTopData(wkshopcode);
+ mes = KanBanManagerentBLL.WorkShopProduceTopData();
return Json(mes);
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
/// <summary>
- /// 杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔�
+ /// 鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔�
/// </summary>
- /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "WorkShopProduceBottomLeftData")]
[HttpGet]
- public JsonResult WorkShopProduceBottomLeftData(string wkshopcode)
+ public JsonResult WorkShopProduceBottomLeftData()
{
- mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData(wkshopcode);
+ mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData();
return Json(mes);
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
/// <summary>
- /// 杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁�
+ /// 鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁�
/// </summary>
- /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <returns></returns>
[Route(template: "WorkShopProduceBottomRightData")]
[HttpGet]
- public JsonResult WorkShopProduceBottomRightData(string wkshopcode)
+ public JsonResult WorkShopProduceBottomRightData()
{
- mes = KanBanManagerentBLL.WorkShopProduceBottomRightData(wkshopcode);
+ mes = KanBanManagerentBLL.WorkShopProduceBottomRightData();
return Json(mes);
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
/// <summary>
- /// 杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟
+ /// 鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
/// <returns></returns>
@@ -78,9 +164,9 @@
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
/// <summary>
- /// 杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗�
+ /// 鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗�
/// </summary>
/// <returns></returns>
[Route(template: "WorkShopCompreRightTop")]
@@ -92,9 +178,23 @@
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笅閲囪喘璁㈠崟]
/// <summary>
- /// 杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨
+ /// 鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笅閲囪喘璁㈠崟
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreLeftBottom")]
+ [HttpGet]
+ public JsonResult WorkShopCompreLeftBottom()
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreLeftBottom();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ /// <summary>
+ /// 鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨
/// </summary>
/// <returns></returns>
[Route(template: "WorkShopCompreRightBottom")]
diff --git a/VueWebCoreApi/Controllers/ProductModelController.cs b/VueWebCoreApi/Controllers/ProductModelController.cs
index 9034a5e..672ecfe 100644
--- a/VueWebCoreApi/Controllers/ProductModelController.cs
+++ b/VueWebCoreApi/Controllers/ProductModelController.cs
@@ -37,11 +37,46 @@
}
#endregion
+ #region[璁￠噺鍗曚綅缁勬柊澧�/缂栬緫]
+ /// <summary>
+ /// 璁￠噺鍗曚綅缁勬柊澧�/缂栬緫
+ /// </summary>
+ /// <param name="OperType">鎿嶄綔绫诲瀷(Add/Update)</param>
+ /// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateTUnitGroup")]
+ [HttpPost]
+ public JsonResult AddUpdateTUnitGroup(string OperType, List<ObjectDataCont> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = ProductModelBLL.AddUpdateTUnitGroup(OperType, json, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁￠噺鍗曚綅缁勫垹闄
+ /// <summary>
+ /// 璁￠噺鍗曚綅缁勫垹闄�
+ /// </summary>
+ /// <param name="tunitgroupcode">鍗曚綅缁勭紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "DeleteTUnitGroup")]
+ [HttpPost]
+ public JsonResult DeleteTUnitGroup(string tunitgroupcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = ProductModelBLL.DeleteTUnitGroup(tunitgroupcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+
#region[璁￠噺鍗曚綅淇℃伅鍒楄〃]
/// <summary>
/// 璁￠噺鍗曚綅淇℃伅鍒楄〃
/// </summary>
- /// <param name="tunittype">鍗曡閲�(S) 澶氳閲�(M)</param>
/// <param name="tunitgroupcode">璁￠噺鍗曚綅缁勭紪鐮�</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
@@ -50,13 +85,13 @@
/// <returns></returns>
[Route(template: "TUnitData")]
[HttpGet]
- public JsonResult TUnitData(string tunittype,string tunitgroupcode, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult TUnitData(string tunitgroupcode, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.TUnitData(tunittype,tunitgroupcode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.TUnitData(tunitgroupcode, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -84,19 +119,18 @@
/// 璁￠噺鍗曚綅鏂板銆佺紪杈戜繚瀛�
/// </summary>
/// <param name="data_sources">鏁版嵁鏉ユ簮:ERP/MES</param>
- /// <param name="tunittype">鍗曡閲�(S) 澶氳閲�(M)</param>
/// <param name="tunitgroupcode">璁￠噺鍗曚綅缁勭紪鐮�</param>
/// <param name="OperType">鎿嶄綔绫诲瀷:Add/Update</param>
/// <param name="listjson">鎻愪氦鏁版嵁</param>
/// <returns></returns>
[Route(template: "AddUpdateTUnit")]
[HttpPost]
- public JsonResult AddUpdateTUnit(string data_sources, string tunittype,string tunitgroupcode,string OperType, List<Unit> listjson)
+ public JsonResult AddUpdateTUnit(string data_sources,string tunitgroupcode,string OperType, List<Unit> listjson)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
var menucode = HttpContext.Request.Headers["Menucode"].ToString(); //鑿滃崟缂栫爜
- mes = ProductModelBLL.AddUpdateTUnit(menucode, data_sources,tunittype, tunitgroupcode, OperType, listjson, us);
+ mes = ProductModelBLL.AddUpdateTUnit(menucode, data_sources, tunitgroupcode, OperType, listjson, us);
return Json(mes);
}
#endregion
@@ -106,17 +140,16 @@
/// 璁￠噺鍗曚綅鍒犻櫎
/// </summary>
/// <param name="data_sources">鏁版嵁鏉ユ簮:ERP/MES</param>
- /// <param name="tunittype">鍗曡閲�(S) 澶氳閲�(M)</param>
/// <param name="tunitgroupcode">璁￠噺鍗曚綅缁勭紪鐮�</param>
/// <param name="tunitcode">璁￠噺鍗曚綅缂栫爜</param>
/// <returns></returns>
[Route(template: "DeleteTUnit")]
[HttpPost]
- public JsonResult DeleteTUnit(string data_sources, string tunittype, string tunitgroupcode, string tunitcode)
+ public JsonResult DeleteTUnit(string data_sources, string tunitgroupcode, string tunitcode)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- mes = ProductModelBLL.DeleteTUnit(data_sources, tunittype, tunitgroupcode, tunitcode, us);
+ mes = ProductModelBLL.DeleteTUnit(data_sources, tunitgroupcode, tunitcode, us);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
index a6f15e4..767e0ba 100644
--- a/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -9,43 +9,95 @@
{
public class KanBanManagerentBLL
{
- #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
- public static ToMessage WorkShopProduceTopData(string wkshopcode)
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笂,閲囪喘寰呭叆搴揮
+ public static ToMessage ProcureOutsourcLeftTop()
{
- return KanBanManagerentDAL.WorkShopProduceTopData(wkshopcode);
+ return KanBanManagerentDAL.ProcureOutsourcLeftTop();
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
- public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笅,閿�鍞緟鍙戣揣]
+ public static ToMessage ProductConsignmentLeftBottom()
{
- return KanBanManagerentDAL.WorkShopProduceBottomLeftData(wkshopcode);
+ return KanBanManagerentDAL.ProductConsignmentLeftBottom();
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
- public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笂,杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕TOP5]
+ public static ToMessage ProcureOutsourcRightTop()
{
- return KanBanManagerentDAL.WorkShopProduceBottomRightData(wkshopcode);
+ return KanBanManagerentDAL.ProcureOutsourcRightTop();
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笅,杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕TOP5]
+ public static ToMessage ProductionStockedInRightBottom()
+ {
+ return KanBanManagerentDAL.ProductionStockedInRightBottom();
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘宸︿笂,鐢熶骇寰呭叆搴揮
+ public static ToMessage ProductionStockedInLeftTop()
+ {
+ return KanBanManagerentDAL.ProductionStockedInLeftTop();
+ }
+ #endregion
+
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘鍙充笂,杩戜竴鍛ㄧ敓浜у緟鍏ュ簱浜у搧鎺掕TOP10]
+ public static ToMessage ProductionStockedInRightTop()
+ {
+ return KanBanManagerentDAL.ProductionStockedInRightTop();
+ }
+ #endregion
+
+
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ public static ToMessage WorkShopProduceTopData()
+ {
+ return KanBanManagerentDAL.WorkShopProduceTopData();
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage WorkShopProduceBottomLeftData()
+ {
+ return KanBanManagerentDAL.WorkShopProduceBottomLeftData();
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ public static ToMessage WorkShopProduceBottomRightData()
+ {
+ return KanBanManagerentDAL.WorkShopProduceBottomRightData();
+ }
+ #endregion
+
+
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
{
return KanBanManagerentDAL.WorkShopCompreLeftTop(wkshopcode);
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
public static ToMessage WorkShopCompreRightTop()
{
return KanBanManagerentDAL.WorkShopCompreRightTop();
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笅閲囪喘璁㈠崟]
+ public static ToMessage WorkShopCompreLeftBottom()
+ {
+ return KanBanManagerentDAL.WorkShopCompreLeftBottom();
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
public static ToMessage WorkShopCompreRightBottom()
{
return KanBanManagerentDAL.WorkShopCompreRightBottom();
diff --git a/VueWebCoreApi/DLL/BLL/ProductModelBLL.cs b/VueWebCoreApi/DLL/BLL/ProductModelBLL.cs
index cb2b20a..eb5575a 100644
--- a/VueWebCoreApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/ProductModelBLL.cs
@@ -18,10 +18,24 @@
}
#endregion
- #region[璁￠噺鍗曚綅淇℃伅鍒楄〃]
- public static ToMessage TUnitData(string tunittype, string tunitgroupcode, int startNum, int endNum, string prop, string order)
+ #region[璁￠噺鍗曚綅缁勬柊澧�/缂栬緫]
+ public static ToMessage AddUpdateTUnitGroup(string OperType, List<ObjectDataCont> json, User us)
{
- return ProductModelDAL.TUnitData(tunittype, tunitgroupcode, startNum, endNum, prop, order);
+ return ProductModelDAL.AddUpdateTUnitGroup(OperType, json, us);
+ }
+ #endregion
+
+ #region[璁￠噺鍗曚綅缁勫垹闄
+ public static ToMessage DeleteTUnitGroup(string tunitgroupcode, User us)
+ {
+ return ProductModelDAL.DeleteTUnitGroup(tunitgroupcode, us);
+ }
+ #endregion
+
+ #region[璁￠噺鍗曚綅淇℃伅鍒楄〃]
+ public static ToMessage TUnitData(string tunitgroupcode, int startNum, int endNum, string prop, string order)
+ {
+ return ProductModelDAL.TUnitData(tunitgroupcode, startNum, endNum, prop, order);
}
#endregion
@@ -33,16 +47,16 @@
#endregion
#region[璁￠噺鍗曚綅鏂板銆佺紪杈戜繚瀛榏
- public static ToMessage AddUpdateTUnit(string menucode,string data_sources, string tunittype, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
+ public static ToMessage AddUpdateTUnit(string menucode,string data_sources, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
{
- return ProductModelDAL.AddUpdateTUnit(menucode, data_sources,tunittype, tunitgroupcode, OperType, listjson, us);
+ return ProductModelDAL.AddUpdateTUnit(menucode, data_sources, tunitgroupcode, OperType, listjson, us);
}
#endregion
#region[璁￠噺鍗曚綅鍒犻櫎]
- public static ToMessage DeleteTUnit(string data_sources, string tunittype, string tunitgroupcode, string tunitcode, User us)
+ public static ToMessage DeleteTUnit(string data_sources, string tunitgroupcode, string tunitcode, User us)
{
- return ProductModelDAL.DeleteTUnit(data_sources, tunittype, tunitgroupcode, tunitcode, us);
+ return ProductModelDAL.DeleteTUnit(data_sources, tunitgroupcode, tunitcode, us);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
index 9765700..afeb0c6 100644
--- a/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -12,17 +12,14 @@
{
public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
- #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
- public static ToMessage WorkShopProduceTopData(string wkshopcode)
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笂,閲囪喘寰呭叆搴揮
+ public static ToMessage ProcureOutsourcLeftTop()
{
- string sql = "";
- var dynamicParams = new DynamicParameters();
+ var sql = "";
try
{
- string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- sql = @"select * from h_v_JLKanBan_WorkshopTop where wkshp_code in @wkshoplist";
- dynamicParams.Add("@wkshoplist", wkshoplist);
- var data = DapperHelper.selectdata(sql, dynamicParams);
+ sql = @"select * from h_v_SFKanBan_ProcureNotReceived";
+ var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -38,27 +35,158 @@
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
- public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
+ #region[鍦ｆ玻浠撳簱鐪嬫澘宸︿笅,浜у搧浠ｅ彂璐
+ public static ToMessage ProductConsignmentLeftBottom()
+ {
+ var sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_ProductionNotDeliver";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笂,杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕TOP5]
+ public static ToMessage ProcureOutsourcRightTop()
+ {
+ var sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_ProcureNotReceivedSumTop";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鍦ｆ玻浠撳簱鐪嬫澘鍙充笅,杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕TOP5]
+ public static ToMessage ProductionStockedInRightBottom()
+ {
+ var sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_ProductionNotDeliverSumTop";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘宸︿笂,鐢熶骇寰呭叆搴揮
+ public static ToMessage ProductionStockedInLeftTop()
+ {
+ var sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_ProductionNotReceived";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鍦ｆ玻鐢熶骇鐪嬫澘鍙充笂,杩戜竴鍛ㄧ敓浜у緟鍏ュ簱浜у搧鎺掕TOP10]
+ public static ToMessage ProductionStockedInRightTop()
+ {
+ var sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_ProductionNotReceivedSumTop";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ public static ToMessage WorkShopProduceTopData()
+ {
+ string sql = "";
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_WorkshopTop";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage WorkShopProduceBottomLeftData()
{
string sql = "";
Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- //瀛樺偍杩囩▼鍚�(褰撳墠鏃堕棿寰�鍓嶄竴鍛�)
- string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- sql = @"h_p_JLKanBan_WorkshopBottomLeft";
- for (int i = 0; i < wkshoplist.Length; i++)
- {
- var dynamicParams = new DynamicParameters();
- dynamicParams.Add("@wkshop_code", wkshoplist[i].ToString());
- var dt = DapperHelper.selectProcedure(sql, dynamicParams);
- dir.Add(wkshoplist[i].ToString(), dt);
- }
-
+ sql = @"h_p_SFKanBan_WorkshopBottomLeft";
+ var data = DapperHelper.lissql(sql);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
- mes.data = dir;
+ mes.data = data;
}
catch (Exception e)
{
@@ -71,17 +199,14 @@
}
#endregion
- #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
- public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
+ #region[鍦ｆ玻杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ public static ToMessage WorkShopProduceBottomRightData()
{
string sql = "";
- var dynamicParams = new DynamicParameters();
try
{
- string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- sql = @"select * from h_v_JLKanBan_WorkshopBottomRight where wkshp_code in @wkshoplist";
- dynamicParams.Add("@wkshoplist", wkshoplist);
- var data = DapperHelper.selectdata(sql, dynamicParams);
+ sql = @"select * from h_v_SFKanBan_WorkshopBottomRight";
+ var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -98,47 +223,19 @@
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
{
var sql = "";
- var dynamicParams = new DynamicParameters();
Dictionary<object, object> dir = new Dictionary<object, object>();
- Dictionary<object, object> dir0 = new Dictionary<object, object>();
- Dictionary<object, object> dir1 = new Dictionary<object, object>();
try
{
- string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- sql = @"select * from h_v_JLKanBan_WorkShopCompreLeftTop";
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreLeftTop";
var data = DapperHelper.selecttable(sql);
- sql = @"select * from h_v_JLKanBan_WorkShopCompreLeftCenter";
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreLeftCenter";
var data1 = DapperHelper.selecttable(sql);
- for (int i = 0; i < wkshoplist.Length; i++)
- {
- var top0 = data.AsEnumerable()
- .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
- .Select(group => new
- {
- wkshp_code = group.Field<string>("wkshp_code"),
- plan_qty = group.Field<decimal>("plan_qty"),
- good_qty = group.Field<decimal>("good_qty")
- }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, good_qty = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
- .ToList();
- dir0.Add(wkshoplist[i].ToString(), top0);
-
- var top1 = data1.AsEnumerable()
- .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
- .Select(group => new
- {
- wkshp_code = group.Field<string>("wkshp_code"),
- plan_qty = group.Field<decimal>("plan_qty"),
- quantity = group.Field<decimal>("quantity")
- }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, quantity = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
- .ToList();
- dir1.Add(wkshoplist[i].ToString(), top1);
- }
- dir.Add("LeftTop", dir0);
- dir.Add("LeftBottom", dir1);
+ dir.Add("LeftTop", data);
+ dir.Add("LeftBottom", data1);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = dir;
@@ -154,16 +251,16 @@
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
public static ToMessage WorkShopCompreRightTop()
{
var sql = "";
Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- sql = @"select * from h_v_JLKanBan_WorkShopCompreRightTop";
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreRightTop";
var data = DapperHelper.selecttable(sql);
- sql = @"select * from h_v_JLKanBan_WorkShopCompreRightCenter";
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreRightCenter";
var data1 = DapperHelper.selecttable(sql);
dir.Add("RightTop", data);
dir.Add("RightBottom", data1);
@@ -182,14 +279,42 @@
}
#endregion
- #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,宸︿笅閲囪喘璁㈠崟]
+ public static ToMessage WorkShopCompreLeftBottom()
+ {
+ var sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreLeftBottom_Top";
+ var data = DapperHelper.selecttable(sql);
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreLeftBottom_Bottom";
+ var data1 = DapperHelper.selecttable(sql);
+ dir.Add("BottomLeftTop", data);
+ dir.Add("BottomLeftBottom", data1);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鍦ｆ玻杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
public static ToMessage WorkShopCompreRightBottom()
{
var sql = "";
Dictionary<object, object> dir = new Dictionary<object, object>();
try
{
- sql = @"select * from h_v_JLKanBan_WorkShopCompreRightBottom";
+ sql = @"select * from h_v_SFKanBan_WorkShopCompreRightBottom";
var data = DapperHelper.selecttable(sql);
dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index 63d1012..9ed8b05 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -29,7 +29,7 @@
try
{
//鑾峰彇璁￠噺鍗曚綅缁勪俊鎭�
- sql = @"select code,name,'1' as isGroup,data_sources from TUnitGroup ";
+ sql = @"select code,name,'1' as isGroup,igrouptype,data_sources from TUnitGroup ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
@@ -47,48 +47,200 @@
}
#endregion
+ #region[璁￠噺鍗曚綅缁勬柊澧�/缂栬緫]
+ public static ToMessage AddUpdateTUnitGroup(string OperType, List<ObjectDataCont> json, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ if (OperType == "Add")
+ {
+ //鍒ゆ柇璁￠噺鍗曚綅缁勭紪鐮佹槸鍚﹂噸澶�
+ sql = @"select * from TUnitGroup where code=@tunitgroupcode";
+ dynamicParams.Add("@tunitgroupcode", json[0].code);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁￠噺鍗曚綅缁勭紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ //鍒ゆ柇璁￠噺鍗曚綅缁勫悕绉版槸鍚﹂噸澶�
+ sql = @"select * from TUnitGroup where name=@tunitgroupname";
+ dynamicParams.Add("@tunitgroupname", json[0].name);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁￠噺鍗曚綅缁勫悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ //寰幆鍐欏叆璁￠噺鍗曚綅缁勮〃
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TUnitGroup(code,name,igrouptype,lm_user,lm_date,data_sources) values(@code,@name,@username,@createdate,@data_sources)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = json[i].code,
+ name = json[i].name,
+ igrouptype = json[i].group,
+ username = us.usercode,
+ createdate = DateTime.Now.ToString(),
+ data_sources = "MES"
+ }
+ });
+ }
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶇粍:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ if (OperType == "Update")
+ {
+ //鍒ゆ柇璁惧鍚嶇О鏄惁閲嶅
+ sql = @"select * from TUnitGroup where code<>@tunitgroupcode and name=@tunitgroupname";
+ dynamicParams.Add("@tunitgroupcode", json[0].code);
+ dynamicParams.Add("@tunitgroupname", json[0].name);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data1.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁￠噺鍗曚綅缁勫悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
+ }
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"update TUnitGroup set name=@tunitgroupname,lm_user=@lm_user,lm_date=@lm_date
+ where code=@tunitgroupcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ tunitgroupcode = json[i].code,
+ tunitgroupname = json[i].name,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶇粍:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁￠噺鍗曚綅缁勫垹闄
+ public static ToMessage DeleteTUnitGroup(string tunitgroupcode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ sql = @"delete TUnitGroup where code=@code";
+ list.Add(new { str = sql, parm = new { code = tunitgroupcode } });
+ sql = @"delete TUnit where idunitgroup=@tunitgroupcode";
+ list.Add(new { str = sql, parm = new { tunitgroupcode = tunitgroupcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚閲忓崟浣嶇粍:" + tunitgroupcode, us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
#region[璁￠噺鍗曚綅淇℃伅鍒楄〃]
- public static ToMessage TUnitData(string tunittype, string tunitgroupcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage TUnitData(string tunitgroupcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
- string sql = "";
+ string search = "", sql = "";
IEnumerable<object> data;
try
{
- if (tunittype == "" || tunittype == null)
+ if (tunitgroupcode != "" && tunitgroupcode != null)
{
- sql = @"select AA.code,AA.name,U.username as lm_user,AA.lm_date,AA.isGroup,AA.idunitgroup,AA.data_sources
- from(
- select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources
- from TUnit T
- where T.isGroup='0'
- union all
- select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources
- from TUnitGroup
- ) as AA
- left join TUser U on AA.lm_user=U.usercode ";
- }
- if (tunittype == "S") //鍗曡閲�
- {
- sql = @"select T.code,T.name,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
- from TUnit T
- left join TUser U on T.lm_user=U.usercode
- where T.isSingleUnit='1' and T.isGroup='0'";
- }
- if (tunittype == "M" && (tunitgroupcode == "" || tunitgroupcode == null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷负绌�
- {
- sql = @"select T.code,T.name,U.usercode as lm_user,T.lm_date,'1' as isGroup,T.code as idunitgroup,T.data_sources
- from TUnitGroup T
- left join TUser U on T.lm_user=U.usercode";
- }
- if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷笉涓虹┖
- {
- sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
- from TUnit T
- left join TUser U on T.lm_user=U.usercode
- where T.isSingleUnit='0' and T.isGroup='1' and T.idunitgroup=@tunitgroupcode";
+ search += "and T.idunitgroup=@tunitgroupcode ";
dynamicParams.Add("@tunitgroupcode", tunitgroupcode);
}
+ sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
+ from TUnit T
+ left join TUser U on T.lm_user=U.usercode
+ where 1=1 " + search;
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -96,7 +248,6 @@
mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
- LogHelper.OperateLog("999", "鏌ヨ", "鏌ヨ浜嗚閲忓崟浣�", "PC");
}
catch (Exception e)
{
@@ -138,7 +289,7 @@
#endregion
#region[璁￠噺鍗曚綅鏂板銆佺紪杈戜繚瀛榏
- public static ToMessage AddUpdateTUnit(string menucode, string data_sources, string tunittype, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
+ public static ToMessage AddUpdateTUnit(string menucode, string data_sources, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
{
string sql = "";
List<object> list = new List<object>();
@@ -153,48 +304,17 @@
{
return mes;
}
- if (tunittype == "S") //鍗曡閲�
+
+ sql = @"select * from TUnit where isGroup='0' and name=@name";
+ dynamicParams.Add("@name", listjson[0].unitname);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
- sql = @"select * from TUnit where isGroup='0' and name=@name";
- dynamicParams.Add("@name", listjson[0].unitname);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
- }
- if (tunittype == "M")//澶氳閲�
- {
- sql = @"select * from TUnitGroup where name=@name";
- dynamicParams.Add("@name", listjson[0].unitname);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
- //鍐欏叆璁￠噺鍗曚綅缁�
- sql = @"insert into TUnitGroup(code,name,lm_user,lm_date,data_sources)
- values(@code,@name,@lm_user,@lm_date,@data_sources)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = ((List<string>)mes.data)[0].ToString(),
- name = listjson[0].unitname,
- data_sources = data_sources,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString()
- }
- });
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
}
for (int i = 0; i < listjson[0].children.Count; i++)
{
@@ -206,7 +326,7 @@
str = sql,
parm = new
{
- code = tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : listjson[0].children[i].unitcode,
+ code = listjson[0].children[i].unitcode,
name = listjson[0].children[i].unitname,
isMainUnit = listjson[0].children[i].isMainUnit,
changeRate = listjson[0].children[i].changeRate,
@@ -227,7 +347,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細"+ tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -243,108 +363,45 @@
}
if (OperType == "Update")
{
- if (tunittype == "S") //鍗曡閲�
+ sql = @"select * from TUnit where isGroup='0' and code<>@code and name=@name";
+ dynamicParams.Add("@code", listjson[0].unitcode);
+ dynamicParams.Add("@name", listjson[0].unitname);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
- sql = @"select * from TUnit where isGroup='0' and code<>@code and name=@name";
- dynamicParams.Add("@code", listjson[0].unitcode);
- dynamicParams.Add("@name", listjson[0].unitname);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
-
- //鏇存柊璁￠噺鍗曚綅(鍗曡閲�)
- sql = @"update TUnit set name=@name,lm_user=@lm_user,lm_date=@lm_date
- where code=@code and isSingleUnit=@isSingleUnit and isGroup=@isGroup";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = listjson[0].children[0].unitcode,
- name = listjson[0].children[0].unitname,
- isSingleUnit = listjson[0].children[0].isSingleUnit,
- isGroup = listjson[0].children[0].isGroup,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString()
- }
- });
-
- }
- if (tunittype == "M")//澶氳閲�
- {
- sql = @"select * from TUnitGroup where code<>@code and name=@name";
- dynamicParams.Add("@code", listjson[0].unitcode);
- dynamicParams.Add("@name", listjson[0].unitname);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
- mes.data = null;
- return mes;
- }
- //淇敼璁￠噺鍗曚綅缁�
- sql = @"update TUnitGroup set name=@name,lm_user=@lm_user,lm_date=@lm_date where code=@code";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = listjson[0].unitcode,
- name = listjson[0].unitname,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString()
- }
- });
- //鍒犻櫎璁￠噺鍗曚綅缁勬槑缁�(浠庤閲忓崟浣嶈〃鍒犻櫎)
- sql = @"delete TUnit where idunitgroup=@idunitgroup";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- idunitgroup = tunitgroupcode
- }
- });
- for (int i = 0; i < listjson[0].children.Count; i++)
- {
- //鍐欏叆璁￠噺鍗曚綅
- sql = @"insert into TUnit(code,name,isMainUnit,changeRate,rateDescription,isSingleUnit,disabled,idunitgroup,isGroup,data_sources,lm_user,lm_date)
- values(@code,@name,@isMainUnit,@changeRate,@rateDescription,@isSingleUnit,@disabled,@idunitgroup,@isGroup,@data_sources,@lm_user,@lm_date)";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = listjson[0].children[i].unitcode,
- name = listjson[0].children[i].unitname,
- isMainUnit = listjson[0].children[i].isMainUnit,
- changeRate = listjson[0].children[i].changeRate,
- rateDescription = listjson[0].children[i].rateDescription,
- isSingleUnit = listjson[0].children[i].isSingleUnit,
- disabled = listjson[0].children[i].disabled,
- idunitgroup = listjson[0].children[i].idunitgroup,
- isGroup = listjson[0].children[i].isGroup,
- data_sources = listjson[0].children[i].data_sources,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString()
- }
- });
- }
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.data = null;
+ return mes;
}
+ //鏇存柊璁￠噺鍗曚綅(鍗曡閲�)
+ sql = @"update TUnit set name=@name,lm_user=@lm_user,lm_date=@lm_date,isMainUnit=@isMainUnit,changeRate=@changeRate,rateDescription=@rateDescription,isSingleUnit=@isSingleUnit,disabled=@disabled,idunitgroup=@idunitgroup,isGroup=@isGroup
+ where code=@code";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ code = listjson[0].children[0].unitcode,
+ name = listjson[0].children[0].unitname,
+ isMainUnit = listjson[0].children[0].isMainUnit,
+ changeRate = listjson[0].children[0].changeRate,
+ rateDescription = listjson[0].children[0].rateDescription,
+ isSingleUnit = listjson[0].children[0].isSingleUnit,
+ disabled = listjson[0].children[0].disabled,
+ idunitgroup = ((List<string>)mes.data)[0].ToString(),
+ isGroup = listjson[0].children[0].isGroup,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -371,110 +428,42 @@
#endregion
#region[璁￠噺鍗曚綅鍒犻櫎]
- public static ToMessage DeleteTUnit(string data_sources, string tunittype, string tunitgroupcode, string tunitcode, User us)
+ public static ToMessage DeleteTUnit(string data_sources, string tunitgroupcode, string tunitcode, User us)
{
string sql = "";
List<object> list = new List<object>();
var dynamicParams = new DynamicParameters();
try
{
- if (tunittype == "S") //鍗曡閲�
+
+ sql = @"select * from TMateriel_Info where isSingleUnit='1' and idunit=@idunit";
+ dynamicParams.Add("@idunit", tunitcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
- sql = @"select * from TMateriel_Info where isSingleUnit='1' and idunit=@idunit";
- dynamicParams.Add("@idunit", tunitcode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
- mes.data = null;
- return mes;
- }
- //鍒犻櫎璁￠噺鍗曚綅
- sql = @"delete TUnit where isSingleUnit='1' and isGroup='0' and code=@code and data_sources=@data_sources";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = tunitcode,
- data_sources = data_sources
- }
- });
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
}
- if (tunittype == "M" && (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷笉涓虹┖,鏄庣粏缂栫爜涓虹┖
+ //鍒犻櫎璁￠噺鍗曚綅
+ sql = @"delete TUnit where idunitgroup=@idunitgroup and code=@code and data_sources=@data_sources";
+ list.Add(new
{
- sql = @"select * from TUnit T
- inner join TMateriel_Info M on T.idunitgroup=M.idunitgroup and T.code=M.idunit
- where T.isSingleUnit='0' and T.idunitgroup=@idunitgroup";
- dynamicParams.Add("@idunitgroup", tunitgroupcode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
+ str = sql,
+ parm = new
{
- mes.code = "300";
- mes.count = 0;
- mes.message = "澶氳閲忓崟浣嶇粍涓湁璁￠噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
- mes.data = null;
- return mes;
+ idunitgroup= tunitgroupcode,
+ code = tunitcode,
+ data_sources = data_sources
}
- //鍒犻櫎澶氳閲忓崟浣嶇粍
- sql = @"delete TUnitGroup where code=@code and data_sources=@data_sources";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- code = tunitgroupcode,
- data_sources = data_sources
- }
- });
- //鍒犻櫎澶氳閲忓崟浣嶇粍涓嬫墍鏈夎閲忓崟浣�
- sql = @"delete TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@idunitgroup and data_sources=@data_sources";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- idunitgroup = tunitgroupcode,
- data_sources = data_sources
- }
- });
- }
- if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null) && (tunitcode != "" || tunitcode != null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷笉涓虹┖,鏄庣粏缂栫爜涓嶄负绌�
- {
- sql = @"select * from TUnit T
- inner join TMateriel_Info M on T.idunitgroup=M.idunitgroup and T.code=M.idunit
- where T.isSingleUnit='0' and M.isSingleUnit='0' and T.idunitgroup=@idunitgroup and T.code=@idunit";
- dynamicParams.Add("@idunitgroup", tunitgroupcode);
- dynamicParams.Add("@idunit", tunitcode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "300";
- mes.count = 0;
- mes.message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
- mes.data = null;
- return mes;
- }
- //鍒犻櫎澶氳閲忓崟浣嶇粍涓嬫寚瀹氳閲忓崟浣�
- sql = @"delete TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@idunitgroup and code=@code and data_sources=@data_sources";
- list.Add(new
- {
- str = sql,
- parm = new
- {
- idunitgroup = tunitgroupcode,
- code = tunitcode,
- data_sources = data_sources
- }
- });
- }
+ });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + tunittype == "S" ? tunitcode : tunittype == "M"&& (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)? tunitgroupcode: tunitgroupcode+"-->"+tunitcode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚閲忓崟浣嶏細"+tunitcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
@@ -593,7 +582,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:" + inventoryclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -641,7 +630,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:" + inventoryclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -702,7 +691,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�"+classcode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�" + classcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
@@ -850,25 +839,25 @@
str = sql,
parm = new
{
- partcode=partcode,
- partname=partname,
- partspec=partspec,
- idunit=unittypcode=="1"?unitcode:unitsubcode,
- idunitgroup = unittypcode == "0"?"1":"0",
- isSingleUnit= unittypcode,
- idSubUnitByReport=idSubUnitByReport,
- idUnitByStock= idUnitByStock,
- idUnitByPurchase= idUnitByPurchase,
- idUnitBySale= idUnitBySale,
- idunitbymanufacture= idunitbymanufacture,
- idinventoryclass= inventoryclasscode,
- isPurchase= isPurchase,
- isSale= isSale,
- isMadeSelf= isMadeSelf,
- isMaterial= isMaterial,
- isMadeRequest= isMadeRequest,
- idwarehouse= idwarehouse,
- status= status,
+ partcode = partcode,
+ partname = partname,
+ partspec = partspec,
+ idunit = unittypcode == "1" ? unitcode : unitsubcode,
+ idunitgroup = unittypcode == "0" ? "1" : "0",
+ isSingleUnit = unittypcode,
+ idSubUnitByReport = idSubUnitByReport,
+ idUnitByStock = idUnitByStock,
+ idUnitByPurchase = idUnitByPurchase,
+ idUnitBySale = idUnitBySale,
+ idunitbymanufacture = idunitbymanufacture,
+ idinventoryclass = inventoryclasscode,
+ isPurchase = isPurchase,
+ isSale = isSale,
+ isMadeSelf = isMadeSelf,
+ isMaterial = isMaterial,
+ isMadeRequest = isMadeRequest,
+ idwarehouse = idwarehouse,
+ status = status,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
data_sources = data_sources
@@ -878,7 +867,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -956,7 +945,7 @@
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -1022,14 +1011,14 @@
parm = new
{
partcode = partcode,
- data_sources= data_sources
+ data_sources = data_sources
}
});
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
//鍐欏叆鎿嶄綔璁板綍琛�
- LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:"+partcode, us.usertype);
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
diff --git a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
index 662e98d..1441305 100644
--- a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
@@ -1009,6 +1009,8 @@
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, ""+ checktypename + "妫�楠�", "宸ュ崟:"+ wocode + "瀵瑰簲宸ュ簭:" + stepcode+"", us.usertype);
mes.code = "200";
mes.count = 0;
mes.message = "鎿嶄綔鎴愬姛!";
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index a9f68a3..3ddae5d 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -71,7 +71,7 @@
{
c.SwaggerDoc(version, new OpenApiInfo()
{
- Title = $"新凯迪MesApi文档:{version}",
+ Title = $"新凯迪-圣沣客户MesApi文档:{version}",
Version = version,
Description = $"Panda.Sewerage : {version} ",
});
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index 3c618ce..d999163 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -17,10 +17,10 @@
new ScoreReport("2","鐝粍绠＄悊"),
new ScoreReport("3","浜哄憳绠＄悊"),
new ScoreReport("4","瑙掕壊绠＄悊"),
- new ScoreReport("5","寰�鏉ュ崟浣�"),
+ //new ScoreReport("5","寰�鏉ュ崟浣�"),
new ScoreReport("6","浠撳簱璁剧疆"),
new ScoreReport("7","搴撲綅璁剧疆"),
- new ScoreReport("8","瀛樿揣妗ｆ"),
+ //new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
//new ScoreReport("10","璁惧鐐规椤圭洰"),
//new ScoreReport("10_1","璁惧鐐规鏍囧噯"),
@@ -36,9 +36,9 @@
//new ScoreReport("24","鑺傛媿宸ヤ环"),
new ScoreReport("17","璐ㄦ鏍囧噯"),
new ScoreReport("18","缂洪櫡瀹氫箟"),
- new ScoreReport("19","鐢熶骇璁㈠崟"),
- new ScoreReport("20","搴撳瓨鏌ヨ"),
- new ScoreReport("21","鐗╂枡娓呭崟"),
+ //new ScoreReport("19","鐢熶骇璁㈠崟"),
+ //new ScoreReport("20","搴撳瓨鏌ヨ"),
+ //new ScoreReport("21","鐗╂枡娓呭崟"),
};
return list;
}
diff --git a/VueWebCoreApi/appsettings.json b/VueWebCoreApi/appsettings.json
index 9b7ac9f..f61e1d5 100644
--- a/VueWebCoreApi/appsettings.json
+++ b/VueWebCoreApi/appsettings.json
@@ -9,7 +9,8 @@
"AllowedHosts": "*",
//鏈嶅姟鍣ㄧ幆澧�
"ConnectionStrings": {
- "DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=vmes_JL;User ID=sa;Password=xkd@20230101;pooling=false",
+ //"DBServer": "Data Source=121.196.36.24,1533;Initial Catalog=vmes_JL;User ID=sa;Password=xkd@20230101;pooling=false",
+ "DBServer": "Data Source=192.168.1.237,1433;Initial Catalog=vmes;User ID=sa;Password=123;pooling=false",
//浼佷笟缂栫爜
"CompanyCode": "000",
//浼佷笟鍚嶇О
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png
index 795daa7..bed0e22 100644
--- a/VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_1.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png
index cee7be0..795daa7 100644
--- a/VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_2.png
Binary files differ
diff --git a/VueWebCoreApi/wwwroot/AppMenuImage/app_8_3.png b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_3.png
new file mode 100644
index 0000000..b0e1b4c
--- /dev/null
+++ b/VueWebCoreApi/wwwroot/AppMenuImage/app_8_3.png
Binary files differ
--
Gitblit v1.9.3