From 5f9e5b28c4ae41c667a8a87c21d5ea2ad946805b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 15:27:13 +0800
Subject: [PATCH] #new

---
 src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java       |   12 
 src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js                  |  276 ++++++++++++
 src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java                  |   12 
 src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java    |   40 +
 src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java          |  125 +++++
 src/main/java/com/zy/asrs/controller/AgvOpenController.java                 |    2 
 src/main/resources/mapper/WrkMastExecuteMapper.xml                          |   27 +
 src/main/java/com/zy/common/CodeBuilder.java                                |    4 
 src/main/java/com/zy/asrs/entity/WrkMastExecute.java                        |  272 +++++++++++
 src/main/java/com/zy/asrs/service/WrkMastExecuteService.java                |    8 
 src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java |  153 ++++++
 src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java       |   78 +++
 src/main/webapp/views/wrkMastExecute/wrkMastExecute.html                    |  206 ++++++++
 src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java          |  161 +++++++
 src/main/resources/application.yml                                          |    4 
 15 files changed, 1,370 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 18b8ad1..f6439dd 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -102,7 +102,7 @@
             log.error(e.getMessage());
             return R.error();
         }
-        return R.ok();
+        return new R(0, "鎴愬姛");
     }
 
     @PostMapping("/conveyor/loadContainerFinish ")
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
new file mode 100644
index 0000000..5b15e25
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.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.WrkMastExecute;
+import com.zy.asrs.service.WrkMastExecuteService;
+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 WrkMastExecuteController extends BaseController {
+
+    @Autowired
+    private WrkMastExecuteService wrkMastExecuteService;
+
+    @RequestMapping(value = "/wrkMastExecute/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(wrkMastExecuteService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/wrkMastExecute/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<WrkMastExecute> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(WrkMastExecute.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(wrkMastExecuteService.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 = "/wrkMastExecute/add/auth")
+    @ManagerAuth
+    public R add(WrkMastExecute wrkMastExecute) {
+        wrkMastExecuteService.insert(wrkMastExecute);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/wrkMastExecute/update/auth")
+	@ManagerAuth
+    public R update(WrkMastExecute wrkMastExecute){
+        if (Cools.isEmpty(wrkMastExecute) || null==wrkMastExecute.getWrkNo()){
+            return R.error();
+        }
+        wrkMastExecuteService.updateById(wrkMastExecute);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/wrkMastExecute/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            wrkMastExecuteService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/wrkMastExecute/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecute"));
+        convert(map, wrapper);
+        List<WrkMastExecute> list = wrkMastExecuteService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/wrkMastExecuteQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<WrkMastExecute> page = wrkMastExecuteService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (WrkMastExecute wrkMastExecute : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", wrkMastExecute.getWrkNo());
+            map.put("value", wrkMastExecute.getWrkNo());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/wrkMastExecute/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<WrkMastExecute> wrapper = new EntityWrapper<WrkMastExecute>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != wrkMastExecuteService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecute.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
new file mode 100644
index 0000000..f1fbad3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -0,0 +1,272 @@
+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 com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+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")
+public class WrkMastExecute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @TableId(value = "wrk_no", type = IdType.INPUT)
+    @TableField("wrk_no")
+    private Long wrkNo;
+
+    /**
+     * 婧愬簱浣�
+     */
+    @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;
+
+    public WrkMastExecute() {}
+
+    public WrkMastExecute(AgvWrkMast agvWrkMast) {
+        this.wrkNo = agvWrkMast.getWrkNo().longValue();
+        this.ioType = agvWrkMast.getIoType();
+        this.souLocNo = agvWrkMast.getSourceLocNo();
+        this.endLocNo = agvWrkMast.getLocNo();
+        this.ioTime = agvWrkMast.getIoTime();
+    }
+
+    public WrkMastExecute(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) {
+        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;
+    }
+
+//    WrkMastExecute wrkMastExecute = new WrkMastExecute(
+//            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;
+    }
+
+    public String[] getRoute(){
+        String[] strings = new String[4];
+        strings[0] = this.souLocNo;
+        strings[1] = this.souStaNo;
+        strings[2] = this.endStaNo;
+        strings[3] = this.endLocNo;
+        return strings;
+    }
+
+    public Long getWrkStsCode(){
+        switch (this.wrkSts.intValue()){
+            case 1:
+                return (long)2;
+            default:
+                return this.wrkSts+1;
+        }
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
new file mode 100644
index 0000000..53d39fc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastExecute;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
new file mode 100644
index 0000000..bca4c26
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastExecute;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastExecuteService extends IService<WrkMastExecute> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
new file mode 100644
index 0000000..06f9976
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastExecuteMapper;
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.service.WrkMastExecuteService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastExecuteService")
+public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
+
+}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java
new file mode 100644
index 0000000..e032675
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java
@@ -0,0 +1,161 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+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.service.AgvBasDevpService;
+import com.zy.asrs.service.AgvLocMastService;
+import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
+import com.zy.asrs.task.handler.AutoMoveCreateExecuteHandler;
+import com.zy.common.service.AgvCommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+// 鑷姩绉诲簱
+@Slf4j
+@Component
+public class AutoMoveCreateExecuteScheduler {
+
+    @Autowired
+    private AgvWrkMastService agvWrkMastService;
+    @Autowired
+    private AutoMoveCreateExecuteHandler autoMoveCreateExecuteHandler;
+    @Autowired
+    private AgvBasDevpService agvBasDevpService;
+    @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
+    private AgvCommonService agvCommonService;
+    @Autowired
+    private WrkMastExecuteServiceImpl wrkMastExecuteService;
+
+    /**
+     * 鐢熸垚agv_wrk_mast_execute浠诲姟
+     */
+    @Scheduled(cron = "0/2 * * * * ? ")
+    private void autoMove(){
+        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",11));
+        for (AgvWrkMast agvWrkMast:agvWrkMastList){
+            try{
+                Date now = new Date();
+                if (!agvWrkMast.getLocNo().isEmpty() && !agvWrkMast.getSourceLocNo().isEmpty() && agvWrkMast.getWrkSts()==11L){
+                    AgvLocMast agvLocMastSou = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getSourceLocNo()));
+                    AgvLocMast agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
+
+                    if (!determineFloorConnection(agvLocMastSou.getFloor())){//鍏ㄨ嚜鍔�
+                        WrkMastExecute wrkMastExecute = new WrkMastExecute(agvWrkMast);
+                        wrkMastExecute.setWrkSts(0L);
+                        wrkMastExecute.setModiTime(now);
+                        wrkMastExecute.setAppeTime(now);
+                        wrkMastExecute.setSouFloor(agvLocMastSou.getFloor());
+                        wrkMastExecute.setEndFloor(agvLocMast.getFloor());
+                        wrkMastExecute.setNowPosition(0);
+                        wrkMastExecute.setEndPosition(3);
+                        wrkMastExecute.setStatus(1);
+                        autoMoveCreateExecuteHandler.start(agvWrkMast,wrkMastExecute);
+                    }else {
+                        int count = wrkMastExecuteService.selectCount(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("status", 2));
+                        int countDevp = agvBasDevpService.selectCount(new EntityWrapper<AgvBasDevp>().eq("loc_sts", "O").like("dev_no","DB_"));
+                        if (countDevp<3){
+                            continue;
+                        }
+                        if (count<2){
+                            AgvBasDevp devpNo = agvCommonService.getDevpNo(3, agvLocMastSou.getFloor());
+                            if (Cools.isEmpty(devpNo) || !Objects.equals(devpNo.getLocSts(), "O")){
+                                continue;
+                            }
+                            WrkMastExecute wrkMastExecute = new WrkMastExecute(agvWrkMast);
+                            wrkMastExecute.setWrkSts(0L);
+                            wrkMastExecute.setModiTime(now);
+                            wrkMastExecute.setAppeTime(now);
+                            wrkMastExecute.setSouFloor(agvLocMastSou.getFloor());
+                            wrkMastExecute.setEndFloor(agvLocMast.getFloor());
+                            wrkMastExecute.setSouStaNo(devpNo.getDevNo());
+                            wrkMastExecute.setNowPosition(0);
+                            wrkMastExecute.setEndPosition(1);
+                            wrkMastExecute.setStatus(2);
+                            autoMoveCreateExecuteHandler.start(agvWrkMast,wrkMastExecute);
+
+                            //鏇存柊鐩爣搴撲綅鐘舵��
+                            updateAgvBasDevp(devpNo,"S",agvLocMastSou.getLocType2(),agvLocMastSou.getBarcode());
+                        }
+                    }
+                }
+            }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);
+            agvBasDevp.setLocType2(continerType);
+            agvBasDevp.setBarcode(containerCode);
+            agvBasDevpService.updateById(agvBasDevp);
+        }
+    }
+
+    /**
+     * 瀹屾垚agv_wrk_mast_execute浠诲姟
+     */
+    @Scheduled(cron = "0/2 * * * * ? ")
+    private void autoMoveEnd(){
+        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",12));
+        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);//浠诲姟瀹屾垚
+                    agvWrkMastService.updateById(agvWrkMast);
+                }
+            }catch (Exception e){
+                log.error("瀹屾垚agv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+            }
+        }
+    }
+
+    private boolean determineFloorConnection(Integer floor){
+        try{
+            List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", floor).like("dev_no", "DB_"));
+            if (!agvBasDevps.isEmpty()){
+                for (AgvBasDevp agvBasDevp:agvBasDevps){
+                    if (agvBasDevp.getInEnable().equals("Y")){
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }catch (Exception e){
+            log.error("鍒ゆ柇褰撳墠妤煎眰鎺ラ┏浣嶆槸鍚﹀叏閮ㄥ叧闂紝寮傚父"+e.getMessage());
+        }
+        return false;
+    }
+
+    private boolean determineFloorConnectionReverseSide(Integer floor){
+        try{
+            List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", floor).like("dev_no", "DB_"));
+            if (!agvBasDevps.isEmpty()){
+                for (AgvBasDevp agvBasDevp:agvBasDevps){
+                    if (agvBasDevp.getInEnable().equals("N")){
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }catch (Exception e){
+            log.error("鍒ゆ柇褰撳墠妤煎眰鎺ラ┏浣嶆槸鍚﹀叏閮ㄥ叧闂紝寮傚父"+e.getMessage());
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
index 872288f..e9729f3 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
@@ -1,18 +1,86 @@
 package com.zy.asrs.task;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.WrkMastExecuteService;
+import com.zy.asrs.task.handler.AutoMoveTwoAndThreeGoOneHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
 
 // 鑷姩绉诲簱
 @Slf4j
 @Component
 public class AutoMoveTwoAndThreeGoOneScheduler {
 
-    /**
-     * 2銆�3妤艰浆绉诲埌1妤间换鍔℃墽琛�
-     */
-//    @Scheduled(cron = "0/2 * * * * ? ")
-    private void autoMove(){
+    @Autowired
+    private WrkMastExecuteService wrkMastExecuteService;
+    @Autowired
+    private AutoMoveTwoAndThreeGoOneHandler autoMoveTwoAndThreeGoOneHandler;
+    @Autowired
+    private AgvBasDevpService agvBasDevpService;
 
+    /**
+     * 鎵цagv_wrk_mast_execute浠诲姟
+     */
+    @Scheduled(cron = "0/2 * * * * ? ")
+    private void autoMove(){
+        List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",0L));
+        for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
+            try{
+                if (true){
+                    autoMoveTwoAndThreeGoOneHandler.start(wrkMastExecute);
+                }
+            }catch (Exception e){
+                log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
+     */
+    @Scheduled(cron = "0/2 * * * * ? ")
+    private void autoMove2(){
+        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 && wrkMastExecute.getNowPosition()==1){
+                    AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[1]));
+                    if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("F")){
+                        continue;
+                    }
+                    //鍒ゆ柇鐢垫蹇欎笉蹇�
+                    int count = wrkMastExecuteService.selectCount(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("status", 2));
+                    if(count<3){
+                        wrkMastExecute.setStatus(3);
+                        wrkMastExecute.setWrkSts(0L);
+                        wrkMastExecute.setModiTime(now);
+                        wrkMastExecute.setEndPosition(4);
+                        wrkMastExecuteService.updateById(wrkMastExecute);
+                        updateAgvBasDevp(agvBasDevp,"R",agvBasDevp.getLocType2(),agvBasDevp.getBarcode());
+                    }
+                }
+            }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);
+            agvBasDevp.setLocType2(continerType);
+            agvBasDevp.setBarcode(containerCode);
+            agvBasDevpService.updateById(agvBasDevp);
+        }
     }
 }
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java
new file mode 100644
index 0000000..6a43f32
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+
+@Slf4j
+@Service
+@Transactional
+public class AutoMoveCreateExecuteHandler extends AbstractHandler<String> {
+
+    @Autowired
+    private AgvWrkMastService agvWrkMastService;
+    @Autowired
+    private WrkMastExecuteServiceImpl wrkMastExecuteService;
+
+    public ReturnT<String> start(AgvWrkMast agvWrkMast,WrkMastExecute wrkMastExecute) {//1-4
+        try{
+            if (wrkMastExecuteService.insert(wrkMastExecute)){
+                agvWrkMast.setWrkSts(agvWrkMast.getWrkSts()+1);
+                agvWrkMast.setAppeTime(new Date());
+                agvWrkMastService.updateById(agvWrkMast);
+            }
+        }catch (Exception e){
+            log.error("鎼繍浠诲姟涓嬪彂===銆嬪紓甯革細"+e.getMessage());
+        }
+        return SUCCESS;
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
new file mode 100644
index 0000000..5cf9ae2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -0,0 +1,153 @@
+package com.zy.asrs.task.handler;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.entity.param.AgvTaskCreateParam;
+import com.zy.asrs.entity.param.AgvTaskParam;
+import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional
+public class AutoMoveTwoAndThreeGoOneHandler extends AbstractHandler<String> {
+
+    @Value("${agv.url}")
+    private String url;
+
+    @Value("${agv.taskCreatePath}")
+    private String taskCreatePath;
+
+    @Autowired
+    AgvBasDevpService agvBasDevpService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private WrkMastExecuteServiceImpl wrkMastExecuteService;
+
+    public ReturnT<String> start(WrkMastExecute wrkMastExecute) {
+        try{
+            AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+            getRequestParam(agvTaskCreateParam,wrkMastExecute);
+            int doHttpRequest = doHttpRequest(agvTaskCreateParam, "鎼繍浠诲姟涓嬪彂==>2-3==1", url, taskCreatePath, null, "127.0.0.1");
+            if(doHttpRequest != 0){
+                throw new CoolException("浠诲姟涓嬪彂澶辫触,code:"+doHttpRequest);
+            }
+            wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+            wrkMastExecute.setModiTime(new Date());
+            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                throw new CoolException("浠诲姟涓嬪彂鎴愬姛,浣嗘槸鏇存柊鎵ц浠诲姟鐘舵�佸け璐�:"+doHttpRequest);
+            }
+        }catch (Exception e){
+            log.error("鎼繍浠诲姟涓嬪彂===銆嬪紓甯革細"+e.getMessage());
+        }
+        return SUCCESS;
+    }
+
+    public ReturnT<String> start1(WrkMastExecute wrkMastExecute) {
+        try{
+            AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+            getRequestParam(agvTaskCreateParam,wrkMastExecute);
+            int doHttpRequest = doHttpRequest(agvTaskCreateParam, "鎼繍浠诲姟涓嬪彂", url, taskCreatePath, null, "127.0.0.1");
+            if(doHttpRequest != 0){
+                throw new CoolException("浠诲姟涓嬪彂澶辫触,code:"+doHttpRequest);
+            }
+            wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+            wrkMastExecute.setModiTime(new Date());
+            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                throw new CoolException("浠诲姟涓嬪彂鎴愬姛,浣嗘槸鏇存柊鎵ц浠诲姟鐘舵�佸け璐�:"+doHttpRequest);
+            }
+        }catch (Exception e){
+            log.error("鎼繍浠诲姟涓嬪彂===銆嬪紓甯革細"+e.getMessage());
+        }
+        return SUCCESS;
+    }
+
+    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam, WrkMastExecute wrkMastExecute){
+
+        List<AgvTaskParam> agvTaskParamList = Arrays.asList(
+                //璧峰浣�
+                new AgvTaskParam(wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()]),
+                //鐩爣浣�
+                new AgvTaskParam(wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()]));
+
+        Long wrkNo = wrkMastExecute.getWrkNo();
+        if (wrkMastExecute.getNowPosition()==1){
+            agvTaskCreateParam.setTaskCode(wrkMastExecute.getWrkNo().toString());
+        }else {
+            wrkNo = -wrkNo;
+            agvTaskCreateParam.setTaskCode(wrkNo.toString());
+        }
+        if (!wrkMastExecute.getSouFloor().equals(wrkMastExecute.getEndFloor())) {
+            agvTaskCreateParam.setTaskTyp("F06");
+        } else  {
+            agvTaskCreateParam.setTaskTyp("F01");
+        }
+
+        agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
+
+    }
+
+    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+        if (true){
+            apiLogService.save(
+                    namespace,
+                    url + path,
+                    appkey,
+                    ip,
+                    JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+                    "",
+                    true
+            );
+            return 0;
+        }
+        String response = "";
+        boolean success = false;
+
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(url)
+                    .setPath(path)
+                    .setJson(JSONObject.toJSONString(requestParam))
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+
+            int code = Integer.parseInt(jsonObject.get("code").toString());
+            if(code != 0){
+                throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+            }
+            success = true;
+            return code;
+        }catch (Exception e){
+            log.error(e.getMessage());
+            throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+        }finally {
+            apiLogService.save(
+                    namespace,
+                    url + path,
+                    appkey,
+                    ip,
+                    JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+                    response,
+                    success
+            );
+        }
+
+    }
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 4c4a96a..b4d298b 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
 //        generator.table="sys_host";
         // sqlserver
         generator.sqlOsType = SqlOsType.SQL_SERVER;
