| | |
| | | import com.core.annotations.AppAuth; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.asrs.entity.AgvBasDevp; |
| | | import com.zy.asrs.entity.AgvLocMast; |
| | | import com.zy.asrs.entity.AgvWrkMast; |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.entity.param.AgvTaskCallBackParam; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.asrs.utils.AppAuthUtil; |
| | |
| | | AgvWrkMastService agvWrkMastService; |
| | | @Autowired |
| | | ApiLogService apiLogService; |
| | | @Autowired |
| | | private WrkMastExecuteService wrkMastExecuteService; |
| | | @Autowired |
| | | private AgvBasDevpService agvBasDevpService; |
| | | |
| | | @PostMapping("/task/event/status") |
| | | @AppAuth(memo = "ESS任务回调") |
| | |
| | | return R.error("任务编号错误"); |
| | | } |
| | | } |
| | | if (agvWrkMast.getIoType().equals(121)){ |
| | | try{ |
| | | if (agvWrkMast.getWrkSts().equals(12L)){ |
| | | WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo)); |
| | | if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){ |
| | | return R.error("任务状态WrkSts参数有误,WrkSts:"+wrkMastExecute.getWrkSts$()); |
| | | } else { |
| | | wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode()); |
| | | wrkMastExecuteService.updateById(wrkMastExecute); |
| | | } |
| | | }else { |
| | | return R.error("任务异常"); |
| | | } |
| | | }catch (Exception e){ |
| | | return R.error(""+e.getMessage()); |
| | | } |
| | | }else { |
| | | if(agvWrkMast.getWrkSts() >= 205){ |
| | | return R.error("当前任务已完成"); |
| | | } |
| | | |
| | | if(agvWrkMast.getWrkSts() >= 205){ |
| | | return R.error("当前任务已完成"); |
| | | } |
| | | |
| | | AgvTask agvTask = AgvTask.valueOf(param.getMethod()); |
| | | Class<AgvTask> clz = AgvTask.class; |
| | | try { |
| | | Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class); |
| | | method.invoke(agvTask,agvWrkMast,param); |
| | | } catch (NoSuchMethodException e) { |
| | | return R.error("任务状态status参数有误"); |
| | | } catch (InvocationTargetException e) { |
| | | log.error(e.getMessage()); |
| | | return R.error(); |
| | | } catch (IllegalAccessException e) { |
| | | log.error(e.getMessage()); |
| | | return R.error(); |
| | | AgvTask agvTask = AgvTask.valueOf(param.getMethod()); |
| | | Class<AgvTask> clz = AgvTask.class; |
| | | try { |
| | | Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class); |
| | | method.invoke(agvTask,agvWrkMast,param); |
| | | } catch (NoSuchMethodException e) { |
| | | return R.error("任务状态status参数有误"); |
| | | } catch (InvocationTargetException e) { |
| | | log.error(e.getMessage()); |
| | | return R.error(); |
| | | } catch (IllegalAccessException e) { |
| | | log.error(e.getMessage()); |
| | | return R.error(); |
| | | } |
| | | } |
| | | return new R(0, "成功"); |
| | | } |
New file |
| | |
| | | package com.zy.asrs.controller; |
| | | |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.baomidou.mybatisplus.mapper.Wrapper; |
| | | import com.baomidou.mybatisplus.plugins.Page; |
| | | import com.core.common.DateUtils; |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.zy.asrs.service.WrkMastExecuteLogService; |
| | | import com.core.annotations.ManagerAuth; |
| | | import com.core.common.BaseRes; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.common.web.BaseController; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.*; |
| | | |
| | | @RestController |
| | | public class WrkMastExecuteLogController extends BaseController { |
| | | |
| | | @Autowired |
| | | private WrkMastExecuteLogService wrkMastExecuteLogService; |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/{id}/auth") |
| | | @ManagerAuth |
| | | public R get(@PathVariable("id") String id) { |
| | | return R.ok(wrkMastExecuteLogService.selectById(String.valueOf(id))); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/list/auth") |
| | | @ManagerAuth |
| | | public R list(@RequestParam(defaultValue = "1")Integer curr, |
| | | @RequestParam(defaultValue = "10")Integer limit, |
| | | @RequestParam(required = false)String orderByField, |
| | | @RequestParam(required = false)String orderByType, |
| | | @RequestParam(required = false)String condition, |
| | | @RequestParam Map<String, Object> param){ |
| | | EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>(); |
| | | excludeTrash(param); |
| | | convert(param, wrapper); |
| | | allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | return R.ok(wrkMastExecuteLogService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | | private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ |
| | | for (Map.Entry<String, Object> entry : map.entrySet()){ |
| | | String val = String.valueOf(entry.getValue()); |
| | | if (val.contains(RANGE_TIME_LINK)){ |
| | | String[] dates = val.split(RANGE_TIME_LINK); |
| | | wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); |
| | | wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); |
| | | } else { |
| | | wrapper.like(entry.getKey(), val); |
| | | } |
| | | } |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/add/auth") |
| | | @ManagerAuth |
| | | public R add(WrkMastExecuteLog wrkMastExecuteLog) { |
| | | wrkMastExecuteLogService.insert(wrkMastExecuteLog); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/update/auth") |
| | | @ManagerAuth |
| | | public R update(WrkMastExecuteLog wrkMastExecuteLog){ |
| | | if (Cools.isEmpty(wrkMastExecuteLog) || null==wrkMastExecuteLog.getWrkNo()){ |
| | | return R.error(); |
| | | } |
| | | wrkMastExecuteLogService.updateById(wrkMastExecuteLog); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/delete/auth") |
| | | @ManagerAuth |
| | | public R delete(@RequestParam(value="ids[]") Long[] ids){ |
| | | for (Long id : ids){ |
| | | wrkMastExecuteLogService.deleteById(id); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/export/auth") |
| | | @ManagerAuth |
| | | public R export(@RequestBody JSONObject param){ |
| | | EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>(); |
| | | List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); |
| | | Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecuteLog")); |
| | | convert(map, wrapper); |
| | | List<WrkMastExecuteLog> list = wrkMastExecuteLogService.selectList(wrapper); |
| | | return R.ok(exportSupport(list, fields)); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLogQuery/auth") |
| | | @ManagerAuth |
| | | public R query(String condition) { |
| | | EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>(); |
| | | wrapper.like("id", condition); |
| | | Page<WrkMastExecuteLog> page = wrkMastExecuteLogService.selectPage(new Page<>(0, 10), wrapper); |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (WrkMastExecuteLog wrkMastExecuteLog : page.getRecords()){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", wrkMastExecuteLog.getWrkNo()); |
| | | map.put("value", wrkMastExecuteLog.getWrkSts()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteLog/check/column/auth") |
| | | @ManagerAuth |
| | | public R query(@RequestBody JSONObject param) { |
| | | Wrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<WrkMastExecuteLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); |
| | | if (null != wrkMastExecuteLogService.selectOne(wrapper)){ |
| | | return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecuteLog.class, String.valueOf(param.get("key")))); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | } |
| | |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.*; |
| | | |
| | | import com.zy.asrs.service.BasWrkStatusService; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | |
| | | } |
| | | } |
| | | |
| | | public String getWrkSts$(){ |
| | | switch (this.wrkSts.intValue()){ |
| | | case 0: return "初始" ; |
| | | case 1: return "进行中" ; |
| | | case 2: return "完成" ; |
| | | default: |
| | | return "未知"; |
| | | } |
| | | } |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.entity; |
| | | |
| | | import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; |
| | | import com.core.common.SpringUtils; |
| | | import com.zy.asrs.service.BasWrkIotypeService; |
| | | import com.zy.asrs.entity.BasWrkIotype; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import com.core.common.SpringUtils; |
| | | import com.zy.system.service.UserService; |
| | | import com.zy.system.entity.User; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import com.core.common.SpringUtils; |
| | | import com.zy.system.service.UserService; |
| | | import com.zy.system.entity.User; |
| | | |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import com.baomidou.mybatisplus.annotations.TableName; |
| | | import java.io.Serializable; |
| | | |
| | | @Data |
| | | @TableName("agv_wrk_mast_execute_log") |
| | | public class WrkMastExecuteLog implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * 源库位 |
| | | */ |
| | | @ApiModelProperty(value= "源库位") |
| | | @TableField("sou_loc_no") |
| | | private String souLocNo; |
| | | |
| | | /** |
| | | * 目标库位 |
| | | */ |
| | | @ApiModelProperty(value= "目标库位") |
| | | @TableField("end_loc_no") |
| | | private String endLocNo; |
| | | |
| | | /** |
| | | * 原楼层 |
| | | */ |
| | | @ApiModelProperty(value= "原楼层") |
| | | @TableField("sou_floor") |
| | | private Integer souFloor; |
| | | |
| | | /** |
| | | * 目标楼层 |
| | | */ |
| | | @ApiModelProperty(value= "目标楼层") |
| | | @TableField("end_floor") |
| | | private Integer endFloor; |
| | | |
| | | /** |
| | | * 源站点 |
| | | */ |
| | | @ApiModelProperty(value= "源站点") |
| | | @TableField("sou_sta_no") |
| | | private String souStaNo; |
| | | |
| | | /** |
| | | * 目标站点 |
| | | */ |
| | | @ApiModelProperty(value= "目标站点") |
| | | @TableField("end_sta_no") |
| | | private String endStaNo; |
| | | |
| | | /** |
| | | * 当前节点 |
| | | */ |
| | | @ApiModelProperty(value= "当前节点") |
| | | @TableField("now_position") |
| | | private Integer nowPosition; |
| | | |
| | | /** |
| | | * 目标节点 |
| | | */ |
| | | @ApiModelProperty(value= "目标节点") |
| | | @TableField("end_position") |
| | | private Integer endPosition; |
| | | |
| | | /** |
| | | * 任务类型 |
| | | */ |
| | | @ApiModelProperty(value= "任务类型") |
| | | @TableField("io_type") |
| | | private Integer ioType; |
| | | |
| | | /** |
| | | * 工作状态 |
| | | */ |
| | | @ApiModelProperty(value= "工作状态") |
| | | @TableField("wrk_sts") |
| | | private Long wrkSts; |
| | | |
| | | /** |
| | | * 工作时间 |
| | | */ |
| | | @ApiModelProperty(value= "工作时间") |
| | | @TableField("io_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date ioTime; |
| | | |
| | | /** |
| | | * 修改时间 |
| | | */ |
| | | @ApiModelProperty(value= "修改时间") |
| | | @TableField("modi_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date modiTime; |
| | | |
| | | /** |
| | | * 修改人员 |
| | | */ |
| | | @ApiModelProperty(value= "修改人员") |
| | | @TableField("modi_user") |
| | | private String modiUser; |
| | | |
| | | /** |
| | | * 添加时间 |
| | | */ |
| | | @ApiModelProperty(value= "添加时间") |
| | | @TableField("appe_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date appeTime; |
| | | |
| | | /** |
| | | * 创建者 |
| | | */ |
| | | @ApiModelProperty(value= "创建者") |
| | | @TableField("appe_user") |
| | | private String appeUser; |
| | | |
| | | /** |
| | | * 任务状态 |
| | | */ |
| | | @ApiModelProperty(value= "任务状态") |
| | | private Integer status; |
| | | |
| | | @ApiModelProperty(value= "") |
| | | @TableField("wrk_no") |
| | | private Long wrkNo; |
| | | |
| | | public WrkMastExecuteLog() {} |
| | | |
| | | public WrkMastExecuteLog(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) { |
| | | this.souLocNo = souLocNo; |
| | | this.endLocNo = endLocNo; |
| | | this.souFloor = souFloor; |
| | | this.endFloor = endFloor; |
| | | this.souStaNo = souStaNo; |
| | | this.endStaNo = endStaNo; |
| | | this.nowPosition = nowPosition; |
| | | this.endPosition = endPosition; |
| | | this.ioType = ioType; |
| | | this.wrkSts = wrkSts; |
| | | this.ioTime = ioTime; |
| | | this.modiTime = modiTime; |
| | | this.modiUser = modiUser; |
| | | this.appeTime = appeTime; |
| | | this.appeUser = appeUser; |
| | | this.status = status; |
| | | this.wrkNo = wrkNo; |
| | | } |
| | | |
| | | // WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog( |
| | | // null, // 源库位 |
| | | // null, // 目标库位 |
| | | // null, // 原楼层 |
| | | // null, // 目标楼层 |
| | | // null, // 源站点 |
| | | // null, // 目标站点 |
| | | // null, // 当前节点 |
| | | // null, // 目标节点 |
| | | // null, // 任务类型 |
| | | // null, // 工作状态 |
| | | // null, // 工作时间 |
| | | // null, // 修改时间 |
| | | // null, // 修改人员 |
| | | // null, // 添加时间 |
| | | // null, // 创建者 |
| | | // null, // 任务状态 |
| | | // null // [非空] |
| | | // ); |
| | | |
| | | public String getIoType$(){ |
| | | BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class); |
| | | BasWrkIotype basWrkIotype = service.selectById(this.ioType); |
| | | if (!Cools.isEmpty(basWrkIotype)){ |
| | | return String.valueOf(basWrkIotype.getIoDesc()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public String getIoTime$(){ |
| | | if (Cools.isEmpty(this.ioTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); |
| | | } |
| | | |
| | | public String getModiTime$(){ |
| | | if (Cools.isEmpty(this.modiTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); |
| | | } |
| | | |
| | | public String getModiUser$(){ |
| | | UserService service = SpringUtils.getBean(UserService.class); |
| | | User user = service.selectById(this.modiUser); |
| | | if (!Cools.isEmpty(user)){ |
| | | return String.valueOf(user.getNickname()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public String getAppeTime$(){ |
| | | if (Cools.isEmpty(this.appeTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); |
| | | } |
| | | |
| | | public String getAppeUser$(){ |
| | | UserService service = SpringUtils.getBean(UserService.class); |
| | | User user = service.selectById(this.appeUser); |
| | | if (!Cools.isEmpty(user)){ |
| | | return String.valueOf(user.getNickname()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.mapper; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.baomidou.mybatisplus.mapper.BaseMapper; |
| | | import org.apache.ibatis.annotations.Insert; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | @Mapper |
| | | @Repository |
| | | public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> { |
| | | @Insert("insert into agv_wrk_mast_execute_log select * from agv_wrk_mast_execute where wrk_no=#{workNo}") |
| | | int save(Long workNo); |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.baomidou.mybatisplus.service.IService; |
| | | |
| | | public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> { |
| | | boolean save(WrkMastExecute wrkMastExecute); |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service.impl; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.mapper.WrkMastExecuteLogMapper; |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.zy.asrs.service.WrkMastExecuteLogService; |
| | | import com.baomidou.mybatisplus.service.impl.ServiceImpl; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | @Service("wrkMastExecuteLogService") |
| | | public class WrkMastExecuteLogServiceImpl extends ServiceImpl<WrkMastExecuteLogMapper, WrkMastExecuteLog> implements WrkMastExecuteLogService { |
| | | @Override |
| | | public boolean save(WrkMastExecute wrkMastExecute) { |
| | | return this.baseMapper.save(wrkMastExecute.getWrkNo()) > 0; |
| | | } |
| | | } |
| | |
| | | .or().eq("io_type",109) |
| | | .or().eq("io_type",111) |
| | | .or().eq("io_type",112) |
| | | .or().eq("io_type",113)); |
| | | .or().eq("io_type",113) |
| | | .or().eq("io_type",121) |
| | | ); |
| | | if(!Cools.isEmpty(agvWrkMastList)){ |
| | | agvWrkMastList.stream().forEach(agvWrkMast -> { |
| | | try{ |
| | |
| | | import com.zy.asrs.entity.AgvLocMast; |
| | | import com.zy.asrs.entity.AgvWrkMast; |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.service.AgvBasDevpService; |
| | | import com.zy.asrs.service.AgvLocMastService; |
| | | import com.zy.asrs.service.AgvWrkMastService; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl; |
| | | import com.zy.asrs.task.handler.AutoMoveCreateExecuteHandler; |
| | | import com.zy.common.service.AgvCommonService; |
| | |
| | | @Autowired |
| | | private AgvCommonService agvCommonService; |
| | | @Autowired |
| | | private WrkMastExecuteServiceImpl wrkMastExecuteService; |
| | | private WrkMastExecuteService wrkMastExecuteService; |
| | | @Autowired |
| | | private WrkMastExecuteLogService wrkMastExecuteLogService; |
| | | |
| | | /** |
| | | * 生成agv_wrk_mast_execute任务 |
| | |
| | | for (AgvWrkMast agvWrkMast:agvWrkMastList){ |
| | | try{ |
| | | WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_no", agvWrkMast.getWrkNo().longValue())); |
| | | if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==2 && wrkMastExecute.getNowPosition()==4){ |
| | | agvWrkMast.setWrkSts(14L);//任务完成 |
| | | if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==3L && wrkMastExecute.getNowPosition()==3){ |
| | | agvWrkMast.setWrkSts(205L);//任务完成 |
| | | agvWrkMastService.updateById(agvWrkMast); |
| | | //生成agv_wrk_mast_execute任务历史档 |
| | | wrkMastExecuteLogService.save(wrkMastExecute); |
| | | //删除执行档案 |
| | | wrkMastExecuteService.deleteById(wrkMastExecute); |
| | | } |
| | | }catch (Exception e){ |
| | | log.error("完成agv_wrk_mast_execute任务异常===》异常原因:"+e.getMessage()); |
| | |
| | | |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.asrs.entity.AgvBasDevp; |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.service.AgvBasDevpService; |
| | |
| | | */ |
| | | @Scheduled(cron = "0/2 * * * * ? ") |
| | | private void autoMove2(){ |
| | | List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L)); |
| | | List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",3L)); |
| | | for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){ |
| | | Date now = new Date(); |
| | | try{ |
| | |
| | | } |
| | | } |
| | | |
| | | /** |
| | | * 下一步agv_wrk_mast_execute任务 |
| | | */ |
| | | @Scheduled(cron = "0/2 * * * * ? ") |
| | | private void autoMove3(){ |
| | | List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L)); |
| | | for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){ |
| | | Date now = new Date(); |
| | | try{ |
| | | if (wrkMastExecute.getStatus()==2){ |
| | | AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()])); |
| | | if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("S")){ |
| | | log.error("站点状态locsts参数有误:locSts:"+agvBasDevp.getLocSts$()); |
| | | }else { |
| | | wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode()); |
| | | wrkMastExecute.setModiTime(now); |
| | | wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition()); |
| | | wrkMastExecuteService.updateById(wrkMastExecute); |
| | | updateAgvBasDevp(agvBasDevp,"F",agvBasDevp.getLocType2(),agvBasDevp.getBarcode()); |
| | | } |
| | | }else if (wrkMastExecute.getStatus()==3 || wrkMastExecute.getStatus()==4){ |
| | | AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()])); |
| | | if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("R")){ |
| | | log.error("站点状态locsts参数有误:locSts:"+agvBasDevp.getLocSts$()); |
| | | }else { |
| | | wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode()); |
| | | wrkMastExecute.setModiTime(now); |
| | | wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition()); |
| | | wrkMastExecuteService.updateById(wrkMastExecute); |
| | | agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"O","",(short)0); |
| | | } |
| | | }else if (wrkMastExecute.getStatus()==1){ |
| | | wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode()); |
| | | wrkMastExecute.setModiTime(now); |
| | | wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition()); |
| | | wrkMastExecuteService.updateById(wrkMastExecute); |
| | | } |
| | | }catch (Exception e){ |
| | | log.error("执行agv_wrk_mast_execute任务异常===》异常原因:"+e.getMessage()); |
| | | } |
| | | } |
| | | } |
| | | |
| | | |
| | | |
| | | private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){ |
| | | if(!Cools.isEmpty(agvBasDevp)){ |
| | | agvBasDevp.setLocSts(locSts); |
| | |
| | | agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); |
| | | break; |
| | | case 108: |
| | | case 121: |
| | | agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue()); |
| | | //更新库存明细 |
| | | agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); |
| | |
| | | generator.url="192.168.4.15:1433;databasename=phyzasrs"; |
| | | generator.username="sa"; |
| | | generator.password="sa@123"; |
| | | generator.table="agv_wrk_mast_execute"; |
| | | generator.table="agv_wrk_mast_execute_log"; |
| | | generator.packagePath="com.zy.asrs"; |
| | | generator.sql = false; |
| | | generator.build(); |
New file |
| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
| | | <mapper namespace="com.zy.asrs.mapper.WrkMastExecuteLogMapper"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecuteLog"> |
| | | <result column="wrk_no" property="wrkNo" /> |
| | | <result column="sou_loc_no" property="souLocNo" /> |
| | | <result column="end_loc_no" property="endLocNo" /> |
| | | <result column="sou_floor" property="souFloor" /> |
| | | <result column="end_floor" property="endFloor" /> |
| | | <result column="sou_sta_no" property="souStaNo" /> |
| | | <result column="end_sta_no" property="endStaNo" /> |
| | | <result column="now_position" property="nowPosition" /> |
| | | <result column="end_position" property="endPosition" /> |
| | | <result column="io_type" property="ioType" /> |
| | | <result column="wrk_sts" property="wrkSts" /> |
| | | <result column="io_time" property="ioTime" /> |
| | | <result column="modi_time" property="modiTime" /> |
| | | <result column="modi_user" property="modiUser" /> |
| | | <result column="appe_time" property="appeTime" /> |
| | | <result column="appe_user" property="appeUser" /> |
| | | <result column="status" property="status" /> |
| | | |
| | | </resultMap> |
| | | |
| | | </mapper> |
| | |
| | | cellMinWidth: 50, |
| | | height: 'full-120', |
| | | cols: [[ |
| | | {type: 'checkbox'} |
| | | ,{field: 'souLocNo', align: 'center',title: '源库位'} |
| | | ,{field: 'endLocNo', align: 'center',title: '目标库位'} |
| | | ,{field: 'souFloor', align: 'center',title: '原楼层'} |
| | | ,{field: 'endFloor', align: 'center',title: '目标楼层'} |
| | | ,{field: 'souStaNo', align: 'center',title: '源站点'} |
| | | ,{field: 'endStaNo', align: 'center',title: '目标站点'} |
| | | ,{field: 'nowPosition', align: 'center',title: '当前节点'} |
| | | ,{field: 'endPosition', align: 'center',title: '目标节点'} |
| | | ,{field: 'ioType$', align: 'center',title: '任务类型'} |
| | | ,{field: 'wrkSts', align: 'center',title: '工作状态'} |
| | | ,{field: 'ioTime$', align: 'center',title: '工作时间'} |
| | | ,{field: 'modiTime$', align: 'center',title: '修改时间'} |
| | | ,{field: 'modiUser$', align: 'center',title: '修改人员'} |
| | | ,{field: 'appeTime$', align: 'center',title: '添加时间'} |
| | | ,{field: 'appeUser$', align: 'center',title: '创建者'} |
| | | ,{field: 'status', align: 'center',title: '任务状态'} |
| | | ,{field: 'wrkNo', align: 'center',title: ''} |
| | | // {type: 'checkbox'}, |
| | | {field: 'wrkNo', align: 'center',title: '工作号',sort:true,hide: false} |
| | | ,{field: 'souLocNo', align: 'center',title: '源库位',sort:true,hide: false} |
| | | ,{field: 'endLocNo', align: 'center',title: '目标库位',sort:true,hide: false} |
| | | ,{field: 'souFloor', align: 'center',title: '原楼层',sort:true,hide: false} |
| | | ,{field: 'endFloor', align: 'center',title: '目标楼层',sort:true,hide: false} |
| | | ,{field: 'souStaNo', align: 'center',title: '源站点',sort:true,hide: false} |
| | | ,{field: 'endStaNo', align: 'center',title: '目标站点',sort:true,hide: false} |
| | | ,{field: 'nowPosition', align: 'center',title: '当前节点',sort:false,hide: false} |
| | | ,{field: 'endPosition', align: 'center',title: '目标节点',sort:false,hide: false} |
| | | ,{field: 'ioType$', align: 'center',title: '任务类型',sort:false,hide: true} |
| | | ,{field: 'wrkSts$', align: 'center',title: '工作状态',sort:true,hide: false} |
| | | ,{field: 'ioTime$', align: 'center',title: '工作时间',sort:true,hide: true} |
| | | ,{field: 'modiTime$', align: 'center',title: '修改时间',sort:true,hide: true} |
| | | ,{field: 'modiUser$', align: 'center',title: '修改人员',sort:true,hide: true} |
| | | ,{field: 'appeTime$', align: 'center',title: '添加时间',sort:true,hide: true} |
| | | ,{field: 'appeUser$', align: 'center',title: '创建者',sort:true,hide: true} |
| | | ,{field: 'status', align: 'center',title: '任务状态',sort:true,hide: false} |
| | | |
| | | ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120} |
| | | ]], |
New file |
| | |
| | | var pageCurr; |
| | | layui.config({ |
| | | base: baseUrl + "/static/layui/lay/modules/" |
| | | }).use(['table','laydate', 'form', 'admin'], function(){ |
| | | var table = layui.table; |
| | | var $ = layui.jquery; |
| | | var layer = layui.layer; |
| | | var layDate = layui.laydate; |
| | | var form = layui.form; |
| | | var admin = layui.admin; |
| | | |
| | | // 数据渲染 |
| | | tableIns = table.render({ |
| | | elem: '#wrkMastExecuteLog', |
| | | headers: {token: localStorage.getItem('token')}, |
| | | url: baseUrl+'/wrkMastExecuteLog/list/auth', |
| | | page: true, |
| | | limit: 15, |
| | | limits: [15, 30, 50, 100, 200, 500], |
| | | toolbar: '#toolbar', |
| | | cellMinWidth: 50, |
| | | height: 'full-120', |
| | | cols: [[ |
| | | {type: 'checkbox'} |
| | | ,{field: 'souLocNo', align: 'center',title: '源库位'} |
| | | ,{field: 'endLocNo', align: 'center',title: '目标库位'} |
| | | ,{field: 'souFloor', align: 'center',title: '原楼层'} |
| | | ,{field: 'endFloor', align: 'center',title: '目标楼层'} |
| | | ,{field: 'souStaNo', align: 'center',title: '源站点'} |
| | | ,{field: 'endStaNo', align: 'center',title: '目标站点'} |
| | | ,{field: 'nowPosition', align: 'center',title: '当前节点'} |
| | | ,{field: 'endPosition', align: 'center',title: '目标节点'} |
| | | ,{field: 'ioType$', align: 'center',title: '任务类型'} |
| | | ,{field: 'wrkSts', align: 'center',title: '工作状态'} |
| | | ,{field: 'ioTime$', align: 'center',title: '工作时间'} |
| | | ,{field: 'modiTime$', align: 'center',title: '修改时间'} |
| | | ,{field: 'modiUser$', align: 'center',title: '修改人员'} |
| | | ,{field: 'appeTime$', align: 'center',title: '添加时间'} |
| | | ,{field: 'appeUser$', align: 'center',title: '创建者'} |
| | | ,{field: 'status', align: 'center',title: '任务状态'} |
| | | ,{field: 'wrkNo', align: 'center',title: ''} |
| | | |
| | | ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120} |
| | | ]], |
| | | request: { |
| | | pageName: 'curr', |
| | | pageSize: 'limit' |
| | | }, |
| | | parseData: function (res) { |
| | | return { |
| | | 'code': res.code, |
| | | 'msg': res.msg, |
| | | 'count': res.data.total, |
| | | 'data': res.data.records |
| | | } |
| | | }, |
| | | response: { |
| | | statusCode: 200 |
| | | }, |
| | | done: function(res, curr, count) { |
| | | if (res.code === 403) { |
| | | top.location.href = baseUrl+"/"; |
| | | } |
| | | pageCurr=curr; |
| | | limit(); |
| | | } |
| | | }); |
| | | |
| | | // 监听排序事件 |
| | | table.on('sort(wrkMastExecuteLog)', function (obj) { |
| | | var searchData = {}; |
| | | $.each($('#search-box [name]').serializeArray(), function() { |
| | | searchData[this.name] = this.value; |
| | | }); |
| | | searchData['orderByField'] = obj.field; |
| | | searchData['orderByType'] = obj.type; |
| | | tableIns.reload({ |
| | | where: searchData, |
| | | page: {curr: 1} |
| | | }); |
| | | }); |
| | | |
| | | // 监听头工具栏事件 |
| | | table.on('toolbar(wrkMastExecuteLog)', function (obj) { |
| | | var checkStatus = table.checkStatus(obj.config.id).data; |
| | | switch(obj.event) { |
| | | case 'addData': |
| | | showEditModel(); |
| | | break; |
| | | case 'deleteData': |
| | | if (checkStatus.length === 0) { |
| | | layer.msg('请选择要删除的数据', {icon: 2}); |
| | | return; |
| | | } |
| | | del(checkStatus.map(function (d) { |
| | | return d.id; |
| | | })); |
| | | break; |
| | | case 'exportData': |
| | | admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){ |
| | | var titles=[]; |
| | | var fields=[]; |
| | | obj.config.cols[0].map(function (col) { |
| | | if (col.type === 'normal' && col.hide === false && col.toolbar == null) { |
| | | titles.push(col.title); |
| | | fields.push(col.field); |
| | | } |
| | | }); |
| | | var exportData = {}; |
| | | $.each($('#search-box [name]').serializeArray(), function() { |
| | | exportData[this.name] = this.value; |
| | | }); |
| | | var param = { |
| | | 'wrkMastExecuteLog': exportData, |
| | | 'fields': fields |
| | | }; |
| | | $.ajax({ |
| | | url: baseUrl+"/wrkMastExecuteLog/export/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: JSON.stringify(param), |
| | | dataType:'json', |
| | | contentType:'application/json;charset=UTF-8', |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.closeAll(); |
| | | if (res.code === 200) { |
| | | table.exportFile(titles,res.data,'xls'); |
| | | } else if (res.code === 403) { |
| | | top.location.href = baseUrl+"/"; |
| | | } else { |
| | | layer.msg(res.msg, {icon: 2}) |
| | | } |
| | | } |
| | | }); |
| | | }); |
| | | break; |
| | | } |
| | | }); |
| | | |
| | | // 监听行工具事件 |
| | | table.on('tool(wrkMastExecuteLog)', function(obj){ |
| | | var data = obj.data; |
| | | switch (obj.event) { |
| | | case 'edit': |
| | | showEditModel(data); |
| | | break; |
| | | case "del": |
| | | del([data.id]); |
| | | break; |
| | | } |
| | | }); |
| | | |
| | | /* 弹窗 - 新增、修改 */ |
| | | function showEditModel(mData) { |
| | | admin.open({ |
| | | type: 1, |
| | | area: '600px', |
| | | title: (mData ? '修改' : '添加') + '订单状态', |
| | | content: $('#editDialog').html(), |
| | | success: function (layero, dIndex) { |
| | | layDateRender(mData); |
| | | form.val('detail', mData); |
| | | form.on('submit(editSubmit)', function (data) { |
| | | var loadIndex = layer.load(2); |
| | | $.ajax({ |
| | | url: baseUrl+"/wrkMastExecuteLog/"+(mData?'update':'add')+"/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: data.field, |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.close(loadIndex); |
| | | if (res.code === 200){ |
| | | layer.close(dIndex); |
| | | layer.msg(res.msg, {icon: 1}); |
| | | tableReload(); |
| | | } else if (res.code === 403){ |
| | | top.location.href = baseUrl+"/"; |
| | | }else { |
| | | layer.msg(res.msg, {icon: 2}); |
| | | } |
| | | } |
| | | }) |
| | | return false; |
| | | }); |
| | | $(layero).children('.layui-layer-content').css('overflow', 'visible'); |
| | | layui.form.render('select'); |
| | | } |
| | | }); |
| | | } |
| | | |
| | | /* 删除 */ |
| | | function del(ids) { |
| | | layer.confirm('确定要删除选中数据吗?', { |
| | | skin: 'layui-layer-admin', |
| | | shade: .1 |
| | | }, function (i) { |
| | | layer.close(i); |
| | | var loadIndex = layer.load(2); |
| | | $.ajax({ |
| | | url: baseUrl+"/wrkMastExecuteLog/delete/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: {ids: ids}, |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.close(loadIndex); |
| | | if (res.code === 200){ |
| | | layer.msg(res.msg, {icon: 1}); |
| | | tableReload(); |
| | | } else if (res.code === 403){ |
| | | top.location.href = baseUrl+"/"; |
| | | } else { |
| | | layer.msg(res.msg, {icon: 2}); |
| | | } |
| | | } |
| | | }) |
| | | }); |
| | | } |
| | | |
| | | // 搜索 |
| | | form.on('submit(search)', function (data) { |
| | | pageCurr = 1; |
| | | tableReload(false); |
| | | }); |
| | | |
| | | // 重置 |
| | | form.on('submit(reset)', function (data) { |
| | | pageCurr = 1; |
| | | clearFormVal($('#search-box')); |
| | | tableReload(false); |
| | | }); |
| | | |
| | | // 时间选择器 |
| | | function layDateRender(data) { |
| | | setTimeout(function () { |
| | | layDate.render({ |
| | | elem: '.layui-laydate-range' |
| | | ,type: 'datetime' |
| | | ,range: true |
| | | }); |
| | | layDate.render({ |
| | | elem: '#ioTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['ioTime\\$']:null |
| | | }); |
| | | layDate.render({ |
| | | elem: '#modiTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['modiTime\\$']:null |
| | | }); |
| | | layDate.render({ |
| | | elem: '#appeTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['appeTime\\$']:null |
| | | }); |
| | | |
| | | }, 300); |
| | | } |
| | | layDateRender(); |
| | | |
| | | }); |
| | | |
| | | // 关闭动作 |
| | | $(document).on('click','#data-detail-close', function () { |
| | | parent.layer.closeAll(); |
| | | }); |
| | | |
| | | function tableReload(child) { |
| | | var searchData = {}; |
| | | $.each($('#search-box [name]').serializeArray(), function() { |
| | | searchData[this.name] = this.value; |
| | | }); |
| | | tableIns.reload({ |
| | | where: searchData, |
| | | page: {curr: pageCurr} |
| | | }); |
| | | } |
| | |
| | | <div class="layui-form-item"> |
| | | <div class="layui-inline"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off"> |
| | | <input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-inline" style="width: 300px"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px"> |
| | | </div> |
| | | </div> |
| | | <!-- <div class="layui-inline" style="width: 300px">--> |
| | | <!-- <div class="layui-input-inline">--> |
| | | <!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">--> |
| | | <!-- </div>--> |
| | | <!-- </div>--> |
| | | <div class="layui-inline"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off"> |
| | |
| | | |
| | | <script type="text/html" id="toolbar"> |
| | | <div class="layui-btn-container"> |
| | | <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> |
| | | <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button> |
| | | <!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>--> |
| | | <!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>--> |
| | | <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button> |
| | | </div> |
| | | </script> |
| | | |
| | | <script type="text/html" id="operate"> |
| | | <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a> |
| | | <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a> |
| | | <!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>--> |
| | | </script> |
| | | |
| | | <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> |
New file |
| | |
| | | <!DOCTYPE html> |
| | | <html lang="en"> |
| | | <head> |
| | | <meta charset="utf-8"> |
| | | <title></title> |
| | | <meta name="renderer" content="webkit"> |
| | | <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
| | | <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> |
| | | <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> |
| | | <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> |
| | | <link rel="stylesheet" href="../../static/css/cool.css" media="all"> |
| | | </head> |
| | | <body> |
| | | |
| | | <div class="layui-fluid"> |
| | | <div class="layui-card"> |
| | | <div class="layui-card-body"> |
| | | <div class="layui-form toolbar" id="search-box"> |
| | | <div class="layui-form-item"> |
| | | <div class="layui-inline"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-inline" style="width: 300px"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-inline"> |
| | | <div class="layui-input-inline"> |
| | | <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-inline">  |
| | | <button class="layui-btn icon-btn" lay-filter="search" lay-submit> |
| | | <i class="layui-icon"></i>搜索 |
| | | </button> |
| | | <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> |
| | | <i class="layui-icon"></i>重置 |
| | | </button> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <table class="layui-hide" id="wrkMastExecuteLog" lay-filter="wrkMastExecuteLog"></table> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | |
| | | <script type="text/html" id="toolbar"> |
| | | <div class="layui-btn-container"> |
| | | <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> |
| | | <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button> |
| | | <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button> |
| | | </div> |
| | | </script> |
| | | |
| | | <script type="text/html" id="operate"> |
| | | <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a> |
| | | <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a> |
| | | </script> |
| | | |
| | | <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> |
| | | <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/wrkMastExecuteLog/wrkMastExecuteLog.js" charset="utf-8"></script> |
| | | </body> |
| | | <!-- 表单弹窗 --> |
| | | <script type="text/html" id="editDialog"> |
| | | <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> |
| | | <input name="id" type="hidden"> |
| | | <div class="layui-row"> |
| | | <div class="layui-col-md12"> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">源库位: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="souLocNo" placeholder="请输入源库位"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">目标库位: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="endLocNo" placeholder="请输入目标库位"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">原楼层: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="souFloor" placeholder="请输入原楼层"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">目标楼层: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="endFloor" placeholder="请输入目标楼层"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">源站点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="souStaNo" placeholder="请输入源站点"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">目标站点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="endStaNo" placeholder="请输入目标站点"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">当前节点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="nowPosition" placeholder="请输入当前节点"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">目标节点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="endPosition" placeholder="请输入目标节点"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">任务类型: </label> |
| | | <div class="layui-input-block cool-auto-complete"> |
| | | <input class="layui-input" name="ioType" placeholder="请输入任务类型" style="display: none"> |
| | | <input id="ioType$" name="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入任务类型" onfocus=this.blur()> |
| | | <div class="cool-auto-complete-window"> |
| | | <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))"> |
| | | <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">工作状态: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="wrkSts" placeholder="请输入工作状态"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">工作时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="ioTime" id="ioTime$" placeholder="请输入工作时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">修改时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="modiTime" id="modiTime$" placeholder="请输入修改时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">修改人员: </label> |
| | | <div class="layui-input-block cool-auto-complete"> |
| | | <input class="layui-input" name="modiUser" placeholder="请输入修改人员" style="display: none"> |
| | | <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入修改人员" onfocus=this.blur()> |
| | | <div class="cool-auto-complete-window"> |
| | | <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> |
| | | <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">添加时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入添加时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">创建者: </label> |
| | | <div class="layui-input-block cool-auto-complete"> |
| | | <input class="layui-input" name="appeUser" placeholder="请输入创建者" style="display: none"> |
| | | <input id="appeUser$" name="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入创建者" onfocus=this.blur()> |
| | | <div class="cool-auto-complete-window"> |
| | | <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> |
| | | <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">任务状态: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="status" placeholder="请输入任务状态"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="wrkNo" placeholder="请输入" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | |
| | | </div> |
| | | </div> |
| | | <hr class="layui-bg-gray"> |
| | | <div class="layui-form-item text-right"> |
| | | <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button> |
| | | <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button> |
| | | </div> |
| | | </form> |
| | | </script> |
| | | </html> |
| | | |