From 52ef10033d82393443d8b73faa88a863834a4c8f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java   |   28 
 src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java          |   11 
 src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js                 |  256 ++++++++
 src/main/java/com/zy/asrs/service/OpenService.java                   |    3 
 src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java      |   11 
 src/main/java/basAgvMastLog.sql                                      |   18 
 src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java            |   12 
 src/main/java/com/zy/asrs/service/BasAgvLocNoService.java            |    8 
 src/main/webapp/views/basAgvMastLog/basAgvMastLog.html               |  193 ++++++
 src/main/java/basAgvLocNo.sql                                        |   18 
 src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java              |   12 
 src/main/java/com/zy/asrs/entity/BasAgvLocNo.java                    |   80 ++
 src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java      |   12 
 src/main/java/com/zy/asrs/controller/OpenController.java             |   60 +
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java           |   26 
 src/main/webapp/views/basAgvLocNo/basAgvLocNo.html                   |  122 +++
 src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java    |  125 +++
 src/main/java/com/zy/common/CodeBuilder.java                         |    2 
 src/main/java/com/zy/asrs/service/BasAgvMastLogService.java          |    8 
 src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java   |   12 
 src/main/java/com/zy/asrs/entity/LocDetl.java                        |   12 
 src/main/resources/mapper/BasAgvMastLogMapper.xml                    |   27 
 src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java |   12 
 src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java      |  125 +++
 src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java       |   12 
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java                 |   14 
 src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js             |  276 ++++++++
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java          |  127 +++
 src/main/java/com/zy/asrs/entity/BasAgvMastLog.java                  |  242 +++++++
 src/main/resources/mapper/BasAgvLocNoMapper.xml                      |   17 
 30 files changed, 1,867 insertions(+), 14 deletions(-)

