Browse Source

官塘看板调整

李士越 1 year ago
parent
commit
f832b11548

+ 8 - 8
wwwroot/main/Procedure/test11/SmallKanban.html

@@ -121,11 +121,11 @@
                 </tr>
                 <tr style="height: 32px; width: 1866px; ">
                     <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 20px; color: #f8f9fa; text-align: left ">条    码</td>
-                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">责任工号</td>
+                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">责任工号</td>
                     <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">缺陷名称</td>
-                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">产品型号</td>
-                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">二检工号</td>
-                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">产品分级</td>
+                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 25px; color: #f8f9fa; text-align: left ">产品型号</td>
+                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">二检工号</td>
+                    <td colspan="1" scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">产品分级</td>
                 </tr>
             </table>
             <div  style="width: 100%; margin-top: -17px; height: 207px">
@@ -133,11 +133,11 @@
                     <thead style="border: 1px solid #38dcff ">
                         <tr style="height: 36px; width: 1866px; ">
                             <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 15px; color: #f8f9fa; text-align: left ">{tm}</td>
-                            <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">{zrgh}</td>
+                            <td scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">{zrgh}</td>
                             <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 18px; color: #f8f9fa; text-align: left ">{qxmc}</td>
-                            <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">{cpxh}</td>
-                            <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">{ejgh}</td>
-                            <td scope="col" class="text-center" id="wd" style="width: 100px; font-size: 25px; color: #f8f9fa; text-align: left ">{cpfj}</td>
+                            <td scope="col" class="text-center" id="wd" style="width: 130px; font-size: 25px; color: #f8f9fa; text-align: left ">{cpxh}</td>
+                            <td scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">{ejgh}</td>
+                            <td scope="col" class="text-center" id="wd" style="width: 90px; font-size: 25px; color: #f8f9fa; text-align: left ">{cpfj}</td>
                         </tr>
                     </thead>
                 </table>

+ 6 - 0
wwwroot/main/Procedure/test9/DenKiln.ashx

@@ -195,6 +195,11 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 											AND GDT.ISLEAFNODE = 1
 											AND PD.KILNID = 3 --TK1
 											AND PD.ISREFIRE = 0 --本烧
+
+--新加的
+AND (PD.GOODSLEVELID IN(12,13) OR PD.GOODSLEVELTYPEID IN (6,7)) --筛选出 重烧 次品 数据
+
+
 										)  
 										WHERE  row_flg='1'
 										GROUP BY
@@ -334,6 +339,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 											AND GDT.ISLEAFNODE = 1
 											AND PD.KILNID = 3 --TK1
 											AND PD.ISREFIRE = 0 --本烧
+AND (PD.GOODSLEVELID IN(12,13) OR PD.GOODSLEVELTYPEID IN (6,7)) --筛选出 重烧 次品 数据
 										)  
 										WHERE  row_flg='1'
 										GROUP BY

+ 22 - 9
wwwroot/main/Procedure/testHighPressure/HighPressureKanban.ashx

