自动化立体仓库 - WMS系统
#
lsh
2024-01-26 56930aa574a738f918750aaea3efd790e2c789fc
#
7个文件已修改
9个文件已添加
991 ■■■■■ 已修改文件
src/main/java/basRgv.sql 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/BasRgvController.java 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/BasRgv.java 229 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/BasRgvMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/BasRgvService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/BareBoardScheduler.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/CodeBuilder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasRgvMapper.xml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/basRgv/basRgv.js 269 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/basRgv/basRgv.html 196 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/basRgv.sql
New file
@@ -0,0 +1,18 @@
-- save basRgv record
-- mysql
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv/basRgv.html', 'basRgv管理', null , '2', null , '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv#view', '查询', '', '3', '0', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv#btn-add', '新增', '', '3', '1', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv#btn-edit', '编辑', '', '3', '2', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv#btn-delete', '删除', '', '3', '3', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basRgv#btn-export', '导出', '', '3', '4', '1');
-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv/basRgv.html', N'basRgv管理', null, '2', null, '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv#view', N'查询', '', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv#btn-add', N'新增', '', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv#btn-edit', N'编辑', '', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv#btn-delete', N'删除', '', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basRgv#btn-export', N'导出', '', '3', '4', '1');
src/main/java/com/zy/asrs/controller/BasRgvController.java
New file
@@ -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.BasRgv;
import com.zy.asrs.service.BasRgvService;
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 BasRgvController extends BaseController {
    @Autowired
    private BasRgvService basRgvService;
    @RequestMapping(value = "/basRgv/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basRgvService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/basRgv/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<BasRgv> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasRgv.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basRgvService.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 = "/basRgv/add/auth")
    @ManagerAuth
    public R add(BasRgv basRgv) {
        basRgvService.insert(basRgv);
        return R.ok();
    }
    @RequestMapping(value = "/basRgv/update/auth")
    @ManagerAuth
    public R update(BasRgv basRgv){
        if (Cools.isEmpty(basRgv) || null==basRgv.getRgvNo()){
            return R.error();
        }
        basRgvService.updateById(basRgv);
        return R.ok();
    }
    @RequestMapping(value = "/basRgv/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            basRgvService.deleteById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/basRgv/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basRgv"));
        convert(map, wrapper);
        List<BasRgv> list = basRgvService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/basRgvQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
        wrapper.like("rgv_no", condition);
        Page<BasRgv> page = basRgvService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasRgv basRgv : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basRgv.getRgvNo());
            map.put("value", basRgv.getRgvNo());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/basRgv/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasRgv> wrapper = new EntityWrapper<BasRgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basRgvService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasRgv.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
}
src/main/java/com/zy/asrs/entity/BasRgv.java
New file
@@ -0,0 +1,229 @@
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.system.service.UserService;
import com.zy.system.entity.User;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@Data
@TableName("asr_bas_rgv")
public class BasRgv implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * RGV编号
     */
    @ApiModelProperty(value= "RGV编号")
    @TableId(value = "rgv_no", type = IdType.INPUT)
    @TableField("rgv_no")
    private Integer rgvNo;
    /**
     * 可入
     */
    @ApiModelProperty(value= "可入")
    @TableField("in_enable")
    private String inEnable;
    /**
     * 可出
     */
    @ApiModelProperty(value= "可出")
    @TableField("out_enable")
    private String outEnable;
    /**
     * 作业态
     */
    @ApiModelProperty(value= "作业态")
    @TableField("rgv_sts")
    private Integer rgvSts;
    /**
     * 任务号
     */
    @ApiModelProperty(value= "任务号")
    @TableField("wrk_no1")
    private Integer wrkNo1;
    /**
     * 堆垛机号
     */
    @ApiModelProperty(value= "堆垛机号")
    @TableField("wrk_no2")
    private Integer wrkNo2;
    /**
     * 错误码
     */
    @ApiModelProperty(value= "错误码")
    @TableField("rgv_err")
    private Long rgvErr;
    /**
     * 标记
     */
    @ApiModelProperty(value= "标记")
    @TableField("pak_mk")
    private String pakMk;
    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;
    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    @TableField("create_by")
    private Long createBy;
    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("update_by")
    private Long updateBy;
    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;
    /**
     * 是否有物 1: 有物  0: 无物
     */
    @ApiModelProperty(value= "是否有物 1: 有物  0: 无物  ")
    private Integer loaded2;
    public BasRgv() {}
    public BasRgv(Integer rgvNo,String inEnable,String outEnable,Integer rgvSts,Integer wrkNo1,Integer wrkNo2,Long rgvErr,String pakMk,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer loaded2) {
        this.rgvNo = rgvNo;
        this.inEnable = inEnable;
        this.outEnable = outEnable;
        this.rgvSts = rgvSts;
        this.wrkNo1 = wrkNo1;
        this.wrkNo2 = wrkNo2;
        this.rgvErr = rgvErr;
        this.pakMk = pakMk;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.loaded2 = loaded2;
    }
