From f7661ec17f87c4185bbe906fe98e114435a4da5a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 19 十月 2023 12:21:25 +0800
Subject: [PATCH] 1.更改菜单接口排序问题，模具待维修接口过滤问题、增加APP菜单图标 2.更改模具维修申请单、维修单据流水号反写问题 3.增加模具查询功能接口
---
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index 5583839..b739f20 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -57,24 +57,36 @@
{
if (tunittype == "" || tunittype == null)
{
- sql = @"select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources
- from TUnit T where T.isGroup='0'
- union all
- select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources
- from TUnitGroup ";
+ sql = @"select AA.code,AA.name,U.username as lm_user,AA.lm_date,AA.isGroup,AA.idunitgroup,AA.data_sources
+ from(
+ select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources
+ from TUnit T
+ where T.isGroup='0'
+ union all
+ select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources
+ from TUnitGroup
+ ) as AA
+ left join TUser U on AA.lm_user=U.usercode ";
}
if (tunittype == "S") //鍗曡閲�
{
- sql = @"select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources from TUnit where isSingleUnit='1' and isGroup='0'";
+ sql = @"select T.code,T.name,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
+ from TUnit T
+ left join TUser U on T.lm_user=U.usercode
+ where T.isSingleUnit='1' and T.isGroup='0'";
}
if (tunittype == "M" && (tunitgroupcode == "" || tunitgroupcode == null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷负绌�
{
- sql = @"select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources from TUnitGroup";
+ sql = @"select T.code,T.name,U.usercode as lm_user,T.lm_date,'1' as isGroup,T.code as idunitgroup,T.data_sources
+ from TUnitGroup T
+ left join TUser U on T.lm_user=U.usercode";
}
if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null)) //澶氳閲�,涓斿璁￠噺缁勭紪鐮佷笉涓虹┖
{
- sql = @"select code,name,isMainUnit,changeRate,rateDescription,lm_user,lm_date,isGroup,idunitgroup,data_sources
- from TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@tunitgroupcode";
+ sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources
+ from TUnit T
+ left join TUser U on T.lm_user=U.usercode
+ where T.isSingleUnit='0' and T.isGroup='1' and T.idunitgroup=@tunitgroupcode";
dynamicParams.Add("@tunitgroupcode", tunitgroupcode);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -750,7 +762,7 @@
M.idUnitByPurchase as idUnitByPurchasecode,P.name as idUnitByPurchasename,M.idUnitBySale as idUnitBySalecode,S.name as idUnitBySalename,
M.idunitbymanufacture as idunitbymanufacturecode,F.name as idunitbymanufacturename,M.idinventoryclass as idinventoryclasscode,C.name as idinventoryclassname,
M.isPurchase,M.isSale,M.isMadeSelf,M.isMaterial,M.isMadeRequest,M.idwarehouse as idwarehousecode,H.name as idwarehousename,M.lowQuantity,M.topQuantity,M.safeQuantity,
- M.status,M.lm_user,M.lm_date,M.data_sources
+ M.status,U.username as lm_user,M.lm_date,M.data_sources
from TMateriel_Info M
left join TUnit T on M.idunit=T.code
left join TUnit R on M.idSubUnitByReport=R.code
@@ -761,6 +773,7 @@
left join TMateriel_Class C on M.idinventoryclass=C.code
left join TUnitGroup G on M.idunitgroup=G.code
left join TSecStck H on M.idwarehouse=H.code
+ left join TUser U on M.lm_user=U.usercode
where 1=1 " + search;
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -1040,5 +1053,36 @@
return mes;
}
#endregion
+
+
+ #region[宸ュ崟浜у搧淇℃伅涓嬫媺妗嗘煡璇
+ public static ToMessage PartSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇鐗╂枡鏁版嵁
+ sql = @"select M.partcode,M.partname,M.partspec,M.idunit as uom_code,T.name as uom_name,
+ M.idunitgroup as stocktype_code,D.name as stocktype_name,
+ M.idwarehouse as stck_code,S.name as stck_name
+ from TMateriel_Info M
+ left join TUnit T on M.idunit=T.code
+ left join TUnitGroup D on M.idunitgroup=D.code
+ left join TSecStck S on M.idwarehouse=S.code ";
+ 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
}
}
--
Gitblit v1.9.3