diff --git a/src/main/java/basAgvLocNo.sql b/src/main/java/basAgvLocNo.sql
new file mode 100644
index 0000000..6a808ae
--- /dev/null
+++ b/src/main/java/basAgvLocNo.sql
@@ -0,0 +1,18 @@
+-- save basAgvLocNo record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo/basAgvLocNo.html', 'basAgvLocNo绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvLocNo#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo/basAgvLocNo.html', N'basAgvLocNo绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvLocNo#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/basAgvMastLog.sql b/src/main/java/basAgvMastLog.sql
new file mode 100644
index 0000000..c15531b
--- /dev/null
+++ b/src/main/java/basAgvMastLog.sql
@@ -0,0 +1,18 @@
+-- save basAgvMastLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog/basAgvMastLog.html', 'basAgvMastLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog/basAgvMastLog.html', N'basAgvMastLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java b/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java
new file mode 100644
index 0000000..25071f3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.service.BasAgvLocNoService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasAgvLocNoController extends BaseController {
+
+    @Autowired
+    private BasAgvLocNoService basAgvLocNoService;
+
+    @RequestMapping(value = "/basAgvLocNo/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basAgvLocNoService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basAgvLocNo/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(BasAgvLocNo.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(basAgvLocNoService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/basAgvLocNo/add/auth")
+    @ManagerAuth
+    public R add(BasAgvLocNo basAgvLocNo) {
+        basAgvLocNoService.insert(basAgvLocNo);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basAgvLocNo/update/auth")
+	@ManagerAuth
+    public R update(BasAgvLocNo basAgvLocNo){
+        if (Cools.isEmpty(basAgvLocNo) || null==basAgvLocNo.getId()){
+            return R.error();
+        }
+        basAgvLocNoService.updateById(basAgvLocNo);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basAgvLocNo/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basAgvLocNoService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basAgvLocNo/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvLocNo"));
+        convert(map, wrapper);
+        List<BasAgvLocNo> list = basAgvLocNoService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/basAgvLocNoQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<BasAgvLocNo> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<BasAgvLocNo> page = basAgvLocNoService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasAgvLocNo basAgvLocNo : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basAgvLocNo.getId());
+            map.put("value", basAgvLocNo.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/basAgvLocNo/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasAgvLocNo> wrapper = new EntityWrapper<BasAgvLocNo>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basAgvLocNoService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasAgvLocNo.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
new file mode 100644
index 0000000..282cd59
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.zy.asrs.service.BasAgvMastLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasAgvMastLogController extends BaseController {
+
+    @Autowired
+    private BasAgvMastLogService basAgvMastLogService;
+
+    @RequestMapping(value = "/basAgvMastLog/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basAgvMastLogService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basAgvMastLog/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(BasAgvMastLog.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(basAgvMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/basAgvMastLog/add/auth")
+    @ManagerAuth
+    public R add(BasAgvMastLog basAgvMastLog) {
+        basAgvMastLogService.insert(basAgvMastLog);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basAgvMastLog/update/auth")
+	@ManagerAuth
+    public R update(BasAgvMastLog basAgvMastLog){
+        if (Cools.isEmpty(basAgvMastLog) || null==basAgvMastLog.getId()){
+            return R.error();
+        }
+        basAgvMastLogService.updateById(basAgvMastLog);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basAgvMastLog/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basAgvMastLogService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basAgvMastLog/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvMastLog"));
+        convert(map, wrapper);
+        List<BasAgvMastLog> list = basAgvMastLogService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/basAgvMastLogQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<BasAgvMastLog> page = basAgvMastLogService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasAgvMastLog basAgvMastLog : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basAgvMastLog.getId());
+            map.put("value", basAgvMastLog.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/basAgvMastLog/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasAgvMastLog> wrapper = new EntityWrapper<BasAgvMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basAgvMastLogService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasAgvMastLog.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index dde394f..7253df4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -413,7 +413,7 @@
      * AGV涓婃姤鎺ユ敹
      */
     @PostMapping("/agv/task/v1/agvCallback")
-    @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
+//    @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
     public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
                                         @RequestBody TaskAgvReportParam param,
                                         HttpServletRequest request) {
@@ -451,4 +451,62 @@
         return R.error("浠诲姟鍙蜂笉瀛樺湪");
     }
 
+    /**
+     * PDA鍒涘缓AGV浠诲姟
+     */
+    @PostMapping("/agv/task/v1/createTask")
+    @AppAuth(memo = "PDA鍒涘缓AGV浠诲姟")
+    public synchronized R TaskAgvCreate(@RequestHeader(required = false) String appkey,
+                                        @RequestBody TaskAgvCreateParam param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        boolean taskAgvCreate = openService.taskAgvCreate(param);
+        if (taskAgvCreate){
+            return R.ok();
+        }
+        return R.error("浠诲姟鍙蜂笉瀛樺湪");
+    }
+
+    /**
+     * PDA鑾峰彇AGV搴撲綅
+     */
+    @PostMapping("/agv/loc/v1/getLocList")
+    @AppAuth(memo = "PDA妫�绱GV搴撲綅")
+    public synchronized R GetAgvLocList(@RequestHeader(required = false) String appkey,
+                                        @RequestBody AgvLocListParam param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
+        if (!list.isEmpty()) {
+            return R.ok(list);
+        }
+        return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+    }
+
+    /**
+     * PDA缁戝畾瑙ｇ粦
+     */
+    @PostMapping("/agv/bindCtnrAndBin/v1")
+    @AppAuth(memo = "PDA缁戝畾涓庤В缁�")
+    public synchronized R bindCtnrAndBin(@RequestHeader(required = false) String appkey,
+                                        @RequestBody bindCtnrAndBinParam param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        boolean bindCtnrAndBin = openService.bindCtnrAndBin(param);
+        if (bindCtnrAndBin) {
+            return R.ok();
+        }
+        return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+    }
+
 }
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java b/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java
new file mode 100644
index 0000000..3512d19
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java
@@ -0,0 +1,80 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_agv_loc_no")
+public class BasAgvLocNo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    private Long id;
+
+    /**
+     * agv搴撲綅缂栧彿
+     */
+    @ApiModelProperty(value= "agv搴撲綅缂栧彿")
+    @TableField("agv_loc_no")
+    private String agvLocNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("sta_no")
+    private Integer staNo;
+
+    @ApiModelProperty(value= "")
+    @TableField("loc_no")
+    private String locNo;
+
+    @ApiModelProperty(value= "")
+    private Integer status;
+
+    @ApiModelProperty(value= "")
+    @TableField("io_type")
+    private String ioType;
+
+    @ApiModelProperty(value= "")
+    @TableField("appe_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date appeTime;
+
+    public BasAgvLocNo() {}
+
+    public BasAgvLocNo(String agvLocNo,Integer staNo,String locNo,Integer status,String ioType,Date appeTime) {
+        this.agvLocNo = agvLocNo;
+        this.staNo = staNo;
+        this.locNo = locNo;
+        this.status = status;
+        this.ioType = ioType;
+        this.appeTime = appeTime;
+    }
+
+//    BasAgvLocNo basAgvLocNo = new BasAgvLocNo(
+//            null,    // agv搴撲綅缂栧彿
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public String getAppeTime$(){
+        if (Cools.isEmpty(this.appeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
new file mode 100644
index 0000000..14fe4e5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
@@ -0,0 +1,242 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_agv_mast_log")
+public class BasAgvMastLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    private Long id;
+
+    /**
+     * WMS浠诲姟鍙�
+     */
+    @ApiModelProperty(value= "WMS浠诲姟鍙�")
+    @TableId(value = "task_no", type = IdType.INPUT)
+    @TableField("task_no")
+    private Integer taskNo;
+
+    /**
+     * RGV浠诲姟鍙�
+     */
+    @ApiModelProperty(value= "RGV浠诲姟鍙�")
+    private Long timestamp;
+
+    /**
+     * 婧愮珯鐐�
+     */
+    @ApiModelProperty(value= "婧愮珯鐐�")
+    @TableField("source_sta_no")
+    private Integer sourceStaNo;
+
+    /**
+     * 鐩殑绔欑偣
+     */
+    @ApiModelProperty(value= "鐩殑绔欑偣")
+    @TableField("sta_no")
+    private Integer staNo;
+
+    /**
+     * 婧愬簱浣�
+     */
+    @ApiModelProperty(value= "婧愬簱浣�")
+    @TableField("source_loc_no")
+    private String sourceLocNo;
+
+    /**
+     * 鐩殑搴撲綅
+     */
+    @ApiModelProperty(value= "鐩殑搴撲綅")
+    @TableField("loc_no")
+    private String locNo;
+
+    /**
+     * 浼樺厛绾�
+     */
+    @ApiModelProperty(value= "浼樺厛绾�")
+    private Long priority;
+
+    /**
+     * 妤煎眰
+     */
+    @ApiModelProperty(value= "妤煎眰")
+    @TableField("floor_no")
+    private Integer floorNo;
+
+    /**
+     * 鐘舵�� 0: 鍒濆  1: 浣滀笟涓�  2: 瀹屾垚  
+     */
+    @ApiModelProperty(value= "鐘舵�� 0: 鍒濆  1: 浣滀笟涓�  2: 瀹屾垚  ")
+    private Integer status;
+
+    /**
+     * 寮傚父鏃堕棿
+     */
+    @ApiModelProperty(value= "寮傚父鏃堕棿")
+    @TableField("error_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date errorTime;
+
+    /**
+     * 寮傚父淇℃伅
+     */
+    @ApiModelProperty(value= "寮傚父淇℃伅")
+    @TableField("error_memo")
+    private String errorMemo;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date appeTime;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("modi_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date modiTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
+    private String modiUser;
+
+    @ApiModelProperty(value= "")
+    @TableField("devp_id")
+    private Integer devpId;
+
+    @ApiModelProperty(value= "")
+    @TableField("io_type")
+    private Integer ioType;
+
+    public BasAgvMastLog() {}
+
+    public BasAgvMastLog(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser,Integer devpId,Integer ioType) {
+        this.taskNo = taskNo;
+        this.timestamp = timestamp;
+        this.sourceStaNo = sourceStaNo;
+        this.staNo = staNo;
+        this.sourceLocNo = sourceLocNo;
+        this.locNo = locNo;
+        this.priority = priority;
+        this.floorNo = floorNo;
+        this.status = status;
+        this.errorTime = errorTime;
+        this.errorMemo = errorMemo;
+        this.appeTime = appeTime;
+        this.modiTime = modiTime;
+        this.modiUser = modiUser;
+        this.devpId = devpId;
+        this.ioType = ioType;
+    }
+
+    public BasAgvMastLog(BasAgvMast basAgvMast) {
+        if (basAgvMast != null) {
+            this.taskNo = basAgvMast.getTaskNo();
+            this.timestamp = basAgvMast.getTimestamp();
+            this.sourceStaNo = basAgvMast.getSourceStaNo();
+            this.staNo = basAgvMast.getStaNo();
+            this.sourceLocNo = basAgvMast.getSourceLocNo();
+            this.locNo = basAgvMast.getLocNo();
+            this.priority = basAgvMast.getPriority();
+            this.floorNo = basAgvMast.getFloorNo();
+            this.status = basAgvMast.getStatus();
+            this.appeTime = new Date();
+            this.ioType = basAgvMast.getIoType();
+        }
+    }
+
+//    BasAgvMastLog basAgvMastLog = new BasAgvMastLog(
+//            null,    // WMS浠诲姟鍙穂闈炵┖]
+//            null,    // RGV浠诲姟鍙�
+//            null,    // 婧愮珯鐐�
+//            null,    // 鐩殑绔欑偣
+//            null,    // 婧愬簱浣�
+//            null,    // 鐩殑搴撲綅
+//            null,    // 浼樺厛绾�
+//            null,    // 妤煎眰
+//            null,    // 鐘舵��
+//            null,    // 寮傚父鏃堕棿
+//            null,    // 寮傚父淇℃伅
+//            null,    // 娣诲姞鏃堕棿
+//            null,    // 淇敼鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 
+//            null    // 
+//    );
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 0:
+                return "鍒濆";
+            case 1:
+                return "浣滀笟涓�";
+            case 2:
+                return "瀹屾垚";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getErrorTime$(){
+        if (Cools.isEmpty(this.errorTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
+    }
+
+    public String getAppeTime$(){
+        if (Cools.isEmpty(this.appeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+    }
+
+    public String getModiTime$(){
+        if (Cools.isEmpty(this.modiTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+    }
+
+    public String getModiUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.modiUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 356f4a4..77bdfcb 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -169,21 +169,21 @@
     private Integer owner;
 
     /**
-     * 澶囩敤1
+     * 澶囩敤1(PO)
      */
-    @ApiModelProperty(value= "澶囩敤1")
+    @ApiModelProperty(value= "澶囩敤1")//PO
     private String standby1 = "1";
 
     /**
-     * 澶囩敤2
+     * 澶囩敤2(UPC)
      */
-    @ApiModelProperty(value= "澶囩敤2")
+    @ApiModelProperty(value= "澶囩敤2")//UPC
     private String standby2 = "1";
 
     /**
-     * 澶囩敤3
+     * 澶囩敤3(SKU)
      */
-    @ApiModelProperty(value= "澶囩敤3")
+    @ApiModelProperty(value= "澶囩敤3")//SKU
     private String standby3 = "1";
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
new file mode 100644
index 0000000..510d056
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.entity.param;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.SnowflakeIdWorker;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.entity.BasAgvMast;
+import com.zy.asrs.service.BasAgvLocNoService;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+/*
+ *  Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class AgvBindCtnrAndBinParam {
+
+    private String reqCode;
+    private String reqTime;
+    private String clientCode;
+    private String tokenCode;
+    private String ctnrCode;
+    private String ctnrTyp;
+    private String stgBinCode;
+    private String positionCode;
+    private String indBind;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
new file mode 100644
index 0000000..bfda81e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.asrs.entity.LocDetl;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgvLocListDetlParam {
+    String locNo; //搴撲綅鍙�
+    private List<LocDetl> agvDetlList; //鏄庣粏
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
new file mode 100644
index 0000000..0bd7885
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgvLocListParam {
+    private List<String> locNoList;  // 闇�瑕佹煡璇㈢殑 AGV 搴撲綅
+    String locSys; //搴撲綅鐘舵��
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java
new file mode 100644
index 0000000..a04c614
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskAgvCreateParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TaskAgvCreateParam {
+    Integer sourceStaNo;  //婧愮珯鐐�
+    Integer staNo;  //鐩爣绔欑偣
+    String sourceLocNo; //鍘熷簱浣�
+    String locNo; //鐩爣搴撲綅
+    Integer ioType; //浠诲姟绫诲瀷
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
new file mode 100644
index 0000000..52a9786
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class bindCtnrAndBinParam {
+    String barcode; //鎵樼洏鏉＄爜
+    String staNo; // 鐩爣绔欑偣
+    String locNo; //  鐩爣搴撲綅
+    String indBind; // 0:瑙ｇ粦 1锛氱粦瀹�
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java
new file mode 100644
index 0000000..58277b5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvLocNoMapper extends BaseMapper<BasAgvLocNo> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java
new file mode 100644
index 0000000..35b104f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvMastLogMapper extends BaseMapper<BasAgvMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java b/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java
new file mode 100644
index 0000000..fc6cbb9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvLocNoService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvLocNoService extends IService<BasAgvLocNo> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java b/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java
new file mode 100644
index 0000000..776ea3f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvMastLogService extends IService<BasAgvMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 8083759..a9d8ee9 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -50,4 +50,7 @@
     void taskArmWorkOrderStatus(OrderArmEndParam param);
     boolean TaskArmWorkOrderSign(OrderArmEndParam param);
     boolean TaskAgvReport(TaskAgvReportParam param);
+    boolean taskAgvCreate(TaskAgvCreateParam param);
+    List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param);
+    boolean bindCtnrAndBin(bindCtnrAndBinParam param);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java
new file mode 100644
index 0000000..9b3ff91
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvLocNoMapper;
+import com.zy.asrs.entity.BasAgvLocNo;
+import com.zy.asrs.service.BasAgvLocNoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvLocNoService")
+public class BasAgvLocNoServiceImpl extends ServiceImpl<BasAgvLocNoMapper, BasAgvLocNo> implements BasAgvLocNoService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java
new file mode 100644
index 0000000..eb46e10
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvMastLogMapper;
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.zy.asrs.service.BasAgvMastLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvMastLogService")
+public class BasAgvMastLogServiceImpl extends ServiceImpl<BasAgvMastLogMapper, BasAgvMastLog> implements BasAgvMastLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index efaabed..7e40f99 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,10 +1,12 @@
 package com.zy.asrs.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SnowflakeIdWorker;
+import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
@@ -16,6 +18,8 @@
 import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.model.DetlDto;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.NodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +66,8 @@
     private BasAgvMastService basAgvMastService;
     @Autowired
     private LocOwnerService locOwnerService;
+    @Autowired
+    private CommonService commonService;
 
     @Override
     @Transactional
@@ -777,5 +783,126 @@
         return true;
     }
 
+    @Override
+    @Transactional
+    public boolean taskAgvCreate(TaskAgvCreateParam param) {
+        // 鍙傛暟妫�鏌�
+        if (param == null) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+        }
+        Integer devpId = 1;
+        // 鍒涘缓瀵硅薄锛堟瀯閫犲嚱鏁颁腑宸茬敓鎴� timestamp锛�
+        BasAgvMast basAgvMast = new BasAgvMast();
+        // 鐢熸垚 WMS 浠诲姟鍙凤紙濡傛棤澶栭儴浼犲叆锛屽彲浠ヤ娇鐢ㄩ洩鑺盜D 鎴栬嚜澧烇級
+        basAgvMast.setTaskNo(commonService.getWorkNo(0));
+        // 璧嬪�煎弬鏁�
+        basAgvMast.setSourceStaNo(param.getSourceStaNo());
+        basAgvMast.setStaNo(param.getStaNo());
+        basAgvMast.setSourceLocNo(param.getSourceLocNo());
+        basAgvMast.setLocNo(param.getLocNo());
+        // 榛樿鍊�
+        basAgvMast.setPriority(1L);          // 榛樿浼樺厛绾�
+        basAgvMast.setStatus(0);             // 鍒濆鐘舵��
+        basAgvMast.setAppeTime(new Date());  // 娣诲姞鏃堕棿
+        basAgvMast.setModiTime(new Date());  // 淇敼鏃堕棿
+        basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
+        basAgvMast.setDevpId(devpId);
+
+        // 鎻掑叆鏁版嵁搴�
+        basAgvMastService.insert(basAgvMast);
+
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param){
+
+        if (param == null || Cools.isEmpty(param.getLocNoList())) {
+            throw new CoolException("搴撲綅鍙蜂笉鑳戒负绌�");
+        }
+
+        List<String> locNos = param.getLocNoList();
+
+        List<AgvLocListDetlParam> result = new ArrayList<>();
+
+        for (String locNo : locNos) {
+
+            // 鏌ヨ璇ュ簱浣� detail
+            List<LocDetl> detlList = locDetlService.selectList(
+                    new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+            );
+
+            AgvLocListDetlParam dto = new AgvLocListDetlParam();
+            dto.setLocNo(locNo);
+            dto.setAgvDetlList(detlList);
+            result.add(dto);
+        }
+
+        return result;
+    }
+
+
+    @Override
+    @Transactional
+    public boolean bindCtnrAndBin(bindCtnrAndBinParam param) {
+        // 鍙傛暟妫�鏌�
+        if (param == null) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+        }
+        AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+        BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
+        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
+        agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
+        agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
+        agvBindCtnrAndBinParam.setCtnrTyp("1");
+        agvBindCtnrAndBinParam.setPositionCode(
+                basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
+                        ? basAgvLocNoSou.getAgvLocNo()
+                        : ""
+        );
+        agvBindCtnrAndBinParam.setStgBinCode(
+                basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
+                        ? basAgvLocNoEnd.getAgvLocNo()
+                        : ""
+        );
+        agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
+        try {
+            String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
+            String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
+            String response = "";
+            boolean success = false;
+
+            try {
+                log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
+
+                response = new HttpHandler.Builder()
+                        .setUri(URL)
+                        .setPath(mesPath)
+                        .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
+                        .build()
+                        .doPost();
+
+                log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
+                JSONObject jsonObject = JSON.parseObject(response);
+
+                if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
+                    success = true;
+                } else {
+                    log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
+                    throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+                }
+            } catch (Exception e) {
+                log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
+                throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
+            }
+        } catch (Exception e) {
+            throw new CoolException(e.getMessage());
+        }
+        return true;
+    }
+
+
 
 }
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 884015d..23ae220 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.zy.asrs.entity.BasAgvMast;
 import com.zy.asrs.entity.BasArmMast;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasAgvMastService;
 import com.zy.asrs.service.BasArmMastLogService;
 import com.zy.asrs.service.BasArmMastService;
 import com.zy.asrs.service.WrkMastService;
@@ -29,6 +31,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private BasArmMastService basArmMastService;
+    @Autowired
+    private BasAgvMastService basAgvMastService;
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
@@ -68,14 +72,14 @@
 
     @Scheduled(cron = "0/10 * * * * ? ")
     private void executeAgv(){
-        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
-        if (basArmMastList.isEmpty()) {
+        List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 3));
+        if (basAgvstList.isEmpty()) {
             return;
         }
-        for (BasArmMast basArmMast : basArmMastList) {
-            ReturnT<String> result = workLogHandler.startArm(basArmMast);
+        for (BasAgvMast basAgvMast : basAgvstList) {
+            ReturnT<String> result = workLogHandler.startAgv(basAgvMast);
             if (!result.isSuccess()) {
-                log.error("ARM宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basArmMast.getId());
+                log.error("AGV宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basAgvMast.getId());
             }
         }
     }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index c2a8a9a..c400bd2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -40,8 +40,11 @@
     @Autowired
     private BasArmMastLogService basArmMastLogService;
     @Autowired
+    private BasAgvMastLogService basAgvMastLogService;
+    @Autowired
     private BasArmMastService basArmMastService;
-
+    @Autowired
+    private BasAgvMastService basAgvMastService;
     @Transactional
     public ReturnT<String> start(WrkMast wrkMast) {
         try {
@@ -148,4 +151,25 @@
         return SUCCESS;
     }
 
+    @Transactional
+    public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
+        try {
+            BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
+            // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+            if (!basAgvMastLogService.insert(basAgvMastLog)) {
+                exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basAgvMast.getId());
+            }
+            // 鍒犻櫎宸ヤ綔涓绘。
+            if (!basAgvMastService.deleteById(basAgvMast)) {
+                exceptionHandle("鍒犻櫎ARM宸ヤ綔涓绘。[id={0}]澶辫触", basAgvMast.getId());
+            }
+        } catch (Exception e) {
+            log.error("fail", e);
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
+        }
+        return SUCCESS;
+    }
+
 }
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index bcf969f..22e2d2f 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
         generator.url="10.10.10.235:1433;databasename=jshdasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="bas_loc_supp";
+        generator.table="asr_bas_agv_mast_log";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/resources/mapper/BasAgvLocNoMapper.xml b/src/main/resources/mapper/BasAgvLocNoMapper.xml
new file mode 100644
index 0000000..729926d
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvLocNoMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasAgvLocNoMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvLocNo">
+        <id column="id" property="id" />
+        <result column="agv_loc_no" property="agvLocNo" />
+        <result column="sta_no" property="staNo" />
+        <result column="loc_no" property="locNo" />
+        <result column="status" property="status" />
+        <result column="io_type" property="ioType" />
+        <result column="appe_time" property="appeTime" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasAgvMastLogMapper.xml b/src/main/resources/mapper/BasAgvMastLogMapper.xml
new file mode 100644
index 0000000..2e30b0b
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvMastLogMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasAgvMastLogMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvMastLog">
+        <id column="id" property="id" />
+        <result column="task_no" property="taskNo" />
+        <result column="timestamp" property="timestamp" />
+        <result column="source_sta_no" property="sourceStaNo" />
+        <result column="sta_no" property="staNo" />
+        <result column="source_loc_no" property="sourceLocNo" />
+        <result column="loc_no" property="locNo" />
+        <result column="priority" property="priority" />
+        <result column="floor_no" property="floorNo" />
+        <result column="status" property="status" />
+        <result column="error_time" property="errorTime" />
+        <result column="error_memo" property="errorMemo" />
+        <result column="appe_time" property="appeTime" />
+        <result column="modi_time" property="modiTime" />
+        <result column="modi_user" property="modiUser" />
+        <result column="devp_id" property="devpId" />
+        <result column="io_type" property="ioType" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js b/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js
new file mode 100644
index 0000000..7bfef62
--- /dev/null
+++ b/src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js
@@ -0,0 +1,256 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#basAgvLocNo',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basAgvLocNo/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'agvLocNo', align: 'center',title: 'agv搴撲綅缂栧彿'}
+            ,{field: 'staNo', align: 'center',title: ''}
+            ,{field: 'locNo', align: 'center',title: ''}
+            ,{field: 'status', align: 'center',title: ''}
+            ,{field: 'ioType', align: 'center',title: ''}
+            ,{field: 'appeTime$', align: 'center',title: ''}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(basAgvLocNo)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(basAgvLocNo)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'basAgvLocNo': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basAgvLocNo/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(basAgvLocNo)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/basAgvLocNo/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/basAgvLocNo/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+            layDate.render({
+                elem: '#appeTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['appeTime\\$']:null
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js b/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js
new file mode 100644
index 0000000..063882f
--- /dev/null
+++ b/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js
@@ -0,0 +1,276 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#basAgvMastLog',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basAgvMastLog/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�'}
+            ,{field: 'timestamp', align: 'center',title: 'RGV浠诲姟鍙�'}
+            ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯鐐�'}
+            ,{field: 'staNo', align: 'center',title: '鐩殑绔欑偣'}
+            ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+            ,{field: 'locNo', align: 'center',title: '鐩殑搴撲綅'}
+            ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
+            ,{field: 'floorNo', align: 'center',title: '妤煎眰'}
+            ,{field: 'status$', align: 'center',title: '鐘舵��'}
+            ,{field: 'errorTime$', align: 'center',title: '寮傚父鏃堕棿'}
+            ,{field: 'errorMemo', align: 'center',title: '寮傚父淇℃伅'}
+            ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+            ,{field: 'devpId', align: 'center',title: ''}
+            ,{field: 'ioType', align: 'center',title: ''}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(basAgvMastLog)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(basAgvMastLog)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'basAgvMastLog': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basAgvMastLog/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(basAgvMastLog)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/basAgvMastLog/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/basAgvMastLog/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+            layDate.render({
+                elem: '#errorTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['errorTime\\$']:null
+            });
+            layDate.render({
+                elem: '#appeTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['appeTime\\$']:null
+            });
+            layDate.render({
+                elem: '#modiTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['modiTime\\$']:null
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html b/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html
new file mode 100644
index 0000000..4d4779a
--- /dev/null
+++ b/src/main/webapp/views/basAgvLocNo/basAgvLocNo.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                     <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">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basAgvLocNo" lay-filter="basAgvLocNo"></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>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basAgvLocNo/basAgvLocNo.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搴撲綅缂栧彿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="agvLocNo" placeholder="璇疯緭鍏gv搴撲綅缂栧彿">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="staNo" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="locNo" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="status" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="ioType" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏�">
+                    </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>
+
diff --git a/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html b/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html
new file mode 100644
index 0000000..4f24169
--- /dev/null
+++ b/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                     <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">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basAgvMastLog" lay-filter="basAgvMastLog"></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>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basAgvMastLog/basAgvMastLog.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 layui-form-required">WMS浠诲姟鍙�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">RGV浠诲姟鍙�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="timestamp" placeholder="璇疯緭鍏GV浠诲姟鍙�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">婧愮珯鐐�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐩殑绔欑偣: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鐨勭珯鐐�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">婧愬簱浣�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐩殑搴撲綅: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鐨勫簱浣�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">浼樺厛绾�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">妤煎眰: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="floorNo" placeholder="璇疯緭鍏ユゼ灞�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐘舵��: </label>
+                    <div class="layui-input-block">
+                        <select name="status">
+                            <option value="">璇烽�夋嫨鐘舵��</option>
+                            <option value="0">鍒濆</option>
+                            <option value="1">浣滀笟涓�</option>
+                            <option value="2">瀹屾垚</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">寮傚父鏃堕棿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏ュ紓甯告椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">寮傚父淇℃伅: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="errorMemo" placeholder="璇疯緭鍏ュ紓甯镐俊鎭�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">淇敼鏃堕棿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">淇敼浜哄憳: </label>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+                        <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+                        <div class="cool-auto-complete-window">
+                            <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="devpId" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="ioType" placeholder="璇疯緭鍏�">
+                    </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