//    BasRgv basRgv = new BasRgv(
//            null,    // RGV编号[非空]
//            null,    // 可入
//            null,    // 可出
//            null,    // 作业态
//            null,    // 任务号
//            null,    // 堆垛机号
//            null,    // 错误码
//            null,    // 标记
//            null,    // 状态
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 备注
//            null    // 是否有物
//    );
    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }
    }
    public String getCreateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }
    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }
    public String getLoaded2$(){
        if (null == this.loaded2){ return null; }
        switch (this.loaded2){
            case 1:
                return "有物";
            case 0:
                return "无物";
            default:
                return String.valueOf(this.loaded2);
        }
    }
}
src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasRgv;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface BasRgvMapper extends BaseMapper<BasRgv> {
}
src/main/java/com/zy/asrs/service/BasRgvService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasRgv;
import com.baomidou.mybatisplus.service.IService;
public interface BasRgvService extends IService<BasRgv> {
}
src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;
import com.zy.asrs.mapper.BasRgvMapper;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasRgvService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basRgvService")
public class BasRgvServiceImpl extends ServiceImpl<BasRgvMapper, BasRgv> implements BasRgvService {
}
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -243,7 +243,7 @@
        }
        List<String> orderBoxNoList = new ArrayList<>();
        for (OrderDetl orderDetl: orderDetls){
            if (orderDetl.getWorkQty()==0){
            if (orderDetl.getWorkQty().equals(0.0)){
                orderBoxNoList.add(orderDetl.getBatch());
            }
        }
@@ -255,7 +255,7 @@
            if (!orderBoxNoList.contains(matList.getBatch())){
                throw new CoolException("单号:"+param.getOrderNo()+" 箱号:"+matList.getBatch()+"不属于此订单或者已经入库");
            }else {
                matListBoxNoList.add(matList.getBoxNo());
                matListBoxNoList.add(matList.getBatch());
            }
        }
        List<OrderDetl> orderDetlList = new ArrayList<>();
@@ -301,7 +301,7 @@
            waitPakin.setVolume(orderDetl.getVolume());  //毛重
            waitPakin.setPrice(orderDetl.getPrice());   //长度
            waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs()));   //接头
            waitPakin.setOrigin("1"); //木箱在托盘上的位置
            waitPakin.setOrigin("2"); //木箱在托盘上的位置
            waitPakin.setIoStatus("Y");     // 入出状态
            waitPakin.setAnfme(orderDetl.getAnfme());  // 木箱中铜箔数量
            waitPakin.setWeight(orderDetl.getWeight());  // 木箱中铜箔净重
src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.BareBoardHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.system.entity.Config;
@@ -30,16 +28,54 @@
    private ConfigService configService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private BasRgvService basRgvService;
    @Autowired
    private RgvOneSignService rgvOneSignService;
    @Autowired
    private WrkMastStaService wrkMastStaService;
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){//自动调空板出库
        Config config = configService.selectById(10468);
    private void execute(){//自动调空板出库 2楼码垛位置
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
        if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
            BasDevp basDevp = basDevpService.selectById(213);
            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
                bareBoardHandler.start();
                bareBoardHandler.start(213);
            }
        }
    }
    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeOne(){//自动调空板出库 1楼码垛位置
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
        if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
            boolean sign = true;
            WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
                    .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
            if (Cools.isEmpty(wrkMastSta)){
                sign=false;
            }
            RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
            if (rgvOneSign.getRgvOneSign()!=1 || !sign){
                sign = false;
            }else {
                List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
                for (BasRgv basRgv : basRgvs){
                    if (basRgv.getLoaded2()!=0 && basRgv.getRgvSts()==3){
                        sign = false;
                        break;
                    }
                }
            }
            if (sign){
                bareBoardHandler.start(122);
            }
//            BasDevp basDevp = basDevpService.selectById(213);
//            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
//            }
        }
    }
}
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -70,12 +70,6 @@
                boolean wrkTypeSign = fullKM(wrkMast);
                if (!Cools.isEmpty(wrkMast)){
                    if (wrkTypeSign) {
//                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,11);//1:取(叠盘)
//                        if (result.getCode()==200){
//                            continue;
//                        }else {
//                            System.out.println(staNo+"失败!");
//                        }
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3:取放
                        if (result.getCode()==200){
                            continue;
@@ -83,7 +77,7 @@
                            System.out.println(staNo+"失败!");
                        }
                    } else {
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3:取放
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5:满取
                        if (result.getCode()==200){
                            continue;
                        }else {
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -45,9 +45,9 @@
    @Autowired
    private BasCrnpService basCrnpService;
    public ReturnT<String> start() {
    public ReturnT<String> start(Integer staNo) {
        try {
            if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 213)))){
            if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
                return null;
            }
            // 获取工作号
@@ -85,7 +85,7 @@
                    // 获取源站
                    Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                            .eq("type_no", 110)
                            .eq("stn_no", 213)
                            .eq("stn_no", staNo)
                            .eq("crn_no", locMast.getCrnNo());
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    Integer sourceStaNo = staDesc.getCrnStn();
@@ -103,7 +103,7 @@
                        wrkMast.setIoType(110); // 入出库状态: 110.空板出库
                        wrkMast.setIoPri(10D);
                        wrkMast.setSourceStaNo(sourceStaNo); // 源站
                        wrkMast.setStaNo(213); // 目标站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setCrnNo(locMast.getCrnNo());
                        wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                        wrkMast.setFullPlt("N"); // 满板:Y
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -115,10 +115,15 @@
                    return FAIL;
                }
            }else if (!basDevp118.getLoading().equals("Y") ){
                WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNo + 19999L));
                Thread.sleep(1000);
                basDevp118 = basDevpService.selectById(118);
                if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 || !basDevp118.getLoading().equals("Y") ){
                    return FAIL;
                }
                WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",118 + 19999L));
                if (Cools.isEmpty(wrkMastSta)){
                    //生成拆盘任务
                    WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staNo);
                    WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
                    wrkMastSta1.setType(2);      //类型 1:非空  2:空板
                    wrkMastSta1.setWrkType(2);                    //工作类型  1:取(叠盘)  2:拆盘  3:取放 5:满取  6:满放
                    wrkMastStaService.insert(wrkMastSta1);
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -61,13 +61,13 @@
                        wrkMastStaService.insert(wrkMastSta1);
                    };
                    break;