@@ -23,7 +23,7 @@ public class SmallKanban : IHttpHandler
     {
         using (IDataAccess conn = DataAccess.Create())
         {
-                  //服务器时间
+            //服务器时间
             if (context.Request["m"].ToString() == "fwq")
             {
                 string time = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm ");
@@ -37,13 +37,18 @@ public class SmallKanban : IHttpHandler
             if (context.Request["m"].ToString() == "ReadAll")
             {
                 string time = DateTime.Now.ToString("yyyy-MM-dd");
-                //string time =  "2024-06-11";
-                //查询注浆 (外加 当天损坯数)
-                DataTable dt = conn.ExecuteDatatable(@"SELECT GOODSCODE,USERCODE,GROUTINGFLAG,SCRAPFLAG 
-                FROM TP_PM_GROUTINGDAILYDETAIL  WHERE GOODSCODE IN( 'H01412M-G','H0972M-G') AND USERCODE IN('C25','C89' ) 
-	            AND ( GROUTINGDATE >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND GROUTINGFLAG = '1' ) OR (  SCRAPTIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND SCRAPFLAG='1')");
+                //查询注浆  
+                DataTable dt = conn.ExecuteDatatable(@"SELECT B.GOODSCODE, B.USERCODE, B.GROUTINGFLAG, B.SCRAPFLAG  FROM
+                                                    TP_PM_GROUTINGCHECK A  LEFT JOIN TP_PM_GROUTINGDAILYDETAIL B  ON A. GROUTINGDAILYDETAILID =B.GROUTINGDAILYDETAILID
+                                                       WHERE B.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' )  AND B.USERCODE IN ( 'C25', 'C89' )  AND ( B.GROUTINGDATE >= TO_DATE( '" + time + "', 'YYYY-MM-DD' )" +
+                                                       " AND B.GROUTINGFLAG = '1' AND A.CREATETIME  >= TO_DATE( '" + time + "', 'YYYY-MM-DD' )  ) ");
+                //   //查询注浆 (外加 当天损坯数)
+                //   DataTable dt = conn.ExecuteDatatable(@"SELECT GOODSCODE,USERCODE,GROUTINGFLAG,SCRAPFLAG 
+                //   FROM TP_PM_GROUTINGDAILYDETAIL  WHERE GOODSCODE IN( 'H01412M-G','H0972M-G') AND USERCODE IN('C25','C89' ) 
+                //AND ( GROUTINGDATE >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND GROUTINGFLAG = '1' ) OR (  SCRAPTIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND SCRAPFLAG='1')");
+
                 //查询一检返修与交坯 
-                DataTable bt = conn.ExecuteDatatable(@"SELECT A.GOODSCODE,A.GROUTINGUSERCODE,COUNT(DISTINCT A.BARCODE) AS 交坯数,COUNT(DISTINCT CASE WHEN B.PROCEDUREID = 56 THEN B.BARCODE ELSE NULL END) AS 返修数
+                DataTable bt = conn.ExecuteDatatable(@"SELECT A.GOODSCODE,A.GROUTINGUSERCODE,COUNT(DISTINCT A.BARCODE) AS 交坯数,COUNT(DISTINCT CASE WHEN B.PROCEDUREID = 56 and B.CREATEUSERID IN (227,427)  THEN B.BARCODE ELSE NULL END) AS 返修数
 	            FROM ( SELECT DISTINCT PROCEDUREID, GOODSCODE, GROUTINGUSERCODE,BARCODE 
                     FROM TP_PM_PRODUCTIONDATA  WHERE PROCEDUREID = 31  AND GOODSCODE IN ( 'H01412M-G', 'H0972M-G' ) AND GROUTINGUSERCODE IN ( 'C89', 'C25' ) AND VALUEFLAG = '1' AND CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD')) A " +
                 "LEFT JOIN TP_PM_PRODUCTIONDATA B ON A.BARCODE = B.BARCODE WHERE B.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND B.VALUEFLAG = '1'  " +
@@ -59,6 +64,11 @@ public class SmallKanban : IHttpHandler
 	            AND A.PROCEDUREID = 10 WHERE A.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' ) AND A.GROUTINGUSERCODE IN ( 'C25', 'C89' ) AND B.PROCEDUREID = 9 
                 AND A.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND B.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') " +
                 "AND A.VALUEFLAG = 1 GROUP BY B.GOODSCODE,B.GROUTINGUSERCODE,B.PROCEDUREID");
+                //查询注浆当天损坯数
+                DataTable ldt = conn.ExecuteDatatable(@"SELECT GOODSCODE,USERCODE,GROUTINGFLAG,SCRAPFLAG 
+                   FROM TP_PM_GROUTINGDAILYDETAIL  WHERE GOODSCODE IN( 'H01412M-G','H0972M-G') AND USERCODE IN('C25','C89' ) 
+                AND  SCRAPTIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND SCRAPFLAG='1' ");
+
                 //定义返回表
                 DataTable result = new DataTable();
                 //添加表头
@@ -75,7 +85,8 @@ public class SmallKanban : IHttpHandler
                         //新建行
                         DataRow dr = result.NewRow();
                         //注浆数(按顺序筛选)
-                        int num1 = dt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item && ex.Field<string>("GROUTINGFLAG") == "1" && ex.Field<string>("SCRAPFLAG") == "0").ToList().Count;
+                        int num1 = dt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item).ToList().Count;
+                        //int num1 = dt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item && ex.Field<string>("GROUTINGFLAG") == "1" && ex.Field<string>("SCRAPFLAG") == "0").ToList().Count;
                         //1#一检返修数工序ID56 
                         decimal num2 = bt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("GROUTINGUSERCODE") == item).Select(ex => ex.Field<decimal>("返修数")).FirstOrDefault();
                         //1#一检交坯数工序ID31
@@ -83,7 +94,8 @@ public class SmallKanban : IHttpHandler
                         //半检不合格数
                         int num4 = dbt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("GROUTINGUSERCODE") == item).ToList().Count;
                         //注浆明细表(当天损坯数)
-                        int num5 = dt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item && ex.Field<string>("GROUTINGFLAG") == "0" && ex.Field<string>("SCRAPFLAG") == "1").ToList().Count;
+                        int num5 = ldt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item).ToList().Count;
+                        //int num5 = dt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("USERCODE") == item && ex.Field<string>("GROUTINGFLAG") == "0" && ex.Field<string>("SCRAPFLAG") == "1").ToList().Count;
                         //成检交接数量
                         decimal num6 = xbt.AsEnumerable().Where(ex => ex.Field<string>("GOODSCODE") == seach && ex.Field<string>("GROUTINGUSERCODE") == item).Select(ex => ex.Field<decimal>("交接数")).FirstOrDefault();
                         //次品数
@@ -103,6 +115,7 @@ public class SmallKanban : IHttpHandler
                     }
                 }
                 context.Response.Write(new JsonResult(result).ToJson());
