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 | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 2c934bc..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);
--
Gitblit v1.9.3