From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 2bd8568..45686f7 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -1208,7 +1208,8 @@
FROM TUser U
inner join cte on U.storg_code=cte.torg_code
left join TOrganization T on U.storg_code=T.torg_code
- left join TUser S on U.lm_user=S.usercode " + search + "";
+ left join TUser S on U.lm_user=S.usercode
+ where 1=1 " + search + "";
var data = DapperHelper.GetPagedDataWith<object>(withsql, sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
@@ -3039,6 +3040,14 @@
IEnumerable<object> data;
try
{
+ if (flag == "-1" && stckcode == null)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鏆傛棤鏁版嵁!";
+ mes.data = null;
+ return mes;
+ }
string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
switch (flag)
{
@@ -3092,7 +3101,7 @@
#endregion
#region[浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨]
- public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode,string depth, string status, string description, string OperType, User us)
+ public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode, string depth, string status, string description, string OperType, User us)
{
string sql = "";
List<object> list = new List<object>();
@@ -3146,7 +3155,7 @@
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
data_sources = data_sources,
- depth= depth
+ depth = depth
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -3207,7 +3216,7 @@
name = locaname,
idwarehouse = stckcode,
idparent = parentlocacode,
- depth= depth,
+ depth = depth,
status = status,
description = description,
lm_user = us.usercode,
@@ -3321,7 +3330,7 @@
#region[宸ュ簭鏌ヨ]
- public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode,int startNum, int endNum, string prop, string order)
+ 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 = "";
@@ -3442,7 +3451,7 @@
}
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() } });
+ 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)
{
--
Gitblit v1.9.3