+
             }
         }
     }

+ 4 - 15
wwwroot/main/Procedure/testHighPressure/HighPressureKanban.html

@@ -109,21 +109,12 @@
     <script src="/Plugins/chartjs-2.8.0/chart-2.8.min.js"></script>
     <script src="/Plugins/chartjs-2.8.0/utils.js"></script>
     <script>
-		//缺陷明细定时翻页
-		var showpage = 10; //显示条数
-		var pages = 1; //当前页数
-		var excesspage;  //剩余条数
-		var countpage; //总条数
         $(document).ready(function () {
             loadServerTime();
-            Lode();
-            doGetData = setInterval(function () { loadServerTime(); }, 60000);
-            doGetData = setInterval(function () { Lode(); }, 60000);
-        });
-        function Lode() { 
-            TableOne(); 
-        }
-        
+            TableOne();
+            doGetData = setInterval(function () { loadServerTime(); }, 20000);
+            doGetData = setInterval(function () { TableOne(); }, 20000);
+        });        
         //function loadServerTime() {
         //    // 获取当前日期和时间  
         //    const now = new Date();
@@ -148,7 +139,6 @@
                 var json = JSON.parse(data);
                 //console.log(json);
                 if (json["success"] == true) {
-                    for (var i = 0; i < json["rows"].length; i++) {
                         $('#cl1').text(json["rows"][0]["实时注浆"]);
                         $('#hgl1').text(json["rows"][1]["实时注浆"]);
                         $('#cl2').text(json["rows"][0]["一检修补率"]);
@@ -165,7 +155,6 @@
                         $('#hgl8').text(json["rows"][3]["保坯率"]);
                         $('#cl9').text(json["rows"][2]["合格率"]);
                         $('#hgl9').text(json["rows"][3]["合格率"]);
-                    }
                 }
             });
         }