优化材料和焊接数据页面显示及筛选功能

2022-09-19 09:35:49 +08:00
parent 456be52603
commit 951c54533d
36 changed files with 1728 additions and 90 deletions
@@ -100,7 +100,8 @@ namespace FineUIPro.Web.HJGL.FL
        {
            string strSql = @"select TotalQuantityId,ProjectId,DeviceName,DeviceCode,Unit,(case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 else cast(c.TotalWeldQuantity as DECIMAL(9,2)) end) as TotalWeldQuantity,
                           (case when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else cast(c.TotalCompleted as DECIMAL(9,2)) end) as TotalCompleted,
-                           cast((case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else 100.0 * cast(c.TotalCompleted as DECIMAL(9,2))/(1.0 * cast(c.TotalWeldQuantity as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate
+                           cast((case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else 100.0 * cast(c.TotalCompleted as DECIMAL(9,2))/(1.0 * cast(c.TotalWeldQuantity as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate,
+                           (select top 1 DeviceNumber from HJGL_FL_Quantity q where q.ProjectId=@ProjectId and q.ZoneNumber=c.DeviceCode) as DeviceNo
                            from dbo.HJGL_FL_TotalQuantity c 
                            where c.ProjectId=@ProjectId order by c.DeviceName,DeviceCode ";
            List<SqlParameter> listStr = new List<SqlParameter>();