From 7b6a3fab34e4867f011246248ae66b4d75a6eb72 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 01 六月 2023 20:49:58 +0800
Subject: [PATCH] 1.生产开包工末道工序传入入库条码 2.App工序检验提交接口修改 3.基本资料增加ERP接口：车间部门、仓库查询、用户信息 4.PC端报工、收料、工序检验提交接口增加入库条码字段 5.系统设置新增：条码规则生成(固定条码)接口 6.DapperHelper增加方法 7.增加App图标图片
---
VueWebApi/DLL/DAL/LoginDAL.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index 8314643..54e94cc 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -105,12 +105,13 @@
}).ToList();
for (int i = 0; i < data.Count; i++)
{
- sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
+ sql = @"select * from(
+ select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
from TRight mu
inner join TRoleRightRelation rl on mu.right_code=rl.right_code
inner join TUserRoleRelation ro on rl.role_code=ro.role_code
where mu.type=@usertype and ro.user_code=@usercode and mu.parent_id=@paent_id
- order by mu.right_seq, mu.right_code";
+ ) as AA order by CAST(AA.right_seq AS DECIMAL) ASC,AA.code";
dynamicParams.Add("@usercode", usercode);
dynamicParams.Add("@usertype", usertype);
dynamicParams.Add("@paent_id", data[i].code);
--
Gitblit v1.9.3