From fbba6d6e8ccf4b052735bd51fd04ff7cb5c16b78 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:32:30 +0800
Subject: [PATCH] 设备类型接口修改、导入问题修改、缺陷定义接口开发
---
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index 5583839..dc618e5 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; //鎬绘潯鏁�
--
Gitblit v1.9.3