From d273bcbfb660a4872b8e41b8b4e53607f130f1bc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 十一月 2025 14:35:28 +0800
Subject: [PATCH] #agv转历史档
---
src/main/java/com/zy/asrs/service/BasAgvMastLogService.java | 8
src/main/java/basAgvMastLog.sql | 18 +
src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java | 12
src/main/resources/mapper/BasAgvMastLogMapper.xml | 27 +
src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java | 12
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 14
src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js | 276 +++++++++++++++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 26 +
src/main/webapp/views/basAgvMastLog/basAgvMastLog.html | 193 ++++++++++++
src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java | 125 +++++++
src/main/java/com/zy/asrs/entity/BasAgvMastLog.java | 242 +++++++++++++++
src/main/java/com/zy/common/CodeBuilder.java | 2
12 files changed, 948 insertions(+), 7 deletions(-)
diff --git a/src/main/java/basAgvMastLog.sql b/src/main/java/basAgvMastLog.sql
new file mode 100644
index 0000000..c15531b
--- /dev/null
+++ b/src/main/java/basAgvMastLog.sql
@@ -0,0 +1,18 @@
+-- save basAgvMastLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog/basAgvMastLog.html', 'basAgvMastLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMastLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog/basAgvMastLog.html', N'basAgvMastLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMastLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
new file mode 100644
index 0000000..282cd59
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.zy.asrs.service.BasAgvMastLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasAgvMastLogController extends BaseController {
+
+ @Autowired
+ private BasAgvMastLogService basAgvMastLogService;
+
+ @RequestMapping(value = "/basAgvMastLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basAgvMastLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasAgvMastLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basAgvMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/add/auth")
+ @ManagerAuth
+ public R add(BasAgvMastLog basAgvMastLog) {
+ basAgvMastLogService.insert(basAgvMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/update/auth")
+ @ManagerAuth
+ public R update(BasAgvMastLog basAgvMastLog){
+ if (Cools.isEmpty(basAgvMastLog) || null==basAgvMastLog.getId()){
+ return R.error();
+ }
+ basAgvMastLogService.updateById(basAgvMastLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basAgvMastLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvMastLog"));
+ convert(map, wrapper);
+ List<BasAgvMastLog> list = basAgvMastLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basAgvMastLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasAgvMastLog> page = basAgvMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasAgvMastLog basAgvMastLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basAgvMastLog.getId());
+ map.put("value", basAgvMastLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basAgvMastLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasAgvMastLog> wrapper = new EntityWrapper<BasAgvMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basAgvMastLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasAgvMastLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
new file mode 100644
index 0000000..14fe4e5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
@@ -0,0 +1,242 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_agv_mast_log")
+public class BasAgvMastLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * WMS浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "WMS浠诲姟鍙�")
+ @TableId(value = "task_no", type = IdType.INPUT)
+ @TableField("task_no")
+ private Integer taskNo;
+
+ /**
+ * RGV浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "RGV浠诲姟鍙�")
+ private Long timestamp;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "婧愮珯鐐�")
+ @TableField("source_sta_no")
+ private Integer sourceStaNo;
+
+ /**
+ * 鐩殑绔欑偣
+ */
+ @ApiModelProperty(value= "鐩殑绔欑偣")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ /**
+ * 鐩殑搴撲綅
+ */
+ @ApiModelProperty(value= "鐩殑搴撲綅")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Long priority;
+
+ /**
+ * 妤煎眰
+ */
+ @ApiModelProperty(value= "妤煎眰")
+ @TableField("floor_no")
+ private Integer floorNo;
+
+ /**
+ * 鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚
+ */
+ @ApiModelProperty(value= "鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 ")
+ private Integer status;
+
+ /**
+ * 寮傚父鏃堕棿
+ */
+ @ApiModelProperty(value= "寮傚父鏃堕棿")
+ @TableField("error_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date errorTime;
+
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "寮傚父淇℃伅")
+ @TableField("error_memo")
+ private String errorMemo;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private String modiUser;
+
+ @ApiModelProperty(value= "")
+ @TableField("devp_id")
+ private Integer devpId;
+
+ @ApiModelProperty(value= "")
+ @TableField("io_type")
+ private Integer ioType;
+
+ public BasAgvMastLog() {}
+
+ public BasAgvMastLog(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser,Integer devpId,Integer ioType) {
+ this.taskNo = taskNo;
+ this.timestamp = timestamp;
+ this.sourceStaNo = sourceStaNo;
+ this.staNo = staNo;
+ this.sourceLocNo = sourceLocNo;
+ this.locNo = locNo;
+ this.priority = priority;
+ this.floorNo = floorNo;
+ this.status = status;
+ this.errorTime = errorTime;
+ this.errorMemo = errorMemo;
+ this.appeTime = appeTime;
+ this.modiTime = modiTime;
+ this.modiUser = modiUser;
+ this.devpId = devpId;
+ this.ioType = ioType;
+ }
+
+ public BasAgvMastLog(BasAgvMast basAgvMast) {
+ if (basAgvMast != null) {
+ this.taskNo = basAgvMast.getTaskNo();
+ this.timestamp = basAgvMast.getTimestamp();
+ this.sourceStaNo = basAgvMast.getSourceStaNo();
+ this.staNo = basAgvMast.getStaNo();
+ this.sourceLocNo = basAgvMast.getSourceLocNo();
+ this.locNo = basAgvMast.getLocNo();
+ this.priority = basAgvMast.getPriority();
+ this.floorNo = basAgvMast.getFloorNo();
+ this.status = basAgvMast.getStatus();
+ this.appeTime = new Date();
+ this.ioType = basAgvMast.getIoType();
+ }
+ }
+
+// BasAgvMastLog basAgvMastLog = new BasAgvMastLog(
+// null, // WMS浠诲姟鍙穂闈炵┖]
+// null, // RGV浠诲姟鍙�
+// null, // 婧愮珯鐐�
+// null, // 鐩殑绔欑偣
+// null, // 婧愬簱浣�
+// null, // 鐩殑搴撲綅
+// null, // 浼樺厛绾�
+// null, // 妤煎眰
+// null, // 鐘舵��
+// null, // 寮傚父鏃堕棿
+// null, // 寮傚父淇℃伅
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, //
+// null //
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "浣滀笟涓�";
+ case 2:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getErrorTime$(){
+ if (Cools.isEmpty(this.errorTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java
new file mode 100644
index 0000000..35b104f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvMastLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvMastLogMapper extends BaseMapper<BasAgvMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java b/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java
new file mode 100644
index 0000000..776ea3f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvMastLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvMastLogService extends IService<BasAgvMastLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java
new file mode 100644
index 0000000..eb46e10
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvMastLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvMastLogMapper;
+import com.zy.asrs.entity.BasAgvMastLog;
+import com.zy.asrs.service.BasAgvMastLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvMastLogService")
+public class BasAgvMastLogServiceImpl extends ServiceImpl<BasAgvMastLogMapper, BasAgvMastLog> implements BasAgvMastLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 884015d..23ae220 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasAgvMastService;
import com.zy.asrs.service.BasArmMastLogService;
import com.zy.asrs.service.BasArmMastService;
import com.zy.asrs.service.WrkMastService;
@@ -29,6 +31,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasArmMastService basArmMastService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -68,14 +72,14 @@
@Scheduled(cron = "0/10 * * * * ? ")
private void executeAgv(){
- List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
- if (basArmMastList.isEmpty()) {
+ List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 3));
+ if (basAgvstList.isEmpty()) {
return;
}
- for (BasArmMast basArmMast : basArmMastList) {
- ReturnT<String> result = workLogHandler.startArm(basArmMast);
+ for (BasAgvMast basAgvMast : basAgvstList) {
+ ReturnT<String> result = workLogHandler.startAgv(basAgvMast);
if (!result.isSuccess()) {
- log.error("ARM宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basArmMast.getId());
+ log.error("AGV宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basAgvMast.getId());
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index c2a8a9a..c400bd2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -40,8 +40,11 @@
@Autowired
private BasArmMastLogService basArmMastLogService;
@Autowired
+ private BasAgvMastLogService basAgvMastLogService;
+ @Autowired
private BasArmMastService basArmMastService;
-
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
@@ -148,4 +151,25 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
+ try {
+ BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!basAgvMastLogService.insert(basAgvMastLog)) {
+ exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basAgvMast.getId());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!basAgvMastService.deleteById(basAgvMast)) {
+ exceptionHandle("鍒犻櫎ARM宸ヤ綔涓绘。[id={0}]澶辫触", basAgvMast.getId());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index a13b6e7..22e2d2f 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="10.10.10.235:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_agv_loc_no";
+ generator.table="asr_bas_agv_mast_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/BasAgvMastLogMapper.xml b/src/main/resources/mapper/BasAgvMastLogMapper.xml
new file mode 100644
index 0000000..2e30b0b
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvMastLogMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasAgvMastLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvMastLog">
+ <id column="id" property="id" />
+ <result column="task_no" property="taskNo" />
+ <result column="timestamp" property="timestamp" />
+ <result column="source_sta_no" property="sourceStaNo" />
+ <result column="sta_no" property="staNo" />
+ <result column="source_loc_no" property="sourceLocNo" />
+ <result column="loc_no" property="locNo" />
+ <result column="priority" property="priority" />
+ <result column="floor_no" property="floorNo" />
+ <result column="status" property="status" />
+ <result column="error_time" property="errorTime" />
+ <result column="error_memo" property="errorMemo" />
+ <result column="appe_time" property="appeTime" />
+ <result column="modi_time" property="modiTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="devp_id" property="devpId" />
+ <result column="io_type" property="ioType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js b/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js
new file mode 100644
index 0000000..063882f
--- /dev/null
+++ b/src/main/webapp/static/js/basAgvMastLog/basAgvMastLog.js
@@ -0,0 +1,276 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basAgvMastLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basAgvMastLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�'}
+ ,{field: 'timestamp', align: 'center',title: 'RGV浠诲姟鍙�'}
+ ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'staNo', align: 'center',title: '鐩殑绔欑偣'}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo', align: 'center',title: '鐩殑搴撲綅'}
+ ,{field: 'priority', align: 'center',title: '浼樺厛绾�'}
+ ,{field: 'floorNo', align: 'center',title: '妤煎眰'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'errorTime$', align: 'center',title: '寮傚父鏃堕棿'}
+ ,{field: 'errorMemo', align: 'center',title: '寮傚父淇℃伅'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'devpId', align: 'center',title: ''}
+ ,{field: 'ioType', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basAgvMastLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basAgvMastLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basAgvMastLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basAgvMastLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basAgvMastLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basAgvMastLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basAgvMastLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#errorTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['errorTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html b/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html
new file mode 100644
index 0000000..4f24169
--- /dev/null
+++ b/src/main/webapp/views/basAgvMastLog/basAgvMastLog.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <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="basAgvMastLog" lay-filter="basAgvMastLog"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basAgvMastLog/basAgvMastLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">WMS浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏MS浠诲姟鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">RGV浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="timestamp" placeholder="璇疯緭鍏GV浠诲姟鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩殑绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鐨勭珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩殑搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鐨勫簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼樺厛绾�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="priority" placeholder="璇疯緭鍏ヤ紭鍏堢骇">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">妤煎眰: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="floorNo" placeholder="璇疯緭鍏ユゼ灞�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="0">鍒濆</option>
+ <option value="1">浣滀笟涓�</option>
+ <option value="2">瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errorTime" id="errorTime$" placeholder="璇疯緭鍏ュ紓甯告椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父淇℃伅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errorMemo" placeholder="璇疯緭鍏ュ紓甯镐俊鎭�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="devpId" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1