0914-修改材料接口、焊接管理及三四级看板

2022-09-14 16:38:27 +08:00
parent c3cbd62265
commit 456be52603
88 changed files with 11052 additions and 444 deletions
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
            }
        }

+        /// <summary>
+        /// 内网进入软件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUrlN_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
+        }
+
+        /// <summary>
+        /// 外网进入软件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUrlW_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
+        }
+
        /// <summary>
        /// 获取
        /// </summary>
@@ -78,7 +98,9 @@ namespace FineUIPro.Web.HJGL.FL
        /// </summary>
        private void BindGrid()
        {
-            string strSql = @"select *
+            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
                            from dbo.HJGL_FL_TotalQuantity c 
                            where c.ProjectId=@ProjectId order by c.DeviceName,DeviceCode ";
            List<SqlParameter> listStr = new List<SqlParameter>();