From 72ce003daa99f4e36466e7fc146e6c14bfc6438f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 08:32:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/BasDevpErrorLogService.java          |    8 
 src/main/webapp/static/js/basAgvLocNo/basAgvLocNo.js                   |  256 ++++++++
 src/main/java/com/zy/core/model/protocol/StaProtocol.java              |   48 +
 src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java                  |  217 +++++++
 src/main/resources/mapper/BasDevpErrorLogMapper.xml                    |   32 +
 src/main/java/com/zy/asrs/service/BasAgvLocNoService.java              |    8 
 src/main/java/com/zy/asrs/service/impl/BasDevpErrorLogServiceImpl.java |   12 
 src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java     |  110 +++
 src/main/java/basAgvLocNo.sql                                          |   18 
 src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js           |  270 ++++++++
 src/main/java/com/zy/core/thread/SiemensDevpThread.java                |  107 ++
 src/main/java/basDevpErrorLog.sql                                      |   18 
 src/main/java/com/zy/asrs/mapper/BasAgvLocNoMapper.java                |   12 
 src/main/java/com/zy/asrs/entity/BasAgvLocNo.java                      |   83 ++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java            |   38 
 src/main/webapp/views/basAgvLocNo/basAgvLocNo.html                     |  122 +++
 src/main/java/com/zy/common/CodeBuilder.java                           |    2 
 src/main/java/com/zy/asrs/utils/PostMesDataUtils.java                  |   54 +
 src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java    |   63 ++
 src/main/java/com/zy/asrs/service/impl/BasAgvLocNoServiceImpl.java     |   12 
 src/main/webapp/views/basDevpErrorLog/basDevpErrorLog.html             |  212 ++++++
 src/main/java/com/zy/asrs/mapper/BasDevpErrorLogMapper.java            |   12 
 src/main/java/com/zy/common/constant/AgvConstant.java                  |    7 
 src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java        |    9 
 src/main/resources/application.yml                                     |   71 +-
 src/main/resources/mapper/BasAgvLocNoMapper.xml                        |   17 
 26 files changed, 1,736 insertions(+), 82 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/basDevpErrorLog.sql b/src/main/java/basDevpErrorLog.sql