//                case 23://3:取放
//                    if (Cools.isEmpty(wrkMastSta)){
//                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
//                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
//                        wrkMastSta1.setWrkType(3);
//                        wrkMastStaService.insert(wrkMastSta1);
//                    }
                case 23://3:满取
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(5);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                default:
                    return SUCCESS;
            }
src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
        generator.url="127.0.0.1:1433;databasename=srjtasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="bas_rgv_one_sign";
        generator.table="asr_bas_rgv";
        generator.packagePath="com.zy.asrs";
        generator.build();
    }
src/main/resources/mapper/BasRgvMapper.xml
New file
@@ -0,0 +1,25 @@
<?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.BasRgvMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgv">
        <result column="rgv_no" property="rgvNo" />
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />
        <result column="rgv_sts" property="rgvSts" />
        <result column="wrk_no1" property="wrkNo1" />
        <result column="wrk_no2" property="wrkNo2" />
        <result column="rgv_err" property="rgvErr" />
        <result column="pak_mk" property="pakMk" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="loaded2" property="loaded2" />
    </resultMap>
</mapper>
src/main/webapp/static/js/basRgv/basRgv.js
New file
@@ -0,0 +1,269 @@
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: '#basRgv',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/basRgv/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'rgvNo', align: 'center',title: 'RGV编号'}
            ,{field: 'inEnable', align: 'center',title: '可入'}
            ,{field: 'outEnable', align: 'center',title: '可出'}
            ,{field: 'rgvSts', align: 'center',title: '作业态'}
            ,{field: 'wrkNo1', align: 'center',title: '任务号'}
            ,{field: 'wrkNo2', align: 'center',title: '堆垛机号'}
            ,{field: 'rgvErr', align: 'center',title: '错误码'}
            ,{field: 'pakMk', align: 'center',title: '标记'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'createBy$', align: 'center',title: '添加人员'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateBy$', align: 'center',title: '修改人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'loaded2$', 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(basRgv)', 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(basRgv)', 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.rgvNo;
               }));
               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 = {
                        'basRgv': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/basRgv/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(basRgv)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.rgvNo]);
                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+"/basRgv/"+(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+"/basRgv/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }
    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });
    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });
    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '.layui-laydate-range'
                ,type: 'datetime'
                ,range: true
            });
            layDate.render({
                elem: '#createTime\\$',
                type: 'datetime',
                value: data!==undefined?data['createTime\\$']:null
            });
            layDate.render({
                elem: '#updateTime\\$',
                type: 'datetime',
                value: data!==undefined?data['updateTime\\$']: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}
     });
}
src/main/webapp/views/basRgv/basRgv.html
New file
@@ -0,0 +1,196 @@
<!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="basRgv" lay-filter="basRgv"></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/basRgv/basRgv.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">RGV编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rgvNo" placeholder="请输入RGV编号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">可入: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="inEnable" placeholder="请输入可入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">可出: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="outEnable" placeholder="请输入可出">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">作业态: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rgvSts" placeholder="请输入作业态">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">任务号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="wrkNo1" placeholder="请输入任务号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">堆垛机号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="wrkNo2" placeholder="请输入堆垛机号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">错误码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rgvErr" placeholder="请输入错误码">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="pakMk" placeholder="请输入标记">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="1">正常</option>
                            <option value="0">禁用</option>
                        </select>
                    </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="createBy" placeholder="请输入添加人员" style="display: none">
                        <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" 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="createTime" id="createTime$" 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="updateBy" placeholder="请输入修改人员" style="display: none">
                        <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">是否有物: </label>
                    <div class="layui-input-block">
                        <select name="loaded2">
                            <option value="">请选择是否有物</option>
                            <option value="1">有物</option>
                            <option value="0">无物</option>
                        </select>
                    </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>