2023-11-11

SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs

@@ -1,5 +1,4 @@
 using BLL;
-using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -26,7 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
-                this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
+                this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -45,14 +44,14 @@ namespace FineUIPro.Web.DataShow
                     LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId 
                     LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
                     LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
-                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId   where (P.ProjectState2 is null or P.ProjectState2 !=9)
+                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId 
                     UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
                     ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType
                     FROM InApproveManager_GeneralEquipmentInItem AS Item 
                     LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId 
                     LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
                     LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
-                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId  where (P.ProjectState2 is null or P.ProjectState2 !=9)) V
+                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V
                     WHERE 1=1 ";
 
             strSql += " AND  V.IsUsed = @IsUsed";