new file mode 100644
index 0000000..b618a9d
--- /dev/null
+++ b/src/main/java/basDevpErrorLog.sql
@@ -0,0 +1,18 @@
+-- save basDevpErrorLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog/basDevpErrorLog.html', 'basDevpErrorLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpErrorLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog/basDevpErrorLog.html', N'basDevpErrorLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpErrorLog#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..ca00d8c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvLocNoController.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.controller;
+
+import com.zy.common.web.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class BasAgvLocNoController extends BaseController {
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
new file mode 100644
index 0000000..8506f54
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
@@ -0,0 +1,63 @@
+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.BasDevpErrorLog;
+import com.zy.asrs.service.BasDevpErrorLogService;
+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 BasDevpErrorLogController extends BaseController {
+
+    @Autowired
+    private BasDevpErrorLogService basDevpErrorLogService;
+
+    @RequestMapping(value = "/basDevpErrorLog/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basDevpErrorLogService.selectById(String.valueOf(id)));
+    }
+
+
+
+    @RequestMapping(value = "/basDevpErrorLog/add/auth")
+    @ManagerAuth
+    public R add(BasDevpErrorLog basDevpErrorLog) {
+        basDevpErrorLogService.insert(basDevpErrorLog);
+        return R.ok();
+    }
+
+
+    @RequestMapping(value = "/basDevpErrorLog/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basDevpErrorLogService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+
+    @RequestMapping(value = "/basDevpErrorLog/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<BasDevpErrorLog> wrapper = new EntityWrapper<BasDevpErrorLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basDevpErrorLogService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(BasDevpErrorLog.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
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..83d12dd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvLocNo.java
@@ -0,0 +1,83 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+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")
+    @TableId(value = "id", type = IdType.AUTO)
+    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/BasDevpErrorLog.java b/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java
new file mode 100644
index 0000000..f2151af
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java
@@ -0,0 +1,217 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+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_devp_error_log")
+public class BasDevpErrorLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value= "")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 杈撻�佺紪鍙�
+     */
+    @ApiModelProperty(value= "杈撻�佺紪鍙�")
+    @TableField("dev_no")
+    private Integer devNo;
+
+    /**
+     * 鐗╀綋杩�/鍑鸿秴鏃�
+     */
+    @ApiModelProperty(value= "鐗╀綋杩�/鍑鸿秴鏃�")
+    @TableField("pass_time_out")
+    private String passTimeOut;
+
+    /**
+     * 鏈夌墿浣撴棤鏁版嵁
+     */
+    @ApiModelProperty(value= "鏈夌墿浣撴棤鏁版嵁")
+    @TableField("object_no_id_error")
+    private String objectNoIdError;
+
+    /**
+     * 鏈夋暟鎹棤鐗╀綋
+     */
+    @ApiModelProperty(value= "鏈夋暟鎹棤鐗╀綋")
+    @TableField("id_no_object_error")
+    private String idNoObjectError;
+
+    /**
+     * 绾夸綋鐢垫満鐑户鎶ヨ
+     */
+    @ApiModelProperty(value= "绾夸綋鐢垫満鐑户鎶ヨ")
+    @TableField("lmfr_error")
+    private String lmfrError;
+
+    /**
+     * 椤跺崌鎶ヨ
+     */
+    @ApiModelProperty(value= "椤跺崌鎶ヨ")
+    @TableField("lift_error")
+    private String liftError;
+
+    /**
+     * 椤跺崌鐢垫満鐑户鎶ヨ
+     */
+    @ApiModelProperty(value= "椤跺崌鐢垫満鐑户鎶ヨ")
+    @TableField("dlfr_error")
+    private String dlfrError;
+
+    /**
+     * 椤跺崌妯Щ鐢垫満鐑户鎶ヨ
+     */
+    @ApiModelProperty(value= "椤跺崌妯Щ鐢垫満鐑户鎶ヨ")
+    @TableField("dmfr_error")
+    private String dmfrError;
+
+    /**
+     * 鍙橀鏁呴殰
+     */
+    @ApiModelProperty(value= "鍙橀鏁呴殰")
+    @TableField("vfd_error")
+    private String vfdError;
+
+    /**
+     * 浼烘湇鏁呴殰
+     */
+    @ApiModelProperty(value= "浼烘湇鏁呴殰")
+    @TableField("srv_error")
+    private String srvError;
+
+    /**
+     * 棰勭暀1
+     */
+    @ApiModelProperty(value= "棰勭暀1")
+    private String res1;
+
+    /**
+     * 棰勭暀2
+     */
+    @ApiModelProperty(value= "棰勭暀2")
+    private String res2;
+
+    /**
+     * 棰勭暀3
+     */
+    @ApiModelProperty(value= "棰勭暀3")
+    private String res3;
+
+    /**
+     * 涓庝笂浣嶆満閫氳瓒呮椂
+     */
+    @ApiModelProperty(value= "涓庝笂浣嶆満閫氳瓒呮椂")
+    @TableField("communication_time_out")
+    private String communicationTimeOut;
+
+    /**
+     * 淇℃伅鍙傛暟涓嶅叏
+     */
+    @ApiModelProperty(value= "淇℃伅鍙傛暟涓嶅叏")
+    @TableField("parameter_incomplete_error")
+    private String parameterIncompleteError;
+
+    /**
+     * 淇℃伅鏁版嵁鏈竻闄�
+     */
+    @ApiModelProperty(value= "淇℃伅鏁版嵁鏈竻闄�")
+    @TableField("data_not_clear")
+    private String dataNotClear;
+
+    /**
+     * 鍙傛暟璁剧疆鎶ヨ
+     */
+    @ApiModelProperty(value= "鍙傛暟璁剧疆鎶ヨ")
+    @TableField("set_parameter_error")
+    private String setParameterError;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+    @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value= "")
+    @TableField("in_enable")
+    private String inEnable;
+
+    @ApiModelProperty(value= "")
+    @TableField("out_enable")
+    private String outEnable;
+
+    @ApiModelProperty(value= "鏁版嵁閿欒")
+    @TableField("data_error")
+    private String dataError;
+
+    public BasDevpErrorLog() {}
+
+    public BasDevpErrorLog(Integer devNo,String passTimeOut,String objectNoIdError,String idNoObjectError,String lmfrError,String liftError,String dlfrError,String dmfrError,String vfdError,String srvError,String res1,String res2,String res3,String communicationTimeOut,String parameterIncompleteError,String dataNotClear,String setParameterError,Date createTime,String inEnable,String outEnable,String dataError) {
+        this.devNo = devNo;
+        this.passTimeOut = passTimeOut;
+        this.objectNoIdError = objectNoIdError;
+        this.idNoObjectError = idNoObjectError;
+        this.lmfrError = lmfrError;
+        this.liftError = liftError;
+        this.dlfrError = dlfrError;
+        this.dmfrError = dmfrError;
+        this.vfdError = vfdError;
+        this.srvError = srvError;
+        this.res1 = res1;
+        this.res2 = res2;
+        this.res3 = res3;
+        this.communicationTimeOut = communicationTimeOut;
+        this.parameterIncompleteError = parameterIncompleteError;
+        this.dataNotClear = dataNotClear;
+        this.setParameterError = setParameterError;
+        this.createTime = createTime;
+        this.inEnable = inEnable;
+        this.outEnable = outEnable;
+        this.dataError = dataError;
+    }
+
+//    BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog(
+//            null,    // 杈撻�佺紪鍙�
+//            null,    // 鐗╀綋杩�/鍑鸿秴鏃�
+//            null,    // 鏈夌墿浣撴棤鏁版嵁
+//            null,    // 鏈夋暟鎹棤鐗╀綋
+//            null,    // 绾夸綋鐢垫満鐑户鎶ヨ
+//            null,    // 椤跺崌鎶ヨ
+//            null,    // 椤跺崌鐢垫満鐑户鎶ヨ
+//            null,    // 椤跺崌妯Щ鐢垫満鐑户鎶ヨ
+//            null,    // 鍙橀鏁呴殰
+//            null,    // 浼烘湇鏁呴殰
+//            null,    // 棰勭暀1
+//            null,    // 棰勭暀2
+//            null,    // 棰勭暀3
+//            null,    // 涓庝笂浣嶆満閫氳瓒呮椂
+//            null,    // 淇℃伅鍙傛暟涓嶅叏
+//            null,    // 淇℃伅鏁版嵁鏈竻闄�
+//            null,    // 鍙傛暟璁剧疆鎶ヨ
+//            null,    // 鍒涘缓鏃堕棿
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
index 4ba63d1..29ea9c4 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
@@ -1,7 +1,17 @@
 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.entity.BasArmMast;
+import com.zy.asrs.entity.result.OrderDetlValueResultUtil;
+import com.zy.asrs.service.BasAgvLocNoService;
+import com.zy.asrs.service.BasDevpErrorLogService;
 import lombok.Data;
+
+import java.util.ArrayList;
 
 /*
  *  Created by Monkey D. Luffy on 2025.09.09
@@ -9,18 +19,104 @@
 @Data
 public class AgvTaskAssignmentParam {
 
-    private String id;
+    private String reqCode;
+    private String taskCode;
+    private String taskTyp = "cs";
+    private String ctnrTyp = "1";
+    private ArrayList<PositionCodePathClass> positionCodePath = new ArrayList<PositionCodePathClass>();
 
-    public AgvTaskAssignmentParam() {}
-
-    public AgvTaskAssignmentParam(String id) {
-        this.id = id;
+    @Data
+    public static class PositionCodePathClass {
+        private String positionCode;
+        private String type = "05";//鏀剧疆浣�
     }
 
-    public AgvTaskAssignmentParam(int id) {
-        this.id = String.valueOf(id);
+    public AgvTaskAssignmentParam() {
+
     }
     public AgvTaskAssignmentParam(BasAgvMast basAgvMast) {
+        switch (basAgvMast.getIoType()){
+            case 0:
+                getAgvTaskAssignmentParam0(basAgvMast);
+                return;
+            case 1:
+                getAgvTaskAssignmentParam1(basAgvMast);
+                return;
+            case 2:
+                getAgvTaskAssignmentParam2(basAgvMast);
+                return;
+            case 3:
+                getAgvTaskAssignmentParam3(basAgvMast);
+                return;
+            default:
+                return;
+        }
+
+    }
+
+    public void getAgvTaskAssignmentParam0(BasAgvMast basAgvMast) {
+        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+
+        this.reqCode = basAgvMast.getTaskNo()+"-"+basAgvMast.getTimestamp();
+
+        SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+        long nextId = snowflakeIdWorker.nextId();
+        this.taskCode = String.valueOf(nextId);
+        PositionCodePathClass positionCodePathClassEnd = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
+        positionCodePathClassEnd.setPositionCode(basAgvLocNoSou.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassEnd);
+
+        PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo()));
+        positionCodePathClassSou.setPositionCode(basAgvLocNoEnd.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassSou);
+
+
+    }
+    public void getAgvTaskAssignmentParam1(BasAgvMast basAgvMast) {
+        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+
+        this.reqCode = basAgvMast.getTaskNo().toString();
+        this.taskCode = basAgvMast.getTimestamp().toString();
+        PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
+        positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassSou);
+        PositionCodePathClass positionCodePathClassEnd = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getLocNo()));
+        positionCodePathClassEnd.setPositionCode(basAgvLocNoEnd.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassEnd);
+
+    }
+    public void getAgvTaskAssignmentParam2(BasAgvMast basAgvMast) {
+        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+
+        this.reqCode = basAgvMast.getTaskNo().toString();
+        this.taskCode = basAgvMast.getTimestamp().toString();
+        PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoSou= basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getSourceStaNo()));
+        positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassSou);
+        PositionCodePathClass positionCodePathClassEnd = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getLocNo()));
+        positionCodePathClassEnd.setPositionCode(basAgvLocNoEnd.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassEnd);
+
+    }
+    public void getAgvTaskAssignmentParam3(BasAgvMast basAgvMast) {
+        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+
+        this.reqCode = basAgvMast.getTaskNo().toString();
+        this.taskCode = basAgvMast.getTimestamp().toString();
+        PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getSourceStaNo()));
+        positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassSou);
+        PositionCodePathClass positionCodePathClassEnd = new PositionCodePathClass();
+        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo()));
+        positionCodePathClassEnd.setPositionCode(basAgvLocNoEnd.getAgvLocNo());
+        this.positionCodePath.add(positionCodePathClassEnd);
 
     }
 }
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/BasDevpErrorLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpErrorLogMapper.java
new file mode 100644
index 0000000..94d4767
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpErrorLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDevpErrorLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDevpErrorLogMapper extends BaseMapper<BasDevpErrorLog> {
+
+}
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/BasDevpErrorLogService.java b/src/main/java/com/zy/asrs/service/BasDevpErrorLogService.java
new file mode 100644
index 0000000..085809e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDevpErrorLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDevpErrorLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDevpErrorLogService extends IService<BasDevpErrorLog> {
+
+}
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/BasDevpErrorLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpErrorLogServiceImpl.java
new file mode 100644
index 0000000..e1cfb21
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpErrorLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDevpErrorLogMapper;
+import com.zy.asrs.entity.BasDevpErrorLog;
+import com.zy.asrs.service.BasDevpErrorLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDevpErrorLogService")
+public class BasDevpErrorLogServiceImpl extends ServiceImpl<BasDevpErrorLogMapper, BasDevpErrorLog> implements BasDevpErrorLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2fa2bdb..f086254 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3557,6 +3557,7 @@
             WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWorkSta(1, (int) rgvProtocol.getRgvNo());
             if(wrkMastSta1 != null && wrkMastSta2 != null){
                 rgvThread.setPakMk(false);  //灏忚溅鍙屽伐浣嶉攣瀹�
+
             }
 //            if(basRgv.getPakToCrn().equals("0")){
 //                rgvRunWrkToCrn(rgv, rgvProtocol,mark); //鑻ュ皬杞﹀彇鍒颁竴涓帴椹充换鍔★紝绗簩涓伐浣嶅彧鑳藉彇鎺ラ┏浠诲姟
@@ -4538,9 +4539,20 @@
                                                 .eq("status", 2)
                                                 .eq("binding_tags", basArmMast.getBindingTags())
                                 );
+
                                 if (binding_tags<2){
-                                    armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦紒锛侊紒", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮佹暟鎹鍦ㄨ嚜鍔ㄧ粍鎵�===>>" + barcode, false);
-                                    continue;
+                                    BasArmMast basArmMastOne = basArmMastService.selectOne(
+                                            new EntityWrapper<BasArmMast>()
+                                                    .eq("status", 2)
+                                                    .eq("binding_tags", basArmMast.getBindingTags())
+                                    );
+                                    Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getSku(),basArmMastOne.getBindingTags());
+
+                                    if (anfmeSignOne>1D){
+                                        armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦紒锛侊紒", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮佹暟鎹鍦ㄨ嚜鍔ㄧ粍鎵�===>>" + barcode, false);
+                                        continue;
+                                    }
+
                                 }
                             }
                             OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
@@ -4620,7 +4632,7 @@
         try{
             List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
             for (BasAgvMast basAgvMast : basAgvMastList) {
-                if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=0){//0==銆婣GV搴撲綅==銆嬭緭閫佺嚎绔欑偣
+                if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=0){//0==銆婣GV搴撲綅==銆嬭緭閫佺嚎绔欑偣
                     continue;
                 }
                 try{
@@ -4638,7 +4650,7 @@
                         AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
 
                         //浠诲姟涓嬪彂
-                        ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+                        ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
                         if (result.getCode()==200){
                             basAgvMast.setStatus(1);
                             basAgvMastService.updateById(basAgvMast);
@@ -4662,14 +4674,14 @@
         try{
             List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
             for (BasAgvMast basAgvMast : basAgvMastList) {
-                if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=1){//1==銆婣GV搴撲綅==銆婣GV搴撲綅
+                if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=1){//1==銆婣GV搴撲綅==銆婣GV搴撲綅
                     continue;
                 }
                 try{
-                    AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+                    AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
 
                     //浠诲姟涓嬪彂
-                    ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+                    ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
                     if (result.getCode()==200){
                         basAgvMast.setStatus(1);
                         basAgvMastService.updateById(basAgvMast);
@@ -4693,7 +4705,7 @@
         try{
             List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
             for (BasAgvMast basAgvMast : basAgvMastList) {
-                if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=2){//2==銆嬭緭閫佺嚎绔欑偣==銆婣GV搴撲綅
+                if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=2){//2==銆嬭緭閫佺嚎绔欑偣==銆婣GV搴撲綅
                     continue;
                 }
                 try{
@@ -4708,10 +4720,10 @@
 
                     if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){
 
-                        AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+                        AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
 
                         //浠诲姟涓嬪彂
-                        ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+                        ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
                         if (result.getCode()==200){
                             basAgvMast.setStatus(1);
                             basAgvMastService.updateById(basAgvMast);
@@ -4735,7 +4747,7 @@
         try{
             List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
             for (BasAgvMast basAgvMast : basAgvMastList) {
-                if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=3){//3==銆嬭緭閫佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣
+                if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=3){//3==銆嬭緭閫佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣
                     continue;
                 }
                 try{
@@ -4757,10 +4769,10 @@
 
                     if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){
 
-                        AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+                        AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
 
                         //浠诲姟涓嬪彂
-                        ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+                        ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
                         if (result.getCode()==200){
                             basAgvMast.setStatus(1);
                             basAgvMastService.updateById(basAgvMast);
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 6fd078e..5bb6085 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -118,6 +118,60 @@
         }
         return SUCCESS;
     }
+    public ReturnT<String> postMesDataAgv(String name, String URL, String mesPath, Object combParam){
+//        if (true){
+//            System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+//            return SUCCESS;
+//        }
+        if(combParam != null){
+            String response = "";
+            boolean success = false;
+            try {
+//                Map<String, Object> map = new HashMap<>()
+//                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+                response = new HttpHandler.Builder()
+//                        .setHeaders(map)
+                        .setUri(URL)
+                        .setPath(mesPath)
+                        .setJson(JSON.toJSONString(combParam))
+                        .build()
+                        .doPost();
+                System.out.println("response:"+response);
+                JSONObject jsonObject = JSON.parseObject(response);
+
+                if (jsonObject.getInteger("code").equals(0)) {
+                    success = true;
+                } else {
+                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+                    throw new CoolException(name);
+                }
+            } catch (Exception e) {
+                log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+//                      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return FAIL.setMsg(e.getMessage());
+            } finally {
+                try {
+                    if (success){
+                        // 淇濆瓨鎺ュ彛鏃ュ織
+                        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+                        apiLogService.save(
+                                name,
+                                URL +"/"+ mesPath,
+                                null,
+                                "127.0.0.1",
+                                JSON.toJSONString(combParam),
+                                response,
+                                success
+                        );
+                    } else {
+                        postMesDataCallApiLogSave(response,success,name, URL, mesPath, combParam);
+                    }
+                } catch (Exception e) {
+                    log.error("", e); }
+            }
+        }
+        return SUCCESS;
+    }
 
     public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam,Map<String, Object> map){
 //        if (true){
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index fa2e16b..1ba8237 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="localhost:1433;databasename=jshdasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_bas_agv_mast";
+        generator.table="asr_bas_agv_loc_no";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/java/com/zy/common/constant/AgvConstant.java b/src/main/java/com/zy/common/constant/AgvConstant.java
index f31c8e5..5ac7c5f 100644
--- a/src/main/java/com/zy/common/constant/AgvConstant.java
+++ b/src/main/java/com/zy/common/constant/AgvConstant.java
@@ -5,11 +5,10 @@
  * */
 public class AgvConstant {
 
-    public static final String AGV_IP = "10.10.10.171";
-    public static final String AGV_URL = "http://10.10.10.171:7002";
+    public static final String AGV_IP = "10.10.10.200";
+    public static final String AGV_URL = "http://10.10.10.200:8181";
 
-    public static final String AGV_ADAPTOR = "adaptor/api/wcs/order";//鍒涘缓璁㈠崟
+    public static final String AGV_ADAPTOR = "rcms/services/rest/hikRpcService/genAgvSchedulingTask";//鍒涘缓璁㈠崟
 
-    public static final String AGV_WORKSPACE = "adaptor/api/wcs/workspace/ready";//閫氱煡宸ヤ綔绌洪棿宸插氨缁�
 
 }
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 31dc607..52dd97c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,7 @@
 package com.zy.core.model.protocol;
 
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasDevpErrorLog;
 import lombok.Data;
 
 import java.util.HashMap;
@@ -114,10 +115,53 @@
 
     // 鏁呴殰璇诲彇閿佸畾鏍囪
     private boolean errorMk = false;
-
+    //鍐欏叆鏍囪
+    private boolean writeMk = true;
     private Boolean passTimeOut = false; //鐗╀綋杩涘嚭瓒呮椂
+    private Boolean objectNoIdError = false; //鏈夌墿浣撴棤鏁版嵁
+    private Boolean idNoObjectError = false; //鏈夋暟鎹棤鐗╀綋
+    private Boolean lmfrError = false; //绾夸綋鐢垫満鐑户鎶ヨ
+    private Boolean liftError = false; //椤跺崌鎶ヨ
+    private Boolean dlfrError = false; //椤跺崌鐢垫満鐑户鎶ヨ
+    private Boolean dmfrError = false; //椤跺崌妯Щ鐢垫満鐑户鎶ヨ
+    private Boolean vfdError = false; //鍙橀鏁呴殰
+    private Boolean srvError = false; //浼烘湇鏁呴殰
+    private Boolean res1 = false; //棰勭暀1
+    private Boolean res2 = false; //棰勭暀2
+    private Boolean res3 = false; //棰勭暀3
+    private Boolean communicationTimeOut = false; //涓庝笂浣嶆満閫氳瓒呮椂
+    private Boolean parameterIncompleteError = false; //淇℃伅鍙傛暟涓嶅叏
+    private Boolean dataNotClear = false; //淇℃伅鏁版嵁鏈竻闄�
+    private Boolean setParameterError = false; //鍙傛暟璁剧疆鎶ヨ
+    private Boolean res4 = false; //棰勭暀4
+    private Boolean res5 = false; //棰勭暀5
+    private Boolean dataError = false; //鏁版嵁閿欒
 
-//    private
+    public BasDevpErrorLog toSqlModelError(){
+        BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog();
+        basDevpErrorLog.setDevNo(siteId);
+        basDevpErrorLog.setPassTimeOut(passTimeOut?"Y":"N");
+        basDevpErrorLog.setObjectNoIdError(objectNoIdError?"Y":"N");
+        basDevpErrorLog.setIdNoObjectError(idNoObjectError?"Y":"N");
+        basDevpErrorLog.setLmfrError(lmfrError?"Y":"N");
+        basDevpErrorLog.setLiftError(liftError?"Y":"N");
+        basDevpErrorLog.setDlfrError(dlfrError?"Y":"N");
+        basDevpErrorLog.setDmfrError(dmfrError?"Y":"N");
+        basDevpErrorLog.setVfdError(vfdError?"Y":"N");
+        basDevpErrorLog.setSrvError(srvError?"Y":"N");
+        basDevpErrorLog.setRes1(res1?"Y":"N");
+        basDevpErrorLog.setRes2(res2?"Y":"N");
+        basDevpErrorLog.setRes3(res3?"Y":"N");
+        basDevpErrorLog.setCommunicationTimeOut(communicationTimeOut?"Y":"N");
+        basDevpErrorLog.setParameterIncompleteError(parameterIncompleteError?"Y":"N");
+        basDevpErrorLog.setDataNotClear(dataNotClear?"Y":"N");
+        basDevpErrorLog.setSetParameterError(setParameterError?"Y":"N");
+        basDevpErrorLog.setInEnable(res4?"Y":"N");
+        basDevpErrorLog.setOutEnable(res5?"Y":"N");
+        basDevpErrorLog.setDataError(dataError?"Y":"N");
+        return basDevpErrorLog;
+    }
+
 
     public Boolean isErr(){
         if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 56b2d9b..83db7d4 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,14 +9,8 @@
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasDevpOpt;
-import com.zy.asrs.entity.BasRgvMap;
-import com.zy.asrs.entity.BasRgvOpt;
-import com.zy.asrs.service.BasDevpOptService;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasRgvMapService;
-import com.zy.asrs.service.BasRgvOptService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
 import com.zy.common.utils.News;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
@@ -62,7 +56,7 @@
         add(1022);add(1024);
         add(1025);add(1026);add(1028);
         add(1029);add(1031);
-        add(1032);add(1033);add(1035);
+        add(1032);add(1033);add(1034);add(1035);
         add(1036);add(1037);add(1038);
         add(1039);add(1040);add(1041);
         add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);
@@ -411,7 +405,7 @@
         OperateResultExOne<byte[]> result4 = null;//1054-1079
         OperateResultExOne<byte[]> result5 = null;//1080-1110
         OperateResultExOne<byte[]> resultErr = null;
-        if(staNoSize == 99){
+        if(staNoSize == 100){
             result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
             result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
             result3 = siemensS7Net.Read("DB104.0", (short) (1268));//1042-1053
@@ -439,7 +433,7 @@
                     station.put(siteId, staProtocol);
                 }
                 staProtocol.setSiteId(siteId);
-                if (staNoSize == 99) {
+                if (staNoSize == 100) {
                     if (siteId < 1029) {
                         result = result1;
                     } else if (siteId < 1042) {
@@ -498,10 +492,9 @@
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 1);
                 staProtocol.setAutoing(!status[0]);  // 鑷姩
                 boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
-                boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + 54, 1);
+                boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
                 boolean loading = false;
                 if(!status1[0])
-//                        && statusErr[2])
                 {
                     loading = true;
                 }
@@ -510,12 +503,71 @@
                 staProtocol.setInEnable(status1[2]); // 鍙叆
                 staProtocol.setOutEnable(status1[2]);// 鍙嚭
                 staProtocol.setErr(status1[6]);
-//                staProtocol.setInEnable(status1[1]); // 鍙叆
-//                staProtocol.setOutEnable(status1[3]);// 鍙嚭
-//                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-//                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-//                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-//                staProtocol.setLow(status[7]);      // 浣庡簱浣�
+
+                staProtocol.setPassTimeOut(statusErr[0]);
+                staProtocol.setObjectNoIdError(statusErr[1]);
+                staProtocol.setIdNoObjectError(statusErr[2]);
+                staProtocol.setLmfrError(statusErr[3]);
+                staProtocol.setLiftError(statusErr[4]);
+                staProtocol.setDlfrError(statusErr[5]);
+                staProtocol.setDmfrError(statusErr[6]);
+                staProtocol.setVfdError(statusErr[7]);
+                staProtocol.setSrvError(statusErr[8]);
+                staProtocol.setRes1(statusErr[9]);
+                staProtocol.setRes2(statusErr[10]);
+                staProtocol.setRes3(statusErr[11]);
+                staProtocol.setCommunicationTimeOut(statusErr[12]);
+                staProtocol.setParameterIncompleteError(statusErr[13]);
+                staProtocol.setDataNotClear(statusErr[14]);
+                staProtocol.setSetParameterError(statusErr[15]);
+                staProtocol.setRes4(statusErr[16]);
+                staProtocol.setRes5(statusErr[17]);
+                staProtocol.setDataError(statusErr[18]);
+
+                if( (staProtocol.getPassTimeOut() ||
+                    staProtocol.getObjectNoIdError() ||
+                        staProtocol.getIdNoObjectError() ||
+                        staProtocol.getLmfrError() ||
+                        staProtocol.getLiftError() ||
+                        staProtocol.getDlfrError() ||
+                        staProtocol.getDmfrError() ||
+                        staProtocol.getVfdError() ||
+                        staProtocol.getSrvError() ||
+                        staProtocol.getRes1() ||
+                        staProtocol.getRes2() ||
+                        staProtocol.getRes3() ||
+                        staProtocol.getCommunicationTimeOut() ||
+                        staProtocol.getParameterIncompleteError() ||
+                        staProtocol.getDataNotClear() ||
+                        staProtocol.getSetParameterError() ||
+                        staProtocol.getDataError()) && staProtocol.isWriteMk()
+                ){
+                    staProtocol.setErrorMk(true);//鑻ュ瓨鍦ㄥ紓甯歌Е鍙戝啓鍏�
+                }
+
+                if(     !staProtocol.getPassTimeOut() &&
+                        !staProtocol.getObjectNoIdError() &&
+                        !staProtocol.getIdNoObjectError() &&
+                        !staProtocol.getLmfrError() &&
+                        !staProtocol.getLiftError() &&
+                        !staProtocol.getDlfrError() &&
+                        !staProtocol.getDmfrError() &&
+                        !staProtocol.getVfdError() &&
+                        !staProtocol.getSrvError() &&
+                        !staProtocol.getRes1() &&
+                        !staProtocol.getRes2() &&
+                        !staProtocol.getRes3() &&
+                        !staProtocol.getCommunicationTimeOut() &&
+                        !staProtocol.getParameterIncompleteError() &&
+                        !staProtocol.getDataNotClear() &&
+                        !staProtocol.getSetParameterError() &&
+                        !staProtocol.getDataError()
+                ){
+                    staProtocol.setWriteMk(true);//鏃犲紓甯稿悗鎵嶈兘缁х画鍐欏叆
+                    staProtocol.setErrorMk(false);//鑻ュ瓨鍦ㄥ紓甯歌Е鍙戝啓鍏�
+
+                }
+
 
                 if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || staProtocol.getWorkNo()==0)) {
                     staProtocol.setPakMk(true);
@@ -589,12 +641,27 @@
                 for (Integer siteId : staNos) {
                     StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
-                }
+                    if(staProtocol.isWriteMk() && staProtocol.isErrorMk()){
+                        try {
+                            // 鏃ュ織璁板綍寮傚父鎯呭喌
+                            BasDevpErrorLog basDevpErrorLogs = new BasDevpErrorLog();
+                            basDevpErrorLogs = staProtocol.toSqlModelError();
+                            BasDevpErrorLogService basDevpErrorLogService = SpringUtils.getBean(BasDevpErrorLogService.class);
+                            basDevpErrorLogService.insert(basDevpErrorLogs);
+                            staProtocol.setWriteMk(false);
+                        } catch (Exception ignore) {
+                            log.error(ignore.getMessage());
+                        }
+                    }
 
+                }
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+
                 if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                     throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
                 }
+
+
             } catch (Exception e) {
                 initSite();
                 e.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 05f2a46..6f40ab4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -69,7 +69,7 @@
       bay: 52
       lev: 1
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2004
       row: 3
       bay: 52
@@ -82,7 +82,7 @@
       bay: 52
       lev: 1
     crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2001
       row: 2
       bay: 52
@@ -105,7 +105,7 @@
       bay: 52
       lev: 1
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2010
       row: 7
       bay: 52
@@ -118,7 +118,7 @@
       bay: 52
       lev: 1
     crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2007
       row: 6
       bay: 52
@@ -141,17 +141,18 @@
       bay: 52
       lev: 1
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2016
-      row: 10
+      row: 11
       bay: 52
       lev: 2
     crnInStn[2]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 4001
-      row: 10
+      row: 9
       bay: 52
-      lev: 4
+      lev: 3
+
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
@@ -160,17 +161,17 @@
       bay: 52
       lev: 1
     crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2013
-      row: 11
+      row: 9
       bay: 52
       lev: 2
     crnOutStn[2]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 4004
       row: 11
       bay: 52
-      lev: 4
+      lev: 3
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
@@ -189,7 +190,7 @@
       bay: 52
       lev: 1
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2022
       row: 15
       bay: 52
@@ -202,8 +203,8 @@
       bay: 52
       lev: 1
     crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 1022
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2019
       row: 14
       bay: 52
       lev: 2
@@ -225,7 +226,7 @@
       bay: 52
       lev: 1
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2028
       row: 19
       bay: 52
@@ -238,7 +239,7 @@
       bay: 52
       lev: 1
     crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 2025
       row: 18
       bay: 52
@@ -441,7 +442,7 @@
     inSta[1]:
       staNo: 1036
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 1035
+      backSta: 1037
       led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
@@ -483,7 +484,7 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 2035
+      staNo: 2037
       barcode: ${wcs-slave.barcode[3].id}
       backSta: 2034
       led: ${wcs-slave.led[5].id}
@@ -493,18 +494,18 @@
 #      barcode: ${wcs-slave.barcode[0].id}
 #      backSta: 105
 #      led: ${wcs-slave.led[1].id}
-#    # 鎷ｆ枡鍏ュ簱鍙�1
-#    pickSta[0]:
-#      staNo: 159
-#      barcode: ${wcs-slave.barcode[2].id}
-#      led: ${wcs-slave.led[5].id}
-#      backSta: 160
+    # 鎷ｆ枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 4001
+      barcode: ${wcs-slave.barcode[4].id}
+      led: ${wcs-slave.led[4].id}
+      backSta: 4003
     # 鍏ュ簱鍙�1
     inSta[1]:
       staNo: 4001
       barcode: ${wcs-slave.barcode[4].id}
       backSta: 4003
-      led: ${wcs-slave.led[6].id}
+      led: ${wcs-slave.led[4].id}
 #    # 绌烘澘鍏ュ簱鍙�1
 #    emptyInSta[1]:
 #      staNo: 107
@@ -525,11 +526,11 @@
     #      backSta: 108
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 2033
+      staNo: 2031
 #      led: ${wcs-slave.led[0].id}
     outSta[1]:
       staNo: 4006
-      led: ${wcs-slave.led[7].id}
+      led: ${wcs-slave.led[5].id}
 #    outSta[2]:
 #      staNo: 156
 #      led: ${wcs-slave.led[4].id}
@@ -591,22 +592,22 @@
     id: 4
     ip: 10.10.10.215
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 152
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 2037
   # LED5
   led[4]:
     id: 5
     ip: 10.10.10.216
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 156
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 4001
   # LED6
   led[5]:
     id: 6
     ip: 10.10.10.217
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 160,159
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 4006
   # LED6
   led[6]:
     id: 7
diff --git a/src/main/resources/mapper/BasAgvLocNoMapper.xml b/src/main/resources/mapper/BasAgvLocNoMapper.xml
new file mode 100644
index 0000000..ea0e72e
--- /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">
+        <result 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/BasDevpErrorLogMapper.xml b/src/main/resources/mapper/BasDevpErrorLogMapper.xml
new file mode 100644
index 0000000..b101f58
--- /dev/null
+++ b/src/main/resources/mapper/BasDevpErrorLogMapper.xml
@@ -0,0 +1,32 @@
+<?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.BasDevpErrorLogMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevpErrorLog">
+        <result column="dev_no" property="devNo" />
+        <result column="pass_time_out" property="passTimeOut" />
+        <result column="object_no_id_error" property="objectNoIdError" />
+        <result column="id_no_object_error" property="idNoObjectError" />
+        <result column="lmfr_error" property="lmfrError" />
+        <result column="lift_error" property="liftError" />
+        <result column="dlfr_error" property="dlfrError" />
+        <result column="dmfr_error" property="dmfrError" />
+        <result column="vfd_error" property="vfdError" />
+        <result column="srv_error" property="srvError" />
+        <result column="res1" property="res1" />
+        <result column="res2" property="res2" />
+        <result column="res3" property="res3" />
+        <result column="communication_time_out" property="communicationTimeOut" />
+        <result column="parameter_incomplete_error" property="parameterIncompleteError" />
+        <result column="data_not_clear" property="dataNotClear" />
+        <result column="set_parameter_error" property="setParameterError" />
+        <result column="create_time" property="createTime" />
+        <result column="in_enable" property="inEnable" />
+        <result column="out_enable" property="outEnable" />
+        <result column="data_error" property="dataError" />
+        <result column="id" property="id" />
+
+    </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/basDevpErrorLog/basDevpErrorLog.js b/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js
new file mode 100644
index 0000000..7c8ab75
--- /dev/null
+++ b/src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js
@@ -0,0 +1,270 @@
+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: '#basDevpErrorLog',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basDevpErrorLog/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'devNo', align: 'center',title: '杈撻�佺紪鍙�'}
+            ,{field: 'passTimeOut', align: 'center',title: '鐗╀綋杩�/鍑鸿秴鏃�'}
+            ,{field: 'objectNoIdError', align: 'center',title: '鏈夌墿浣撴棤鏁版嵁'}
+            ,{field: 'idNoObjectError', align: 'center',title: '鏈夋暟鎹棤鐗╀綋'}
+            ,{field: 'lmfrError', align: 'center',title: '绾夸綋鐢垫満鐑户鎶ヨ'}
+            ,{field: 'liftError', align: 'center',title: '椤跺崌鎶ヨ'}
+            ,{field: 'dlfrError', align: 'center',title: '椤跺崌鐢垫満鐑户鎶ヨ'}
+            ,{field: 'dmfrError', align: 'center',title: '椤跺崌妯Щ鐢垫満鐑户鎶ヨ'}
+            ,{field: 'vfdError', align: 'center',title: '鍙橀鏁呴殰'}
+            ,{field: 'srvError', align: 'center',title: '浼烘湇鏁呴殰'}
+            ,{field: 'res1', align: 'center',title: '棰勭暀1'}
+            ,{field: 'res2', align: 'center',title: '棰勭暀2'}
+            ,{field: 'res3', align: 'center',title: '棰勭暀3'}
+            ,{field: 'communicationTimeOut', align: 'center',title: '涓庝笂浣嶆満閫氳瓒呮椂'}
+            ,{field: 'parameterIncompleteError', align: 'center',title: '淇℃伅鍙傛暟涓嶅叏'}
+            ,{field: 'dataNotClear', align: 'center',title: '淇℃伅鏁版嵁鏈竻闄�'}
+            ,{field: 'setParameterError', align: 'center',title: '鍙傛暟璁剧疆鎶ヨ'}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            ,{field: 'inEnable', align: 'center',title: ''}
+            ,{field: 'outEnable', align: 'center',title: ''}
+            ,{field: 'dataError', 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(basDevpErrorLog)', 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(basDevpErrorLog)', 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 = {
+                        'basDevpErrorLog': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basDevpErrorLog/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(basDevpErrorLog)', 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+"/basDevpErrorLog/"+(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+"/basDevpErrorLog/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: '#createTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['createTime\\$']: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/basDevpErrorLog/basDevpErrorLog.html b/src/main/webapp/views/basDevpErrorLog/basDevpErrorLog.html
new file mode 100644
index 0000000..784338c
--- /dev/null
+++ b/src/main/webapp/views/basDevpErrorLog/basDevpErrorLog.html
@@ -0,0 +1,212 @@
+<!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="basDevpErrorLog" lay-filter="basDevpErrorLog"></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/basDevpErrorLog/basDevpErrorLog.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">杈撻�佺紪鍙�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="devNo" placeholder="璇疯緭鍏ヨ緭閫佺紪鍙�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐗╀綋杩�/鍑鸿秴鏃�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="passTimeOut" placeholder="璇疯緭鍏ョ墿浣撹繘/鍑鸿秴鏃�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鏈夌墿浣撴棤鏁版嵁: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="objectNoIdError" placeholder="璇疯緭鍏ユ湁鐗╀綋鏃犳暟鎹�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鏈夋暟鎹棤鐗╀綋: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="idNoObjectError" placeholder="璇疯緭鍏ユ湁鏁版嵁鏃犵墿浣�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">绾夸綋鐢垫満鐑户鎶ヨ: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="lmfrError" placeholder="璇疯緭鍏ョ嚎浣撶數鏈虹儹缁ф姤璀�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">椤跺崌鎶ヨ: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="liftError" placeholder="璇疯緭鍏ラ《鍗囨姤璀�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">椤跺崌鐢垫満鐑户鎶ヨ: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dlfrError" placeholder="璇疯緭鍏ラ《鍗囩數鏈虹儹缁ф姤璀�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">椤跺崌妯Щ鐢垫満鐑户鎶ヨ: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dmfrError" placeholder="璇疯緭鍏ラ《鍗囨í绉荤數鏈虹儹缁ф姤璀�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鍙橀鏁呴殰: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="vfdError" placeholder="璇疯緭鍏ュ彉棰戞晠闅�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">浼烘湇鏁呴殰: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="srvError" placeholder="璇疯緭鍏ヤ己鏈嶆晠闅�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">棰勭暀1: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="res1" placeholder="璇疯緭鍏ラ鐣�1">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">棰勭暀2: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="res2" placeholder="璇疯緭鍏ラ鐣�2">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">棰勭暀3: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="res3" placeholder="璇疯緭鍏ラ鐣�3">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">涓庝笂浣嶆満閫氳瓒呮椂: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="communicationTimeOut" placeholder="璇疯緭鍏ヤ笌涓婁綅鏈洪�氳瓒呮椂">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">淇℃伅鍙傛暟涓嶅叏: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="parameterIncompleteError" placeholder="璇疯緭鍏ヤ俊鎭弬鏁颁笉鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">淇℃伅鏁版嵁鏈竻闄�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dataNotClear" placeholder="璇疯緭鍏ヤ俊鎭暟鎹湭娓呴櫎">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鍙傛暟璁剧疆鎶ヨ: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="setParameterError" placeholder="璇疯緭鍏ュ弬鏁拌缃姤璀�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鍒涘缓鏃堕棿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ュ垱寤烘椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="inEnable" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="outEnable" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="dataError" 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