设备类型接口修改、导入问题修改、缺陷定义接口开发

yl

2023-09-19 fbba6d6e8ccf4b052735bd51fd04ff7cb5c16b78

 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; //总条数