From 37f97c17a695aacd4f658eb86483558ba62374cd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 17:56:13 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 241 ++++++++++++
src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js | 36
src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js | 276 ++++++++++++++
src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java | 9
src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html | 206 ++++++++++
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 58 ++
src/main/resources/mapper/WrkMastExecuteLogMapper.xml | 27 +
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 11
src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java | 14
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java | 16
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 4
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 1
src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java | 125 ++++++
src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java | 48 ++
src/main/webapp/views/wrkMastExecute/wrkMastExecute.html | 18
src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java | 16
17 files changed, 1,055 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index f6439dd..bb077b8 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -6,7 +6,10 @@
import com.core.annotations.AppAuth;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.AppAuthUtil;
@@ -53,6 +56,10 @@
AgvWrkMastService agvWrkMastService;
@Autowired
ApiLogService apiLogService;
+ @Autowired
+ private WrkMastExecuteService wrkMastExecuteService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
@PostMapping("/task/event/status")
@AppAuth(memo = "ESS浠诲姟鍥炶皟")
@@ -83,24 +90,41 @@
return R.error("浠诲姟缂栧彿閿欒");
}
}
+ if (agvWrkMast.getIoType().equals(121)){
+ try{
+ if (agvWrkMast.getWrkSts().equals(12L)){
+ WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo));
+ if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){
+ return R.error("浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$());
+ } else {
+ wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+ wrkMastExecuteService.updateById(wrkMastExecute);
+ }
+ }else {
+ return R.error("浠诲姟寮傚父");
+ }
+ }catch (Exception e){
+ return R.error(""+e.getMessage());
+ }
+ }else {
+ if(agvWrkMast.getWrkSts() >= 205){
+ return R.error("褰撳墠浠诲姟宸插畬鎴�");
+ }
- if(agvWrkMast.getWrkSts() >= 205){
- return R.error("褰撳墠浠诲姟宸插畬鎴�");
- }
-
- AgvTask agvTask = AgvTask.valueOf(param.getMethod());
- Class<AgvTask> clz = AgvTask.class;
- try {
- Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class);
- method.invoke(agvTask,agvWrkMast,param);
- } catch (NoSuchMethodException e) {
- return R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
- } catch (InvocationTargetException e) {
- log.error(e.getMessage());
- return R.error();
- } catch (IllegalAccessException e) {
- log.error(e.getMessage());
- return R.error();
+ AgvTask agvTask = AgvTask.valueOf(param.getMethod());
+ Class<AgvTask> clz = AgvTask.class;
+ try {
+ Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class);
+ method.invoke(agvTask,agvWrkMast,param);
+ } catch (NoSuchMethodException e) {
+ return R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
+ } catch (InvocationTargetException e) {
+ log.error(e.getMessage());
+ return R.error();
+ } catch (IllegalAccessException e) {
+ log.error(e.getMessage());
+ return R.error();
+ }
}
return new R(0, "鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
new file mode 100644
index 0000000..e600c13
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.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.WrkMastExecuteLog;
+import com.zy.asrs.service.WrkMastExecuteLogService;
+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 WrkMastExecuteLogController extends BaseController {
+
+ @Autowired
+ private WrkMastExecuteLogService wrkMastExecuteLogService;
+
+ @RequestMapping(value = "/wrkMastExecuteLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastExecuteLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLog/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<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastExecuteLogService.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 = "/wrkMastExecuteLog/add/auth")
+ @ManagerAuth
+ public R add(WrkMastExecuteLog wrkMastExecuteLog) {
+ wrkMastExecuteLogService.insert(wrkMastExecuteLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLog/update/auth")
+ @ManagerAuth
+ public R update(WrkMastExecuteLog wrkMastExecuteLog){
+ if (Cools.isEmpty(wrkMastExecuteLog) || null==wrkMastExecuteLog.getWrkNo()){
+ return R.error();
+ }
+ wrkMastExecuteLogService.updateById(wrkMastExecuteLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastExecuteLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecuteLog"));
+ convert(map, wrapper);
+ List<WrkMastExecuteLog> list = wrkMastExecuteLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastExecuteLog> page = wrkMastExecuteLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastExecuteLog wrkMastExecuteLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastExecuteLog.getWrkNo());
+ map.put("value", wrkMastExecuteLog.getWrkSts());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastExecuteLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<WrkMastExecuteLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastExecuteLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecuteLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index f1fbad3..a08f9e7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -9,6 +9,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.zy.asrs.service.BasWrkStatusService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -268,5 +269,15 @@
}
}
+ public String getWrkSts$(){
+ switch (this.wrkSts.intValue()){
+ case 0: return "鍒濆" ;
+ case 1: return "杩涜涓�" ;
+ case 2: return "瀹屾垚" ;
+ default:
+ return "鏈煡";
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
new file mode 100644
index 0000000..fabd00f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -0,0 +1,241 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+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 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("agv_wrk_mast_execute_log")
+public class WrkMastExecuteLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("sou_loc_no")
+ private String souLocNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ @TableField("end_loc_no")
+ private String endLocNo;
+
+ /**
+ * 鍘熸ゼ灞�
+ */
+ @ApiModelProperty(value= "鍘熸ゼ灞�")
+ @TableField("sou_floor")
+ private Integer souFloor;
+
+ /**
+ * 鐩爣妤煎眰
+ */
+ @ApiModelProperty(value= "鐩爣妤煎眰")
+ @TableField("end_floor")
+ private Integer endFloor;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "婧愮珯鐐�")
+ @TableField("sou_sta_no")
+ private String souStaNo;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty(value= "鐩爣绔欑偣")
+ @TableField("end_sta_no")
+ private String endStaNo;
+
+ /**
+ * 褰撳墠鑺傜偣
+ */
+ @ApiModelProperty(value= "褰撳墠鑺傜偣")
+ @TableField("now_position")
+ private Integer nowPosition;
+
+ /**
+ * 鐩爣鑺傜偣
+ */
+ @ApiModelProperty(value= "鐩爣鑺傜偣")
+ @TableField("end_position")
+ private Integer endPosition;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Long wrkSts;
+
+ /**
+ * 宸ヤ綔鏃堕棿
+ */
+ @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date ioTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @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("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
+ private String appeUser;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value= "")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ public WrkMastExecuteLog() {}
+
+ public WrkMastExecuteLog(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
+ this.souLocNo = souLocNo;
+ this.endLocNo = endLocNo;
+ this.souFloor = souFloor;
+ this.endFloor = endFloor;
+ this.souStaNo = souStaNo;
+ this.endStaNo = endStaNo;
+ this.nowPosition = nowPosition;
+ this.endPosition = endPosition;
+ this.ioType = ioType;
+ this.wrkSts = wrkSts;
+ this.ioTime = ioTime;
+ this.modiTime = modiTime;
+ this.modiUser = modiUser;
+ this.appeTime = appeTime;
+ this.appeUser = appeUser;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ }
+
+// WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
+// null, // 婧愬簱浣�
+// null, // 鐩爣搴撲綅
+// null, // 鍘熸ゼ灞�
+// null, // 鐩爣妤煎眰
+// null, // 婧愮珯鐐�
+// null, // 鐩爣绔欑偣
+// null, // 褰撳墠鑺傜偣
+// null, // 鐩爣鑺傜偣
+// null, // 浠诲姟绫诲瀷
+// null, // 宸ヤ綔鐘舵��
+// null, // 宸ヤ綔鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 鍒涘缓鑰�
+// null, // 浠诲姟鐘舵��
+// null // [闈炵┖]
+// );
+
+ public String getIoType$(){
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)){
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ 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;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
new file mode 100644
index 0000000..c9ba72c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> {
+ @Insert("insert into agv_wrk_mast_execute_log select * from agv_wrk_mast_execute where wrk_no=#{workNo}")
+ int save(Long workNo);
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
new file mode 100644
index 0000000..dfc85a5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> {
+ boolean save(WrkMastExecute wrkMastExecute);
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
new file mode 100644
index 0000000..35b5a56
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.mapper.WrkMastExecuteLogMapper;
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.zy.asrs.service.WrkMastExecuteLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastExecuteLogService")
+public class WrkMastExecuteLogServiceImpl extends ServiceImpl<WrkMastExecuteLogMapper, WrkMastExecuteLog> implements WrkMastExecuteLogService {
+ @Override
+ public boolean save(WrkMastExecute wrkMastExecute) {
+ return this.baseMapper.save(wrkMastExecute.getWrkNo()) > 0;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 3b1d4fc..11503e2 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -58,7 +58,9 @@
.or().eq("io_type",109)
.or().eq("io_type",111)
.or().eq("io_type",112)
- .or().eq("io_type",113));
+ .or().eq("io_type",113)
+ .or().eq("io_type",121)
+ );
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
try{
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java
index e032675..9d8cd54 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java
@@ -6,9 +6,7 @@
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.AgvBasDevpService;
-import com.zy.asrs.service.AgvLocMastService;
-import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
import com.zy.asrs.task.handler.AutoMoveCreateExecuteHandler;
import com.zy.common.service.AgvCommonService;
@@ -37,7 +35,9 @@
@Autowired
private AgvCommonService agvCommonService;
@Autowired
- private WrkMastExecuteServiceImpl wrkMastExecuteService;
+ private WrkMastExecuteService wrkMastExecuteService;
+ @Autowired
+ private WrkMastExecuteLogService wrkMastExecuteLogService;
/**
* 鐢熸垚agv_wrk_mast_execute浠诲姟
@@ -115,9 +115,13 @@
for (AgvWrkMast agvWrkMast:agvWrkMastList){
try{
WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_no", agvWrkMast.getWrkNo().longValue()));
- if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==2 && wrkMastExecute.getNowPosition()==4){
- agvWrkMast.setWrkSts(14L);//浠诲姟瀹屾垚
+ if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==3L && wrkMastExecute.getNowPosition()==3){
+ agvWrkMast.setWrkSts(205L);//浠诲姟瀹屾垚
agvWrkMastService.updateById(agvWrkMast);
+ //鐢熸垚agv_wrk_mast_execute浠诲姟鍘嗗彶妗�
+ wrkMastExecuteLogService.save(wrkMastExecute);
+ //鍒犻櫎鎵ц妗ｆ
+ wrkMastExecuteService.deleteById(wrkMastExecute);
}
}catch (Exception e){
log.error("瀹屾垚agv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
index e9729f3..ac02f92 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.service.AgvBasDevpService;
@@ -49,7 +50,7 @@
*/
@Scheduled(cron = "0/2 * * * * ? ")
private void autoMove2(){
- List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L));
+ List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",3L));
for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
Date now = new Date();
try{
@@ -75,6 +76,51 @@
}
}
+ /**
+ * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
+ */
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void autoMove3(){
+ List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L));
+ for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
+ Date now = new Date();
+ try{
+ if (wrkMastExecute.getStatus()==2){
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()]));
+ if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("S")){
+ log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
+ }else {
+ wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+ wrkMastExecute.setModiTime(now);
+ wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+ wrkMastExecuteService.updateById(wrkMastExecute);
+ updateAgvBasDevp(agvBasDevp,"F",agvBasDevp.getLocType2(),agvBasDevp.getBarcode());
+ }
+ }else if (wrkMastExecute.getStatus()==3 || wrkMastExecute.getStatus()==4){
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()]));
+ if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("R")){
+ log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
+ }else {
+ wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+ wrkMastExecute.setModiTime(now);
+ wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+ wrkMastExecuteService.updateById(wrkMastExecute);
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"O","",(short)0);
+ }
+ }else if (wrkMastExecute.getStatus()==1){
+ wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+ wrkMastExecute.setModiTime(now);
+ wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+ wrkMastExecuteService.updateById(wrkMastExecute);
+ }
+ }catch (Exception e){
+ log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
+ }
+ }
+
+
+
private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
if(!Cools.isEmpty(agvBasDevp)){
agvBasDevp.setLocSts(locSts);
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 3616fc5..003e38f 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -146,6 +146,7 @@
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
break;
case 108:
+ case 121:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
//鏇存柊搴撳瓨鏄庣粏
agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index b4d298b..6d26ba3 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="192.168.4.15:1433;databasename=phyzasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="agv_wrk_mast_execute";
+ generator.table="agv_wrk_mast_execute_log";
generator.packagePath="com.zy.asrs";
generator.sql = false;
generator.build();
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
new file mode 100644
index 0000000..3e5027a
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastExecuteLogMapper.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.WrkMastExecuteLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecuteLog">
+ <result column="wrk_no" property="wrkNo" />
+ <result column="sou_loc_no" property="souLocNo" />
+ <result column="end_loc_no" property="endLocNo" />
+ <result column="sou_floor" property="souFloor" />
+ <result column="end_floor" property="endFloor" />
+ <result column="sou_sta_no" property="souStaNo" />
+ <result column="end_sta_no" property="endStaNo" />
+ <result column="now_position" property="nowPosition" />
+ <result column="end_position" property="endPosition" />
+ <result column="io_type" property="ioType" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="io_time" property="ioTime" />
+ <result column="modi_time" property="modiTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="appe_time" property="appeTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="status" property="status" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
index 853a29c..39cb0a5 100644
--- a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
+++ b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
@@ -21,24 +21,24 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'souLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'endLocNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'souFloor', align: 'center',title: '鍘熸ゼ灞�'}
- ,{field: 'endFloor', align: 'center',title: '鐩爣妤煎眰'}
- ,{field: 'souStaNo', align: 'center',title: '婧愮珯鐐�'}
- ,{field: 'endStaNo', align: 'center',title: '鐩爣绔欑偣'}
- ,{field: 'nowPosition', align: 'center',title: '褰撳墠鑺傜偣'}
- ,{field: 'endPosition', align: 'center',title: '鐩爣鑺傜偣'}
- ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
- ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'status', align: 'center',title: '浠诲姟鐘舵��'}
- ,{field: 'wrkNo', align: 'center',title: ''}
+ // {type: 'checkbox'},
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort:true,hide: false}
+ ,{field: 'souLocNo', align: 'center',title: '婧愬簱浣�',sort:true,hide: false}
+ ,{field: 'endLocNo', align: 'center',title: '鐩爣搴撲綅',sort:true,hide: false}
+ ,{field: 'souFloor', align: 'center',title: '鍘熸ゼ灞�',sort:true,hide: false}
+ ,{field: 'endFloor', align: 'center',title: '鐩爣妤煎眰',sort:true,hide: false}
+ ,{field: 'souStaNo', align: 'center',title: '婧愮珯鐐�',sort:true,hide: false}
+ ,{field: 'endStaNo', align: 'center',title: '鐩爣绔欑偣',sort:true,hide: false}
+ ,{field: 'nowPosition', align: 'center',title: '褰撳墠鑺傜偣',sort:false,hide: false}
+ ,{field: 'endPosition', align: 'center',title: '鐩爣鑺傜偣',sort:false,hide: false}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷',sort:false,hide: true}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',sort:true,hide: false}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort:true,hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',sort:true,hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',sort:true,hide: true}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿',sort:true,hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',sort:true,hide: true}
+ ,{field: 'status', align: 'center',title: '浠诲姟鐘舵��',sort:true,hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
new file mode 100644
index 0000000..7d18f82
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.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: '#wrkMastExecuteLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastExecuteLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'souLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'endLocNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'souFloor', align: 'center',title: '鍘熸ゼ灞�'}
+ ,{field: 'endFloor', align: 'center',title: '鐩爣妤煎眰'}
+ ,{field: 'souStaNo', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'endStaNo', align: 'center',title: '鐩爣绔欑偣'}
+ ,{field: 'nowPosition', align: 'center',title: '褰撳墠鑺傜偣'}
+ ,{field: 'endPosition', align: 'center',title: '鐩爣鑺傜偣'}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
+ ,{field: 'status', align: 'center',title: '浠诲姟鐘舵��'}
+ ,{field: 'wrkNo', 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(wrkMastExecuteLog)', 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(wrkMastExecuteLog)', 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 = {
+ 'wrkMastExecuteLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastExecuteLog/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(wrkMastExecuteLog)', 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+"/wrkMastExecuteLog/"+(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+"/wrkMastExecuteLog/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: '#ioTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['ioTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+ 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/views/wrkMastExecute/wrkMastExecute.html b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
index 9033dab..2964f4c 100644
--- a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
+++ b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
@@ -19,14 +19,14 @@
<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">
+ <input class="layui-input" type="text" name="wrk_no" 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" 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">
@@ -49,15 +49,15 @@
<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-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>
+<!-- <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>
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
new file mode 100644
index 0000000..dbc9179
--- /dev/null
+++ b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
@@ -0,0 +1,206 @@
+<!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="wrkMastExecuteLog" lay-filter="wrkMastExecuteLog"></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/wrkMastExecuteLog/wrkMastExecuteLog.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="souLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endLocNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘熸ゼ灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souFloor" placeholder="璇疯緭鍏ュ師妤煎眰">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣妤煎眰: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endFloor" placeholder="璇疯緭鍏ョ洰鏍囨ゼ灞�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endStaNo" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">褰撳墠鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="nowPosition" placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endPosition" 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="ioType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" style="display: none">
+ <input id="ioType$" name="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" 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="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioTime" id="ioTime$" 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="appeTime" id="appeTime$" 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="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
+ <input id="appeUser$" name="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" 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="status" placeholder="璇疯緭鍏ヤ换鍔＄姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </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