From 719e8f81782c6b04a99ac29b5a8e20991f3b0b28 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 20 十二月 2023 17:26:11 +0800
Subject: [PATCH] 1.修改设备点检、保养标准导入时判断提示 2.修改模具点检、保养标准导入时判断提示
---
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 236 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 194 insertions(+), 42 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index c30445c..004b993 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -5,6 +5,7 @@
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
+using VueWebCoreApi.Models;
using VueWebCoreApi.Models.UnitMaterial;
using VueWebCoreApi.Tools;
@@ -33,14 +34,39 @@
sql = @"select * from TOrganization where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)]
+ public static ToMessage PrentOrganizationNoCompany()
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ sql = @"select * from TOrganization where status='Y' and parent_id<>'0' or leve<>'0'";
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ 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;
@@ -58,14 +84,14 @@
sql = @"select postcode,postname from TPost where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -83,14 +109,14 @@
sql = @"select rolecode,rolename from TRole where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -108,14 +134,14 @@
sql = @"select usergroupcode,usergroupname from TGroup where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -133,14 +159,14 @@
sql = @"select usercode,username from TUser where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -161,14 +187,14 @@
dynamicParams.Add("@groupcode", "%," + groupcode + ",%");
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -186,14 +212,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳寜閽。妗堟暟鎹�!";
+ mes.message = "鏃犳寜閽。妗堟暟鎹�!";
mes.data = null;
}
}
@@ -201,7 +227,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -219,14 +245,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳暟鎹潈闄愭。妗堟暟鎹�!";
+ mes.message = "鏃犳暟鎹潈闄愭。妗堟暟鎹�!";
mes.data = null;
}
}
@@ -234,7 +260,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -256,7 +282,7 @@
from TUnit where isSingleUnit='1' and isGroup='0' and disabled='0'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
if (tunittype == "M")
@@ -273,7 +299,7 @@
data[i].children = data0;
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
}
@@ -281,7 +307,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -299,14 +325,14 @@
sql = @"select code,name from TEqpType";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -324,14 +350,14 @@
sql = @"select code,name from TEqpInfo where enable='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -349,14 +375,84 @@
sql = @"select code,name from TSecStck";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[浠撳簱搴撲綅鍩虹璧勬枡]
+ public static ToMessage WareHouseLocation()
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<WareHouseLocation> list = new List<WareHouseLocation>();
+ try
+ {
+ //鑾峰彇浠撳簱鏁版嵁
+ sql = @"select code,name from TSecStck where status='0'";
+ var data = DapperHelper.selecttable(sql);
+ for (int i = 0; i < data.Rows.Count; i++)
+ {
+ WareHouseLocation warhouse = new WareHouseLocation();
+ warhouse.value = data.Rows[i]["code"].ToString();
+ warhouse.text = data.Rows[i]["name"].ToString();
+ warhouse.children = new List<LocationData>();
+ //鑾峰彇搴撲綅
+ sql = @"select code,name from TSecLoca where status='0' and idwarehouse=@idwarehouse";
+ dynamicParams.Add("@idwarehouse", data.Rows[i]["code"].ToString());
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int j = 0; j < data0.Rows.Count; j++)
+ {
+ LocationData locat = new LocationData();
+ locat.value = data0.Rows[j]["code"].ToString();
+ locat.text = data0.Rows[j]["name"].ToString();
+ warhouse.children.Add(locat);
+ }
+ list.Add(warhouse);
+ }
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = list;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[浠撳簱鏌ユ壘浠撲綅淇℃伅]
+ public static ToMessage WareHouseSelectLocation(string warhousecode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select code,name,depth from TSecLoca where status='0' and idwarehouse=@idwarehouse";
+ dynamicParams.Add("@idwarehouse", warhousecode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ 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;
@@ -374,14 +470,14 @@
sql = @"select stepcode,stepname from TStep where enable='Y'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -399,14 +495,14 @@
sql = @"select code,name from TDefect";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -423,14 +519,14 @@
sql = @"select code,name from TCustomer where status='0'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -444,23 +540,79 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select AA.code,AA.name,isnull(AA.parentid,-1) as parentid from(
- select code,name,idparent as parentid from TMateriel_Class
- union all
- select partcode as code,partname as name,idinventoryclass as parentid
- from TMateriel_Info
- where status='0'
- ) as AA";
+ sql = @"WITH RecursiveCTE AS (
+ SELECT code, name, idparent
+ FROM TMateriel_Class
+ WHERE code in(select distinct idinventoryclass from TMateriel_Info where status='0')
+ UNION ALL
+ SELECT c.code, c.name, c.idparent
+ FROM TMateriel_Class c
+ INNER JOIN RecursiveCTE r ON c.code = r.idparent
+ )
+ SELECT distinct code, name, idparent as parentid
+ FROM RecursiveCTE CTE
+ union all
+ select partcode as code,partname as name,idinventoryclass as parentid
+ from TMateriel_Info
+ where status='0'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿妫�楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage MouldCheckItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇妯″叿鐐规椤圭洰鏁版嵁
+ sql = @"select code,name,description from TMouldchk_Item";
+ 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 MouldRepairItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇妯″叿淇濆吇椤圭洰鏁版嵁
+ sql = @"select code,name,description from TMouldmai_Item";
+ 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;
--
Gitblit v1.9.3