From 42d37ce9f59c15801cde7d63a439156934978bb4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 30 八月 2024 11:41:24 +0800
Subject: [PATCH] 8.26-8.29售后维护升级 1.增加逻辑：料架退回二次接力后，当仓储车准备送回库内时先查询此料架是否有其他线需要使用，有则直接从当前上片位送至下一上片位（省去中间退库，再从库内送至下一上片位的动作） 2.增加逻辑：当派尔开工下发任务料架顺序为，2，4，2类型时，上片机吸完2号架后退回二次接力但不能退库，等待4号架吸片完成退回二次接力后，2号架再从二次接力推进上片位然后亮灯（此时料架任务自动切换成下第二个2号架任务） 3.增加页面弹窗：仓储待执行任务 4.增加汇报逻辑：除原先仓储完成后汇报派尔料架已回库外，另外增加检索只要北玻系统完成但派尔未确认的都进行汇报直至派尔确认 5.修改页面查询：已完成任务仅查询一百条 6.定期删除完成数据
---
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp | 114 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 18 deletions(-)
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
index e1a9c82..869d5e5 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
@@ -36,28 +36,65 @@
#Table_Minche thead tr {
background-color: #00BFFF;
- font-weight:800;
+ font-weight: 800;
}
-#Table_Minche thead td{
- border:1px solid #00BFFF;
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
padding: 5px 10px 5px 10px;
}
+
#Table_Minche td {
border: 1px solid #f2f2f2;
height: 20px;
line-height: 20px;
- text-align:center;
+ text-align: center;
padding: 2px 10px 2px 10px;
}
+
+.two thead tr {
+ background-color: #f2f2f2;
+}
+
+.two {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+.two th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
</style>
-<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script>
- setInterval(function(){
- window.location.reload();
- },3000);
+ //鍚姩瀹氭椂鍣�,func鏄弬鏁帮紝鎵�浠ヤ笉鑳戒娇鐢ㄦ嫭鍙�
+ var interval = setInterval(func,3000); //鍚姩,func涓嶈兘浣跨敤鎷彿
+
+
+ function func(){
+ window.location.reload();
+ }
+ function start(){
+ //閲嶆柊鍚姩
+ interval = setInterval(func, 3000);
+ }
function modifyraw(){
- disableAutoRefresh()
- $("#add-fix-info").modal('show');
+ // 鍋滄瀹氭椂鍣�
+ clearInterval(interval);
+ $("#add-fix-info").modal('show');
}
function checkAll() {
var checkedAll=document.getElementById("checkall");
@@ -92,34 +129,75 @@
}
}
</script>
+
</head>
<body>
+
<div class="content-wrapper" style="background-color: white;">
- <!-- 鍐呭 -->
+
<section class="content container-fluid">
<div>
- <table id="Table_Minche" style="width: 100%;min-width:1200px; border-collapse: collapse; border-spacing: 0;">
+ <button class="btn" onclick="modifyraw()">浠撳偍浠诲姟</button>
+ <table id="Table_Minche"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
<thead>
<tr>
<td>ID</td>
<td>鏈哄櫒鍚嶇О</td>
- <td>浠诲姟ID</td>
+ <td>浠诲姟ID</td>
<td>閾佹灦鍙�</td>
<td>娲惧皵鐘舵��</td>
- <td>MES鐘舵��</td>
- <td>宸ヤ綔鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
<td>鏈哄櫒鐘舵��</td>
<td>绛夊緟鏁伴噺</td>
<td>鎶ヨ淇℃伅</td>
- <td style="width:200px;">鎿嶄綔</td>
+ <td style="width: 200px;">鎿嶄綔</td>
</tr>
</thead>
- <tbody>
- ${MachineOutTaskhtmls}
+ <tbody>${MachineOutTaskhtmls}
</tbody>
</table>
+ </div>
+
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" onclick="start()" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">浠撳偍寰呮墽琛屼换鍔�</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 浠诲姟鏄剧ず -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>浠诲姟ID</th>
+ <th>鏂欐灦鍙�</th>
+ <th>鐩殑绾胯矾</th>
+ <th>鐩爣宸ヤ綅</th>
+ <th>璁″垝涓婄墖鏁伴噺</th>
+ <th>鏂欐灦涓婄幓鐠冩暟閲�</th>
+ <th>绫诲瀷</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody>${outTasksTasks}
+ </tbody>
+ </table>
+ </div>
+
+ </form>
+ </div>
+ </div>
</div>
</section>
</div>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.8.0