-        generator.url="127.0.0.1:1433;databasename=phyzasrs";
+        generator.url="192.168.4.15:1433;databasename=phyzasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_bas_loc_type1";
+        generator.table="agv_wrk_mast_execute";
         generator.packagePath="com.zy.asrs";
         generator.sql = false;
         generator.build();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fbbafe7..cba1204 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,8 +11,8 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
-    url: jdbc:sqlserver://192.168.4.188:1433;databasename=phyzasrs
-    #url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
+#    url: jdbc:sqlserver://192.168.4.188:1433;databasename=phyzasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
new file mode 100644
index 0000000..b2117ef
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.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.WrkMastExecuteMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute">
+        <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" />
+        <result column="wrk_no" property="wrkNo" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
new file mode 100644
index 0000000..853a29c
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.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: '#wrkMastExecute',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/wrkMastExecute/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(wrkMastExecute)', 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(wrkMastExecute)', 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.wrkNo;
+               }));
+               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 = {
+                        'wrkMastExecute': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/wrkMastExecute/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(wrkMastExecute)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.wrkNo]);
+                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+"/wrkMastExecute/"+(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+"/wrkMastExecute/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
new file mode 100644
index 0000000..9033dab
--- /dev/null
+++ b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.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">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="wrkMastExecute" lay-filter="wrkMastExecute"></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/wrkMastExecute/wrkMastExecute.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