From 4c938d05b234e6142e94869eaec5e6d86efee382 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 08:33:04 +0800
Subject: [PATCH] #
---
src/main/java/basDevpErrorLog.sql | 18 +
src/main/java/com/zy/asrs/controller/OpenController.java | 7
src/main/webapp/views/basAgvMast/basAgvMast.html | 14
src/main/java/com/zy/asrs/service/BasDevpErrorLogService.java | 8
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 9
src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java | 1
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java | 125 +++++++
src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java | 217 +++++++++++++
src/main/resources/mapper/BasDevpErrorLogMapper.xml | 32 ++
src/main/java/com/zy/asrs/controller/BasAgvMastController.java | 9
src/main/webapp/views/basDevpErrorLog/basDevpErrorLog.html | 212 +++++++++++++
src/main/java/com/zy/asrs/mapper/BasDevpErrorLogMapper.java | 12
src/main/java/com/zy/asrs/service/impl/BasDevpErrorLogServiceImpl.java | 12
src/main/webapp/static/js/basArmMastSign/basArmMastSign.js | 1
src/main/webapp/static/js/basArmMast/basArmMast.js | 4
src/main/webapp/static/js/basDevpErrorLog/basDevpErrorLog.js | 270 ++++++++++++++++
17 files changed, 935 insertions(+), 18 deletions(-)
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/BasAgvMastController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
index f210422..ea3e419 100644
--- a/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastController.java
@@ -4,13 +4,10 @@
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.core.common.*;
import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.service.BasAgvMastService;
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.*;
@@ -62,6 +59,10 @@
@RequestMapping(value = "/basAgvMast/add/auth")
@ManagerAuth
public R add(BasAgvMast basAgvMast) {
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ long nextId = snowflakeIdWorker.nextId();
+ basAgvMast.setTimestamp(nextId);
+ basAgvMast.setDevpId(1);
basAgvMastService.insert(basAgvMast);
return R.ok();
}
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..11a8ec2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.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/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDevpErrorLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDevpErrorLog/add/auth")
+ @ManagerAuth
+ public R add(BasDevpErrorLog basDevpErrorLog) {
+ basDevpErrorLogService.insert(basDevpErrorLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDevpErrorLog/update/auth")
+ @ManagerAuth
+ public R update(BasDevpErrorLog basDevpErrorLog){
+ if (Cools.isEmpty(basDevpErrorLog) || null==basDevpErrorLog.getId()){
+ return R.error();
+ }
+ basDevpErrorLogService.updateById(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/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDevpErrorLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDevpErrorLog"));
+ convert(map, wrapper);
+ List<BasDevpErrorLog> list = basDevpErrorLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDevpErrorLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDevpErrorLog> wrapper = new EntityWrapper<>();
+ wrapper.like("dev_no", condition);
+ Page<BasDevpErrorLog> page = basDevpErrorLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDevpErrorLog basDevpErrorLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDevpErrorLog.getId());
+ map.put("value", basDevpErrorLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @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/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cff1c14..e2e0f5b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -413,9 +413,12 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("WMS浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getReqCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
}
+ String reqCode = param.getReqCode();
+ String[] split = reqCode.split("-");
+ param.setTaskNo(Integer.parseInt(split[0]));
// if (Cools.isEmpty(param.getTimestamp())) {
// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
// }
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index 9eadf69..62774fa 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SnowflakeIdWorker;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -29,7 +31,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "task_no", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -138,7 +140,10 @@
@TableField("io_type")
private Integer ioType;
- public BasAgvMast() {}
+ public BasAgvMast() {
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ this.timestamp = snowflakeIdWorker.nextId();
+ }
public BasAgvMast(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser) {
this.taskNo = taskNo;
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..a5719a7
--- /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/TaskAgvReportParam.java b/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
index 1a80e00..65717dc 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskAgvReportParam.java
@@ -9,6 +9,7 @@
public class TaskAgvReportParam {
//WMS浠诲姟鍙�
private int taskNo;
+ private String reqCode;
//RGV浠诲姟鍙�
private Long timestamp;
//
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/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/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/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 943f2f0..51a22e2 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="10.10.10.235:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_agv_mast";
+ generator.table="asr_bas_devp_error_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
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/basArmMast/basArmMast.js b/src/main/webapp/static/js/basArmMast/basArmMast.js
index 3f8c188..e1f3292 100644
--- a/src/main/webapp/static/js/basArmMast/basArmMast.js
+++ b/src/main/webapp/static/js/basArmMast/basArmMast.js
@@ -21,8 +21,8 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- // {type: 'checkbox'}
- // ,
+ {type: 'checkbox'}
+ ,
{field: 'id', align: 'center',title: 'ID',hide: true}
,{field: 'armNo', align: 'center',title: '鏈烘鑷傜紪鍙�',hide: false}
,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�',hide: false}
diff --git a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
index 7e0ceb8..2450c70 100644
--- a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
+++ b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
@@ -30,6 +30,7 @@
,{field: 'sku', align: 'center',title: 'sku',hide: false}
,{field: 'po', align: 'center',title: 'po',hide: false}
,{field: 'upc', align: 'center',title: 'upc',hide: false}
+ ,{field: 'anfme', align: 'center',title: '鏍囪鏁伴噺',hide: false}
,{field: 'supplier', align: 'center',title: '璐ф簮',hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
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..4871480
--- /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',hide: true}
+ ,{field: 'res2', align: 'center',title: '棰勭暀2',hide: true}
+ ,{field: 'res3', align: 'center',title: '棰勭暀3',hide: true}
+ ,{field: 'communicationTimeOut', align: 'center',title: '涓庝笂浣嶆満閫氳瓒呮椂'}
+ ,{field: 'parameterIncompleteError', align: 'center',title: '淇℃伅鍙傛暟涓嶅叏'}
+ ,{field: 'dataNotClear', align: 'center',title: '淇℃伅鏁版嵁鏈竻闄�'}
+ ,{field: 'setParameterError', align: 'center',title: '鍙傛暟璁剧疆鎶ヨ'}
+ ,{field: 'inEnable', align: 'center',title: '',hide: true}
+ ,{field: 'outEnable', align: 'center',title: '',hide: true}
+ ,{field: 'dataError', align: 'center',title: '鏁版嵁閿欒'}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120,hide: true}
+ ]],
+ 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/basAgvMast/basAgvMast.html b/src/main/webapp/views/basAgvMast/basAgvMast.html
index 0554816..97cdf44 100644
--- a/src/main/webapp/views/basAgvMast/basAgvMast.html
+++ b/src/main/webapp/views/basAgvMast/basAgvMast.html
@@ -72,12 +72,12 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">WMS浠诲姟鍙�: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">WMS浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">RGV浠诲姟鍙�: </label>-->
<!-- <div class="layui-input-block">-->
@@ -123,7 +123,7 @@
<div class="layui-form-item">
<label class="layui-form-label">浠诲姟绫诲瀷: </label>
<div class="layui-input-block">
- <select name="status">
+ <select name="ioType">
<option value="">璇烽�夋嫨</option>
<option value="0">AGV搴撲綅==銆嬭緭閫佺珯鐐�</option>
<option value="1">AGV搴撲綅==銆婣GV搴撲綅</option>
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"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></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