From 9445c4660740dc8a544b5c2440fe365a218bab12 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 26 十月 2023 17:26:39 +0800
Subject: [PATCH] 1.修改仓位信息列表接口 2.新增仓库库位基础资料接口 3.修改模具出入库提交接口(增加库位) 、模具清单增加库位 4.新增模具上下机记录报表、模具借还记录报表
---
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 253 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 242 insertions(+), 11 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 32b019b..4b0931d 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -3011,10 +3011,10 @@
try
{
//鑾峰彇寮�鍚粨浣嶇鎺х殑浠撳簱淇℃伅
- sql = @"select S.code,S.name,'-1' as idparent from TSecStck S where S.ishasPosition='1'
- union all
- select L.code,L.name,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent
- from TSecLoca L ";
+ sql = @"select S.code,S.name,'-1' as idparent,S.code as warhouse from TSecStck S where S.ishasPosition='1'
+ union all
+ select L.code,L.name,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent,L.idwarehouse as warhouse
+ from TSecLoca L ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -3032,18 +3032,32 @@
#endregion
#region[浠撲綅淇℃伅鍒楄〃]
- public static ToMessage TSecLocaData(string stckcode, string locacode, string locaname, int startNum, int endNum, string prop, string order)
+ public static ToMessage TSecLocaData(string flag, string stckcode, string locacode, string locaname, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "", sql = "";
IEnumerable<object> data;
try
{
- if (stckcode != "" && stckcode != null)
+ if (flag == "Y")
{
- string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and C.idparent in @classcode ";
- dynamicParams.Add("@classcode", classcode);
+ if (stckcode != "" && stckcode != null)
+ {
+ string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ search += "and C.idparent in @classcode ";
+ dynamicParams.Add("@classcode", classcode);
+ }
+
+ }
+ if (flag == "N")
+ {
+ if (stckcode != "" && stckcode != null)
+ {
+ string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ search += "and C.idparent in @classcode and C.endpnt=@endpnt";
+ dynamicParams.Add("@classcode", classcode);
+ dynamicParams.Add("@endpnt", classcode);
+ }
}
if (locacode != "" && locacode != null)
{
@@ -3055,10 +3069,10 @@
search += "and C.name like '%'+@locaname+'%' ";
dynamicParams.Add("@locaname", locaname);
}
- sql = @"select C.code,C.name,C.status,C.description,C.idwarehouse as stckcode,T.name as stckname,C.idparent as parentcode,L.name as parentname,
+ sql = @"select C.code,C.name,C.status,C.description,C.idwarehouse as stckcode,T.name as stckname,C.idparent as parentcode,L.name as parentname,C.endpnt,
C.lm_user as usercode,U.username,C.lm_date,C.data_sources
from (
- select L.code,L.name,L.idwarehouse,L.status,L.description,L.lm_user,L.lm_date,L.data_sources,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent
+ select L.code,L.name,L.idwarehouse,L.status,L.description,L.lm_user,L.lm_date,L.data_sources,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent,L.idparent as endpnt
from TSecLoca L
) as C
left join TSecStck T on C.idwarehouse=T.code
@@ -3157,6 +3171,15 @@
}
if (OperType == "Update")
{
+ //鍒ゆ柇涓婄骇璐т綅缂栫爜鏄惁绛変簬璐т綅缂栫爜
+ if (locacode == parentlocacode)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "涓婄骇璐т綅涓嶈兘鏄簱浣嶆湰韬紒";
+ mes.data = null;
+ return mes;
+ }
//鍒ゆ柇寰�鏉ュ崟浣嶅悕绉版槸鍚﹂噸澶�
sql = @"select * from TSecLoca where code<>@code and name=@name";
dynamicParams.Add("@code", locacode);
@@ -3292,5 +3315,213 @@
return mes;
}
#endregion
+
+
+ #region[宸ュ簭鏌ヨ]
+ public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode,int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (stepcode != "" && stepcode != null)
+ {
+ search += "and A.stepcode like '%'+@stepcode+'%' ";
+ dynamicParams.Add("@stepcode", stepcode);
+ }
+ if (stepname != "" && stepname != null)
+ {
+ search += "and A.stepname like '%'+@stepname+'%' ";
+ dynamicParams.Add("@stepname", stepname);
+ }
+ if (enable != "" && enable != null)
+ {
+ search += "and A.enable=@enable ";
+ dynamicParams.Add("@enable", enable);
+ }
+ if (steptypecode != "" && steptypecode != null)
+ {
+ search += "and A.flwtype=@steptypecode ";
+ dynamicParams.Add("@steptypecode", steptypecode);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.id,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date
+ from TStep A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭鏂板缂栬緫]
+ public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, User us, string operType)
+ {
+ var dynamicParams = new DynamicParameters();
+ List<object> list = new List<object>();
+ var sql = "";
+ try
+ {
+ if (operType == "Add")
+ {
+ sql = @"select * from TStep where stepcode=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ 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 TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date)
+ values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
+ dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@stepname", stepname);
+ dynamicParams.Add("@steptypecode", steptypecode);
+ dynamicParams.Add("@enable", enable);
+ dynamicParams.Add("@description", description);
+ dynamicParams.Add("@username", us.usercode);
+ dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
+ int cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗伐搴�:" + stepcode, 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")
+ {
+ list.Clear();
+ //濡傛灉褰撳墠宸ュ簭浣跨敤鐘舵�佷綅N(鏈惎鐢�),闇�鍒ゆ柇褰撳墠宸ュ簭鏄惁琚伐鍗曞紩鐢�
+ if (enable == "N")
+ {
+ var sql0 = @"select * from TK_Wrk_Step A where A.step_code=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ュ簭鏈夊叧鑱斿伐鍗�,涓嶅厑璁镐慨鏀�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+ lm_user=@username,lm_date=@CreateDate where id=@stepid";
+ list.Add(new { str = sql, parm = new {stepid = stepid, stepname = stepname, steptypecode = steptypecode, enable = enable, description = description, username = us.usercode, CreateDate = DateTime.Now.ToString() } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗伐搴�:" + stepcode, 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 DeleteStep(string stepcode, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //褰撳墠宸ュ簭鏄惁鍏宠仈宸ュ崟
+ sql = @"select * from TK_Wrk_Step A where A.step_code=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ 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 TStep where stepcode=@stepcode";
+ list.Add(new { str = sql, parm = new { stepcode = stepcode } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗伐搴�:" + stepcode, 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
+
}
}
--
Gitblit v1.9.3