From 10778ff6207c31641187acb487d4b67c0de59b24 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 10:38:51 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/webapp/views/task/task.html | 94 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/views/task/task.html b/src/main/webapp/views/task/task.html
index 25896cc..9a312d1 100644
--- a/src/main/webapp/views/task/task.html
+++ b/src/main/webapp/views/task/task.html
@@ -22,14 +22,16 @@
<input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width: 300px">
+ <div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text"
+ placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -41,23 +43,68 @@
</button>
</div>
</div>
+ <!-- 鍛煎彨AGV鍖哄煙 - 鏆傛椂娉ㄩ噴鎺� -->
+ <!--
+ <div class="layui-form-item" style="margin-top: 10px; padding: 10px; background-color: #f5f5f5; border-radius: 4px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">鍛煎彨AGV锛�</label>
+ <div class="layui-input-inline" style="width: 120px;">
+ <select id="callAgvType" lay-filter="callAgvType">
+ <option value="manual">鎵嬪姩杈撳叆</option>
+ <option value="outbound">璧风偣+鍑哄簱</option>
+ <option value="inbound">璧风偣+鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="width: 150px;">
+ <input class="layui-input" type="text" id="callAgvOrgSite" placeholder="婧愮珯鐐�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" id="callAgvTarSiteGroup">
+ <div class="layui-input-inline" style="width: 150px;">
+ <input class="layui-input" type="text" id="callAgvTarSite" placeholder="鐩爣绔欑偣" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" id="callAgvTarLocGroup" style="display: none;">
+ <div class="layui-input-inline" style="width: 150px;">
+ <input class="layui-input" type="text" id="callAgvTarLoc" placeholder="鐩爣搴撲綅" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="width: 150px;">
+ <input class="layui-input" type="text" id="callAgvBarcode" placeholder="鎵樼洏鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn layui-btn-normal" id="callAgvBtn">
+ <i class="layui-icon"></i>鍛煎彨AGV
+ </button>
+ </div>
+ </div>
+ -->
</div>
<table class="layui-hide" id="task" lay-filter="task"></table>
</div>
</div>
</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
+ <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">鍏堝叆鍝�</a>
+ {{# } }}
+ {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">绌烘搷浣�</a>
+ {{# } }}
+ <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
+ {{#if (d.ioType === 103) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
+ {{# } }}
+ {{#if (d.ioType === 107) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
+ {{# } }}
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -66,27 +113,6 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/task/task.js" charset="utf-8"></script>
</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label">浠诲姟绫诲瀷锛� agv , crn: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="taskType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨嬶細 agv , crn">
- </div>
- </div>
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
</html>
--
Gitblit v1.9.1