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.WrkMastExecute; |
| | | import com.zy.asrs.service.WrkMastExecuteService; |
| | | import com.core.annotations.ManagerAuth; |
| | | import com.core.common.BaseRes; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.common.web.BaseController; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.*; |
| | | |
| | | @RestController |
| | | public class WrkMastExecuteController extends BaseController { |
| | | |
| | | @Autowired |
| | | private WrkMastExecuteService wrkMastExecuteService; |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/{id}/auth") |
| | | @ManagerAuth |
| | | public R get(@PathVariable("id") String id) { |
| | | return R.ok(wrkMastExecuteService.selectById(String.valueOf(id))); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/list/auth") |
| | | @ManagerAuth |
| | | public R list(@RequestParam(defaultValue = "1")Integer curr, |
| | | @RequestParam(defaultValue = "10")Integer limit, |
| | | @RequestParam(required = false)String orderByField, |
| | | @RequestParam(required = false)String orderByType, |
| | | @RequestParam(required = false)String condition, |
| | | @RequestParam Map<String, Object> param){ |
| | | EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>(); |
| | | excludeTrash(param); |
| | | convert(param, wrapper); |
| | | allLike(WrkMastExecute.class, param.keySet(), wrapper, condition); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | return R.ok(wrkMastExecuteService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | | private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ |
| | | for (Map.Entry<String, Object> entry : map.entrySet()){ |
| | | String val = String.valueOf(entry.getValue()); |
| | | if (val.contains(RANGE_TIME_LINK)){ |
| | | String[] dates = val.split(RANGE_TIME_LINK); |
| | | wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); |
| | | wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); |
| | | } else { |
| | | wrapper.like(entry.getKey(), val); |
| | | } |
| | | } |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/add/auth") |
| | | @ManagerAuth |
| | | public R add(WrkMastExecute wrkMastExecute) { |
| | | wrkMastExecuteService.insert(wrkMastExecute); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/update/auth") |
| | | @ManagerAuth |
| | | public R update(WrkMastExecute wrkMastExecute){ |
| | | if (Cools.isEmpty(wrkMastExecute) || null==wrkMastExecute.getId()){ |
| | | return R.error(); |
| | | } |
| | | wrkMastExecuteService.updateById(wrkMastExecute); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/delete/auth") |
| | | @ManagerAuth |
| | | public R delete(@RequestParam(value="ids[]") Long[] ids){ |
| | | for (Long id : ids){ |
| | | wrkMastExecuteService.deleteById(id); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/export/auth") |
| | | @ManagerAuth |
| | | public R export(@RequestBody JSONObject param){ |
| | | EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>(); |
| | | List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); |
| | | Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecute")); |
| | | convert(map, wrapper); |
| | | List<WrkMastExecute> list = wrkMastExecuteService.selectList(wrapper); |
| | | return R.ok(exportSupport(list, fields)); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecuteQuery/auth") |
| | | @ManagerAuth |
| | | public R query(String condition) { |
| | | EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>(); |
| | | wrapper.like("id", condition); |
| | | Page<WrkMastExecute> page = wrkMastExecuteService.selectPage(new Page<>(0, 10), wrapper); |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (WrkMastExecute wrkMastExecute : page.getRecords()){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", wrkMastExecute.getId()); |
| | | map.put("value", wrkMastExecute.getId()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/wrkMastExecute/check/column/auth") |
| | | @ManagerAuth |
| | | public R query(@RequestBody JSONObject param) { |
| | | Wrapper<WrkMastExecute> wrapper = new EntityWrapper<WrkMastExecute>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); |
| | | if (null != wrkMastExecuteService.selectOne(wrapper)){ |
| | | return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecute.class, String.valueOf(param.get("key")))); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | } |
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.getId()){ |
| | | 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.getId()); |
| | | map.put("value", wrkMastExecuteLog.getId()); |
| | | 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(); |
| | | } |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.entity; |
| | | |
| | | import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; |
| | | import com.baomidou.mybatisplus.enums.IdType; |
| | | import com.baomidou.mybatisplus.annotations.TableField; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import com.core.common.SpringUtils; |
| | | import com.zy.asrs.service.BasJarMastStatusService; |
| | | import com.zy.asrs.entity.BasJarMastStatus; |
| | | |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import com.baomidou.mybatisplus.annotations.TableName; |
| | | import java.io.Serializable; |
| | | |
| | | @Data |
| | | @TableName("jar_wrk_mast_execute") |
| | | public class WrkMastExecute implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * ID |
| | | */ |
| | | @ApiModelProperty(value= "ID") |
| | | private Long id; |
| | | |
| | | /** |
| | | * 工作号 |
| | | */ |
| | | @ApiModelProperty(value= "工作号") |
| | | @TableId(value = "wrk_no", type = IdType.INPUT) |
| | | @TableField("wrk_no") |
| | | private Long wrkNo; |
| | | |
| | | /** |
| | | * 入库源站点 |
| | | */ |
| | | @ApiModelProperty(value= "入库源站点") |
| | | @TableField("enter_sta_no") |
| | | private Integer enterStaNo; |
| | | |
| | | /** |
| | | * 入库目标站点 |
| | | */ |
| | | @ApiModelProperty(value= "入库目标站点") |
| | | @TableField("out_sta_no") |
| | | private Integer outStaNo; |
| | | |
| | | /** |
| | | * 入硫化罐站点 |
| | | */ |
| | | @ApiModelProperty(value= "入硫化罐站点") |
| | | @TableField("jar_enter_sta_no") |
| | | private Integer jarEnterStaNo; |
| | | |
| | | /** |
| | | * 出硫化罐站点 |
| | | */ |
| | | @ApiModelProperty(value= "出硫化罐站点") |
| | | @TableField("jar_out_sta_no") |
| | | private Integer jarOutStaNo; |
| | | |
| | | /** |
| | | * 设备ID |
| | | */ |
| | | @ApiModelProperty(value= "设备ID") |
| | | @TableField("jar_id") |
| | | private Integer jarId; |
| | | |
| | | /** |
| | | * 区域 |
| | | */ |
| | | @ApiModelProperty(value= "区域") |
| | | @TableField("jar_regin") |
| | | private Integer jarRegin; |
| | | |
| | | /** |
| | | * 状态 |
| | | */ |
| | | @ApiModelProperty(value= "状态") |
| | | private Integer status; |
| | | |
| | | /** |
| | | * 穿梭板 |
| | | */ |
| | | @ApiModelProperty(value= "穿梭板") |
| | | @TableField("ste_id") |
| | | private Integer steId; |
| | | |
| | | /** |
| | | * RGV |
| | | */ |
| | | @ApiModelProperty(value= "RGV") |
| | | @TableField("rgv_id") |
| | | private Integer rgvId; |
| | | |
| | | /** |
| | | * 作业时间 |
| | | */ |
| | | @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("appe_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date appeTime; |
| | | |
| | | /** |
| | | * 任务状态 0: 初始 1: 作业中 2: 完成 |
| | | */ |
| | | @ApiModelProperty(value= "任务状态 0: 初始 1: 作业中 2: 完成 ") |
| | | @TableField("wrk_type") |
| | | private Integer wrkType; |
| | | |
| | | /** |
| | | * 工作状态 |
| | | */ |
| | | @ApiModelProperty(value= "工作状态") |
| | | @TableField("wrk_sts") |
| | | private Integer wrkSts; |
| | | |
| | | /** |
| | | * 任务类型 0: 未知 1: 开门 2: 关门 3: 入硫化罐 4: 入冷却槽 5: 穿梭车进冷却槽 6: 穿梭车离开冷却槽 7: 出冷却槽 |
| | | */ |
| | | @ApiModelProperty(value= "任务类型 0: 未知 1: 开门 2: 关门 3: 入硫化罐 4: 入冷却槽 5: 穿梭车进冷却槽 6: 穿梭车离开冷却槽 7: 出冷却槽 ") |
| | | @TableId(value = "io_type", type = IdType.INPUT) |
| | | @TableField("io_type") |
| | | private Integer ioType; |
| | | |
| | | /** |
| | | * 设备 0: 未知 1: 硫化罐 2: 冷却槽 |
| | | */ |
| | | @ApiModelProperty(value= "设备 0: 未知 1: 硫化罐 2: 冷却槽 ") |
| | | private Integer type; |
| | | |
| | | /** |
| | | * 尾部穿梭板 |
| | | */ |
| | | @ApiModelProperty(value= "尾部穿梭板") |
| | | @TableField("rgv_end_id") |
| | | private Integer rgvEndId; |
| | | |
| | | public WrkMastExecute() {} |
| | | |
| | | public WrkMastExecute(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer steId,Integer rgvId,Date ioTime,Date modiTime,Date appeTime,Integer wrkType,Integer wrkSts,Integer ioType,Integer type,Integer rgvEndId) { |
| | | this.wrkNo = wrkNo; |
| | | this.enterStaNo = enterStaNo; |
| | | this.outStaNo = outStaNo; |
| | | this.jarEnterStaNo = jarEnterStaNo; |
| | | this.jarOutStaNo = jarOutStaNo; |
| | | this.jarId = jarId; |
| | | this.jarRegin = jarRegin; |
| | | this.status = status; |
| | | this.steId = steId; |
| | | this.rgvId = rgvId; |
| | | this.ioTime = ioTime; |
| | | this.modiTime = modiTime; |
| | | this.appeTime = appeTime; |
| | | this.wrkType = wrkType; |
| | | this.wrkSts = wrkSts; |
| | | this.ioType = ioType; |
| | | this.type = type; |
| | | this.rgvEndId = rgvEndId; |
| | | } |
| | | |
| | | // WrkMastExecute wrkMastExecute = new WrkMastExecute( |
| | | // null, // 工作号[非空] |
| | | // null, // 入库源站点[非空] |
| | | // null, // 入库目标站点[非空] |
| | | // null, // 入硫化罐站点[非空] |
| | | // null, // 出硫化罐站点[非空] |
| | | // null, // 设备ID[非空] |
| | | // null, // 区域[非空] |
| | | // null, // 状态[非空] |
| | | // null, // 穿梭板[非空] |
| | | // null, // RGV[非空] |
| | | // null, // 作业时间 |
| | | // null, // 创建时间 |
| | | // null, // 更新时间 |
| | | // null, // 任务状态[非空] |
| | | // null, // 工作状态[非空] |
| | | // null, // 任务类型[非空] |
| | | // null, // 设备[非空] |
| | | // 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 getAppeTime$(){ |
| | | if (Cools.isEmpty(this.appeTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); |
| | | } |
| | | |
| | | public String getWrkType$(){ |
| | | if (null == this.wrkType){ return null; } |
| | | switch (this.wrkType){ |
| | | case 0: |
| | | return "初始"; |
| | | case 1: |
| | | return "作业中"; |
| | | case 2: |
| | | return "完成"; |
| | | default: |
| | | return String.valueOf(this.wrkType); |
| | | } |
| | | } |
| | | |
| | | public String getWrkSts$(){ |
| | | BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class); |
| | | BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts); |
| | | if (!Cools.isEmpty(basJarMastStatus)){ |
| | | return String.valueOf(basJarMastStatus.getId()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public String getIoType$(){ |
| | | if (null == this.ioType){ return null; } |
| | | switch (this.ioType){ |
| | | case 0: |
| | | return "未知"; |
| | | case 1: |
| | | return "开门"; |
| | | case 2: |
| | | return "关门"; |
| | | case 3: |
| | | return "入硫化罐"; |
| | | case 4: |
| | | return "入冷却槽"; |
| | | case 5: |
| | | return "穿梭车进冷却槽"; |
| | | case 6: |
| | | return "穿梭车离开冷却槽"; |
| | | case 7: |
| | | return "出冷却槽"; |
| | | default: |
| | | return String.valueOf(this.ioType); |
| | | } |
| | | } |
| | | |
| | | public String getType$(){ |
| | | if (null == this.type){ return null; } |
| | | switch (this.type){ |
| | | case 0: |
| | | return "未知"; |
| | | case 1: |
| | | return "硫化罐"; |
| | | case 2: |
| | | return "冷却槽"; |
| | | default: |
| | | return String.valueOf(this.type); |
| | | } |
| | | } |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.entity; |
| | | |
| | | import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; |
| | | import com.baomidou.mybatisplus.enums.IdType; |
| | | import com.baomidou.mybatisplus.annotations.TableField; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | import com.core.common.SpringUtils; |
| | | import com.zy.asrs.service.BasJarMastStatusService; |
| | | import com.zy.asrs.entity.BasJarMastStatus; |
| | | |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import com.baomidou.mybatisplus.annotations.TableName; |
| | | import java.io.Serializable; |
| | | |
| | | @Data |
| | | @TableName("jar_wrk_mast_execute_log") |
| | | public class WrkMastExecuteLog implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * ID |
| | | */ |
| | | @ApiModelProperty(value= "ID") |
| | | private Long id; |
| | | |
| | | /** |
| | | * 工作号 |
| | | */ |
| | | @ApiModelProperty(value= "工作号") |
| | | @TableId(value = "wrk_no", type = IdType.INPUT) |
| | | @TableField("wrk_no") |
| | | private Long wrkNo; |
| | | |
| | | /** |
| | | * 入库源站点 |
| | | */ |
| | | @ApiModelProperty(value= "入库源站点") |
| | | @TableField("enter_sta_no") |
| | | private Integer enterStaNo; |
| | | |
| | | /** |
| | | * 入库目标站点 |
| | | */ |
| | | @ApiModelProperty(value= "入库目标站点") |
| | | @TableField("out_sta_no") |
| | | private Integer outStaNo; |
| | | |
| | | /** |
| | | * 入硫化罐站点 |
| | | */ |
| | | @ApiModelProperty(value= "入硫化罐站点") |
| | | @TableField("jar_enter_sta_no") |
| | | private Integer jarEnterStaNo; |
| | | |
| | | /** |
| | | * 出硫化罐站点 |
| | | */ |
| | | @ApiModelProperty(value= "出硫化罐站点") |
| | | @TableField("jar_out_sta_no") |
| | | private Integer jarOutStaNo; |
| | | |
| | | /** |
| | | * 设备ID |
| | | */ |
| | | @ApiModelProperty(value= "设备ID") |
| | | @TableField("jar_id") |
| | | private Integer jarId; |
| | | |
| | | /** |
| | | * 区域 |
| | | */ |
| | | @ApiModelProperty(value= "区域") |
| | | @TableField("jar_regin") |
| | | private Integer jarRegin; |
| | | |
| | | /** |
| | | * 状态 |
| | | */ |
| | | @ApiModelProperty(value= "状态") |
| | | private Integer status; |
| | | |
| | | /** |
| | | * 穿梭板 |
| | | */ |
| | | @ApiModelProperty(value= "穿梭板") |
| | | @TableField("ste_id") |
| | | private Integer steId; |
| | | |
| | | /** |
| | | * RGV |
| | | */ |
| | | @ApiModelProperty(value= "RGV") |
| | | @TableField("rgv_id") |
| | | private Integer rgvId; |
| | | |
| | | /** |
| | | * 作业时间 |
| | | */ |
| | | @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("appe_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date appeTime; |
| | | |
| | | /** |
| | | * 任务状态 0: 初始 1: 作业中 2: 完成 |
| | | */ |
| | | @ApiModelProperty(value= "任务状态 0: 初始 1: 作业中 2: 完成 ") |
| | | @TableField("wrk_type") |
| | | private Integer wrkType; |
| | | |
| | | /** |
| | | * 工作状态 |
| | | */ |
| | | @ApiModelProperty(value= "工作状态") |
| | | @TableField("wrk_sts") |
| | | private Integer wrkSts; |
| | | |
| | | /** |
| | | * 任务类型 0: 未知 1: 开门 2: 关门 3: 入硫化罐 4: 入冷却槽 5: 穿梭车进冷却槽 6: 穿梭车离开冷却槽 7: 出冷却槽 |
| | | */ |
| | | @ApiModelProperty(value= "任务类型 0: 未知 1: 开门 2: 关门 3: 入硫化罐 4: 入冷却槽 5: 穿梭车进冷却槽 6: 穿梭车离开冷却槽 7: 出冷却槽 ") |
| | | @TableId(value = "io_type", type = IdType.INPUT) |
| | | @TableField("io_type") |
| | | private Integer ioType; |
| | | |
| | | /** |
| | | * 设备 0: 未知 1: 硫化罐 2: 冷却槽 |
| | | */ |
| | | @ApiModelProperty(value= "设备 0: 未知 1: 硫化罐 2: 冷却槽 ") |
| | | private Integer type; |
| | | |
| | | /** |
| | | * 尾部穿梭板 |
| | | */ |
| | | @ApiModelProperty(value= "尾部穿梭板") |
| | | @TableField("rgv_end_id") |
| | | private Integer rgvEndId; |
| | | |
| | | public WrkMastExecuteLog() {} |
| | | |
| | | public WrkMastExecuteLog(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer steId,Integer rgvId,Date ioTime,Date modiTime,Date appeTime,Integer wrkType,Integer wrkSts,Integer ioType,Integer type,Integer rgvEndId) { |
| | | this.wrkNo = wrkNo; |
| | | this.enterStaNo = enterStaNo; |
| | | this.outStaNo = outStaNo; |
| | | this.jarEnterStaNo = jarEnterStaNo; |
| | | this.jarOutStaNo = jarOutStaNo; |
| | | this.jarId = jarId; |
| | | this.jarRegin = jarRegin; |
| | | this.status = status; |
| | | this.steId = steId; |
| | | this.rgvId = rgvId; |
| | | this.ioTime = ioTime; |
| | | this.modiTime = modiTime; |
| | | this.appeTime = appeTime; |
| | | this.wrkType = wrkType; |
| | | this.wrkSts = wrkSts; |
| | | this.ioType = ioType; |
| | | this.type = type; |
| | | this.rgvEndId = rgvEndId; |
| | | } |
| | | |
| | | // WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog( |
| | | // null, // 工作号[非空] |
| | | // null, // 入库源站点[非空] |
| | | // null, // 入库目标站点[非空] |
| | | // null, // 入硫化罐站点[非空] |
| | | // null, // 出硫化罐站点[非空] |
| | | // null, // 设备ID[非空] |
| | | // null, // 区域[非空] |
| | | // null, // 状态[非空] |
| | | // null, // 穿梭板[非空] |
| | | // null, // RGV[非空] |
| | | // null, // 作业时间 |
| | | // null, // 创建时间 |
| | | // null, // 更新时间 |
| | | // null, // 任务状态[非空] |
| | | // null, // 工作状态[非空] |
| | | // null, // 任务类型[非空] |
| | | // null, // 设备[非空] |
| | | // 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 getAppeTime$(){ |
| | | if (Cools.isEmpty(this.appeTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); |
| | | } |
| | | |
| | | public String getWrkType$(){ |
| | | if (null == this.wrkType){ return null; } |
| | | switch (this.wrkType){ |
| | | case 0: |
| | | return "初始"; |
| | | case 1: |
| | | return "作业中"; |
| | | case 2: |
| | | return "完成"; |
| | | default: |
| | | return String.valueOf(this.wrkType); |
| | | } |
| | | } |
| | | |
| | | public String getWrkSts$(){ |
| | | BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class); |
| | | BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts); |
| | | if (!Cools.isEmpty(basJarMastStatus)){ |
| | | return String.valueOf(basJarMastStatus.getId()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public String getIoType$(){ |
| | | if (null == this.ioType){ return null; } |
| | | switch (this.ioType){ |
| | | case 0: |
| | | return "未知"; |
| | | case 1: |
| | | return "开门"; |
| | | case 2: |
| | | return "关门"; |
| | | case 3: |
| | | return "入硫化罐"; |
| | | case 4: |
| | | return "入冷却槽"; |
| | | case 5: |
| | | return "穿梭车进冷却槽"; |
| | | case 6: |
| | | return "穿梭车离开冷却槽"; |
| | | case 7: |
| | | return "出冷却槽"; |
| | | default: |
| | | return String.valueOf(this.ioType); |
| | | } |
| | | } |
| | | |
| | | public String getType$(){ |
| | | if (null == this.type){ return null; } |
| | | switch (this.type){ |
| | | case 0: |
| | | return "未知"; |
| | | case 1: |
| | | return "硫化罐"; |
| | | case 2: |
| | | return "冷却槽"; |
| | | default: |
| | | return String.valueOf(this.type); |
| | | } |
| | | } |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.mapper; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.baomidou.mybatisplus.mapper.BaseMapper; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | @Mapper |
| | | @Repository |
| | | public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> { |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.mapper; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.baomidou.mybatisplus.mapper.BaseMapper; |
| | | import org.apache.ibatis.annotations.Insert; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | @Mapper |
| | | @Repository |
| | | public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> { |
| | | |
| | | @Insert("insert into jar_wrk_mast_execute_log select * from jar_wrk_mast_execute where io_type=#{ioType} and wrk_sts=#{wrkSts} and wrk_type=1") |
| | | int save(@Param("ioType") Integer ioType,@Param("wrkSts") Integer wrkSts); |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecuteLog; |
| | | import com.baomidou.mybatisplus.service.IService; |
| | | |
| | | public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> { |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service; |
| | | |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.baomidou.mybatisplus.service.IService; |
| | | |
| | | public interface WrkMastExecuteService extends IService<WrkMastExecute> { |
| | | boolean save(int[] excute); |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service.impl; |
| | | |
| | | 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 { |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.service.impl; |
| | | |
| | | import com.zy.asrs.mapper.WrkMastExecuteMapper; |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.service.WrkMastExecuteService; |
| | | import com.baomidou.mybatisplus.service.impl.ServiceImpl; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | @Service("wrkMastExecuteService") |
| | | public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService { |
| | | @Override |
| | | public boolean save(int[] excute) { |
| | | return this.baseMapper.save(excute[0],excute[1]) > 0; |
| | | } |
| | | } |
New file |
| | |
| | | package com.zy.asrs.task; |
| | | |
| | | import com.zy.asrs.task.handler.WrkMastExecuteHandler; |
| | | import org.slf4j.Logger; |
| | | import org.slf4j.LoggerFactory; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.scheduling.annotation.Scheduled; |
| | | import org.springframework.stereotype.Component; |
| | | |
| | | |
| | | /** |
| | | * Created by Monkey D. Luffy on 2024.06.27 |
| | | * 亳州煜星..............以下.............亳州煜星.............硫化罐区域执行任务 |
| | | */ |
| | | @Component |
| | | public class WrkMastExecuteScheduler { |
| | | |
| | | private static final Logger log = LoggerFactory.getLogger(WrkMastExecuteScheduler.class); |
| | | private static final int[][] execute = new int[][]{{1,5},{2,5},{3,5},{4,5},{5,7},{6,7},{7,5},{8,5},{9,4},{10,5},{11,5}}; |
| | | |
| | | |
| | | @Autowired |
| | | private WrkMastExecuteHandler wrkMastExecuteHandler; |
| | | @Autowired |
| | | |
| | | |
| | | |
| | | @Scheduled(cron = "0/3 * * * * ? ") |
| | | private void execute(){ |
| | | for (int[] excuteNow : execute){ |
| | | try{ |
| | | wrkMastExecuteHandler.start(excuteNow); |
| | | } catch (Exception e){ |
| | | log.error("硫化罐任务转历史档案失败!!!"); |
| | | } |
| | | } |
| | | } |
| | | |
| | | } |
New file |
| | |
| | | package com.zy.asrs.task.handler; |
| | | |
| | | import com.alibaba.fastjson.JSON; |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.zy.asrs.entity.WrkMastExecute; |
| | | import com.zy.asrs.service.WrkMastExecuteService; |
| | | import com.zy.asrs.task.AbstractHandler; |
| | | import com.zy.asrs.task.core.ReturnT; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | | |
| | | |
| | | /** |
| | | * Created by Monkey D. Luffy on 2024.06.27 |
| | | * 亳州煜星..............以下.............亳州煜星.............硫化罐区域执行任务 |
| | | */ |
| | | @Slf4j |
| | | @Service |
| | | @Transactional |
| | | public class WrkMastExecuteHandler extends AbstractHandler<String> { |
| | | @Autowired |
| | | private WrkMastExecuteService wrkMastExecuteService; |
| | | |
| | | public ReturnT<String> start(int[] excute) { |
| | | try { |
| | | //保存历史档案 |
| | | if (!wrkMastExecuteService.save(excute)){ |
| | | log.error("保存硫化罐区域执行任务历史档[workNo={"+ JSON.toJSONString(excute) +"}]失败"); |
| | | } |
| | | //删除工作档案 |
| | | if (!wrkMastExecuteService.delete(new EntityWrapper<WrkMastExecute>().eq("io_type",excute[0]).eq("wrk_sts",excute[1]).eq("wrk_type",2))){ |
| | | log.error("删除硫化罐区域执行任务[workNo={"+JSON.toJSONString(excute)+"}]失败"); |
| | | } |
| | | }catch (Exception e){ |
| | | log.error("异常!!!"+e); |
| | | return FAIL; |
| | | } |
| | | return SUCCESS; |
| | | } |
| | | } |
| | |
| | | // generator.table="sys_host"; |
| | | // sqlserver |
| | | generator.sqlOsType = SqlOsType.SQL_SERVER; |
| | | generator.url="192.168.4.15:1433;databasename=ahyxasrs"; |
| | | generator.url="10.10.10.254:1433;databasename=ahyxasrs"; |
| | | generator.username="sa"; |
| | | generator.password="sa@123"; |
| | | generator.table="asr_bas_jar_mast_log"; |
| | | generator.table="jar_wrk_mast_execute_log"; |
| | | generator.packagePath="com.zy.asrs"; |
| | | generator.build(); |
| | | } |
New file |
| | |
| | | -- save wrkMastExecute record |
| | | -- mysql |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute/wrkMastExecute.html', 'wrkMastExecute管理', null , '2', null , '1'); |
| | | |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#view', '查询', '', '3', '0', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-add', '新增', '', '3', '1', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-edit', '编辑', '', '3', '2', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-delete', '删除', '', '3', '3', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-export', '导出', '', '3', '4', '1'); |
| | | |
| | | -- sqlserver |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute/wrkMastExecute.html', N'wrkMastExecute管理', null, '2', null, '1'); |
| | | |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#view', N'查询', '', '3', '0', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-add', N'新增', '', '3', '1', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-edit', N'编辑', '', '3', '2', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-delete', N'删除', '', '3', '3', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-export', N'导出', '', '3', '4', '1'); |
New file |
| | |
| | | -- save wrkMastExecuteLog record |
| | | -- mysql |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog/wrkMastExecuteLog.html', 'wrkMastExecuteLog管理', null , '2', null , '1'); |
| | | |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#view', '查询', '', '3', '0', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-add', '新增', '', '3', '1', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-edit', '编辑', '', '3', '2', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-delete', '删除', '', '3', '3', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-export', '导出', '', '3', '4', '1'); |
| | | |
| | | -- sqlserver |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog/wrkMastExecuteLog.html', N'wrkMastExecuteLog管理', null, '2', null, '1'); |
| | | |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#view', N'查询', '', '3', '0', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-add', N'新增', '', '3', '1', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-edit', N'编辑', '', '3', '2', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-delete', N'删除', '', '3', '3', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-export', N'导出', '', '3', '4', '1'); |
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"> |
| | | <id column="id" property="id" /> |
| | | <result column="wrk_no" property="wrkNo" /> |
| | | <result column="enter_sta_no" property="enterStaNo" /> |
| | | <result column="out_sta_no" property="outStaNo" /> |
| | | <result column="jar_enter_sta_no" property="jarEnterStaNo" /> |
| | | <result column="jar_out_sta_no" property="jarOutStaNo" /> |
| | | <result column="jar_id" property="jarId" /> |
| | | <result column="jar_regin" property="jarRegin" /> |
| | | <result column="status" property="status" /> |
| | | <result column="ste_id" property="steId" /> |
| | | <result column="rgv_id" property="rgvId" /> |
| | | <result column="io_time" property="ioTime" /> |
| | | <result column="modi_time" property="modiTime" /> |
| | | <result column="appe_time" property="appeTime" /> |
| | | <result column="wrk_type" property="wrkType" /> |
| | | <result column="wrk_sts" property="wrkSts" /> |
| | | <result column="io_type" property="ioType" /> |
| | | <result column="type" property="type" /> |
| | | <result column="rgv_end_id" property="rgvEndId" /> |
| | | |
| | | </resultMap> |
| | | |
| | | </mapper> |
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.WrkMastExecuteMapper"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute"> |
| | | <id column="id" property="id" /> |
| | | <result column="wrk_no" property="wrkNo" /> |
| | | <result column="enter_sta_no" property="enterStaNo" /> |
| | | <result column="out_sta_no" property="outStaNo" /> |
| | | <result column="jar_enter_sta_no" property="jarEnterStaNo" /> |
| | | <result column="jar_out_sta_no" property="jarOutStaNo" /> |
| | | <result column="jar_id" property="jarId" /> |
| | | <result column="jar_regin" property="jarRegin" /> |
| | | <result column="status" property="status" /> |
| | | <result column="ste_id" property="steId" /> |
| | | <result column="rgv_id" property="rgvId" /> |
| | | <result column="io_time" property="ioTime" /> |
| | | <result column="modi_time" property="modiTime" /> |
| | | <result column="appe_time" property="appeTime" /> |
| | | <result column="wrk_type" property="wrkType" /> |
| | | <result column="wrk_sts" property="wrkSts" /> |
| | | <result column="io_type" property="ioType" /> |
| | | <result column="type" property="type" /> |
| | | <result column="rgv_end_id" property="rgvEndId" /> |
| | | |
| | | </resultMap> |
| | | |
| | | </mapper> |
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: '#wrkMastExecute', |
| | | headers: {token: localStorage.getItem('token')}, |
| | | url: baseUrl+'/wrkMastExecute/list/auth', |
| | | page: true, |
| | | limit: 15, |
| | | limits: [15, 30, 50, 100, 200, 500], |
| | | toolbar: '#toolbar', |
| | | cellMinWidth: 50, |
| | | height: 'full-120', |
| | | cols: [[ |
| | | {type: 'checkbox'} |
| | | ,{field: 'id', align: 'center',title: 'ID'} |
| | | ,{field: 'wrkNo', align: 'center',title: '工作号'} |
| | | ,{field: 'enterStaNo', align: 'center',title: '入库源站点'} |
| | | ,{field: 'outStaNo', align: 'center',title: '入库目标站点'} |
| | | ,{field: 'jarEnterStaNo', align: 'center',title: '入硫化罐站点'} |
| | | ,{field: 'jarOutStaNo', align: 'center',title: '出硫化罐站点'} |
| | | ,{field: 'jarId', align: 'center',title: '设备ID'} |
| | | ,{field: 'jarRegin', align: 'center',title: '区域'} |
| | | ,{field: 'status', align: 'center',title: '状态'} |
| | | ,{field: 'steId', align: 'center',title: '穿梭板'} |
| | | ,{field: 'rgvId', align: 'center',title: 'RGV'} |
| | | ,{field: 'ioTime$', align: 'center',title: '作业时间'} |
| | | ,{field: 'modiTime$', align: 'center',title: '创建时间'} |
| | | ,{field: 'appeTime$', align: 'center',title: '更新时间'} |
| | | ,{field: 'wrkType$', align: 'center',title: '任务状态'} |
| | | ,{field: 'wrkSts$', align: 'center',title: '工作状态'} |
| | | ,{field: 'ioType$', align: 'center',title: '任务类型'} |
| | | ,{field: 'type$', align: 'center',title: '设备'} |
| | | ,{field: 'rgvEndId', align: 'center',title: '尾部穿梭板'} |
| | | |
| | | ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120} |
| | | ]], |
| | | request: { |
| | | pageName: 'curr', |
| | | pageSize: 'limit' |
| | | }, |
| | | parseData: function (res) { |
| | | return { |
| | | 'code': res.code, |
| | | 'msg': res.msg, |
| | | 'count': res.data.total, |
| | | 'data': res.data.records |
| | | } |
| | | }, |
| | | response: { |
| | | statusCode: 200 |
| | | }, |
| | | done: function(res, curr, count) { |
| | | if (res.code === 403) { |
| | | top.location.href = baseUrl+"/"; |
| | | } |
| | | pageCurr=curr; |
| | | limit(); |
| | | } |
| | | }); |
| | | |
| | | // 监听排序事件 |
| | | table.on('sort(wrkMastExecute)', function (obj) { |
| | | var searchData = {}; |
| | | $.each($('#search-box [name]').serializeArray(), function() { |
| | | searchData[this.name] = this.value; |
| | | }); |
| | | searchData['orderByField'] = obj.field; |
| | | searchData['orderByType'] = obj.type; |
| | | tableIns.reload({ |
| | | where: searchData, |
| | | page: {curr: 1} |
| | | }); |
| | | }); |
| | | |
| | | // 监听头工具栏事件 |
| | | table.on('toolbar(wrkMastExecute)', function (obj) { |
| | | var checkStatus = table.checkStatus(obj.config.id).data; |
| | | switch(obj.event) { |
| | | case 'addData': |
| | | showEditModel(); |
| | | break; |
| | | case 'deleteData': |
| | | if (checkStatus.length === 0) { |
| | | layer.msg('请选择要删除的数据', {icon: 2}); |
| | | return; |
| | | } |
| | | del(checkStatus.map(function (d) { |
| | | return d.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 = { |
| | | 'wrkMastExecute': exportData, |
| | | 'fields': fields |
| | | }; |
| | | $.ajax({ |
| | | url: baseUrl+"/wrkMastExecute/export/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: JSON.stringify(param), |
| | | dataType:'json', |
| | | contentType:'application/json;charset=UTF-8', |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.closeAll(); |
| | | if (res.code === 200) { |
| | | table.exportFile(titles,res.data,'xls'); |
| | | } else if (res.code === 403) { |
| | | top.location.href = baseUrl+"/"; |
| | | } else { |
| | | layer.msg(res.msg, {icon: 2}) |
| | | } |
| | | } |
| | | }); |
| | | }); |
| | | break; |
| | | } |
| | | }); |
| | | |
| | | // 监听行工具事件 |
| | | table.on('tool(wrkMastExecute)', function(obj){ |
| | | var data = obj.data; |
| | | switch (obj.event) { |
| | | case 'edit': |
| | | showEditModel(data); |
| | | break; |
| | | case "del": |
| | | del([data.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+"/wrkMastExecute/"+(mData?'update':'add')+"/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: data.field, |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.close(loadIndex); |
| | | if (res.code === 200){ |
| | | layer.close(dIndex); |
| | | layer.msg(res.msg, {icon: 1}); |
| | | tableReload(); |
| | | } else if (res.code === 403){ |
| | | top.location.href = baseUrl+"/"; |
| | | }else { |
| | | layer.msg(res.msg, {icon: 2}); |
| | | } |
| | | } |
| | | }) |
| | | return false; |
| | | }); |
| | | $(layero).children('.layui-layer-content').css('overflow', 'visible'); |
| | | layui.form.render('select'); |
| | | } |
| | | }); |
| | | } |
| | | |
| | | /* 删除 */ |
| | | function del(ids) { |
| | | layer.confirm('确定要删除选中数据吗?', { |
| | | skin: 'layui-layer-admin', |
| | | shade: .1 |
| | | }, function (i) { |
| | | layer.close(i); |
| | | var loadIndex = layer.load(2); |
| | | $.ajax({ |
| | | url: baseUrl+"/wrkMastExecute/delete/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | data: {ids: ids}, |
| | | method: 'POST', |
| | | success: function (res) { |
| | | layer.close(loadIndex); |
| | | if (res.code === 200){ |
| | | layer.msg(res.msg, {icon: 1}); |
| | | tableReload(); |
| | | } else if (res.code === 403){ |
| | | top.location.href = baseUrl+"/"; |
| | | } else { |
| | | layer.msg(res.msg, {icon: 2}); |
| | | } |
| | | } |
| | | }) |
| | | }); |
| | | } |
| | | |
| | | // 搜索 |
| | | form.on('submit(search)', function (data) { |
| | | pageCurr = 1; |
| | | tableReload(false); |
| | | }); |
| | | |
| | | // 重置 |
| | | form.on('submit(reset)', function (data) { |
| | | pageCurr = 1; |
| | | clearFormVal($('#search-box')); |
| | | tableReload(false); |
| | | }); |
| | | |
| | | // 时间选择器 |
| | | function layDateRender(data) { |
| | | setTimeout(function () { |
| | | layDate.render({ |
| | | elem: '.layui-laydate-range' |
| | | ,type: 'datetime' |
| | | ,range: true |
| | | }); |
| | | layDate.render({ |
| | | elem: '#ioTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['ioTime\\$']:null |
| | | }); |
| | | layDate.render({ |
| | | elem: '#modiTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['modiTime\\$']:null |
| | | }); |
| | | layDate.render({ |
| | | elem: '#appeTime\\$', |
| | | type: 'datetime', |
| | | value: data!==undefined?data['appeTime\\$']:null |
| | | }); |
| | | |
| | | }, 300); |
| | | } |
| | | layDateRender(); |
| | | |
| | | }); |
| | | |
| | | // 关闭动作 |
| | | $(document).on('click','#data-detail-close', function () { |
| | | parent.layer.closeAll(); |
| | | }); |
| | | |
| | | function tableReload(child) { |
| | | var searchData = {}; |
| | | $.each($('#search-box [name]').serializeArray(), function() { |
| | | searchData[this.name] = this.value; |
| | | }); |
| | | tableIns.reload({ |
| | | where: searchData, |
| | | page: {curr: pageCurr} |
| | | }); |
| | | } |
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: 'id', align: 'center',title: 'ID'} |
| | | ,{field: 'wrkNo', align: 'center',title: '工作号'} |
| | | ,{field: 'enterStaNo', align: 'center',title: '入库源站点'} |
| | | ,{field: 'outStaNo', align: 'center',title: '入库目标站点'} |
| | | ,{field: 'jarEnterStaNo', align: 'center',title: '入硫化罐站点'} |
| | | ,{field: 'jarOutStaNo', align: 'center',title: '出硫化罐站点'} |
| | | ,{field: 'jarId', align: 'center',title: '设备ID'} |
| | | ,{field: 'jarRegin', align: 'center',title: '区域'} |
| | | ,{field: 'status', align: 'center',title: '状态'} |
| | | ,{field: 'steId', align: 'center',title: '穿梭板'} |
| | | ,{field: 'rgvId', align: 'center',title: 'RGV'} |
| | | ,{field: 'ioTime$', align: 'center',title: '作业时间'} |
| | | ,{field: 'modiTime$', align: 'center',title: '创建时间'} |
| | | ,{field: 'appeTime$', align: 'center',title: '更新时间'} |
| | | ,{field: 'wrkType$', align: 'center',title: '任务状态'} |
| | | ,{field: 'wrkSts$', align: 'center',title: '工作状态'} |
| | | ,{field: 'ioType$', align: 'center',title: '任务类型'} |
| | | ,{field: 'type$', align: 'center',title: '设备'} |
| | | ,{field: 'rgvEndId', 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} |
| | | }); |
| | | } |
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="wrkMastExecute" lay-filter="wrkMastExecute"></table> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | |
| | | <script type="text/html" id="toolbar"> |
| | | <div class="layui-btn-container"> |
| | | <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> |
| | | <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button> |
| | | <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button> |
| | | </div> |
| | | </script> |
| | | |
| | | <script type="text/html" id="operate"> |
| | | <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a> |
| | | <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a> |
| | | </script> |
| | | |
| | | <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> |
| | | <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> |
| | | <script type="text/javascript" src="../../static/js/wrkMastExecute/wrkMastExecute.js" charset="utf-8"></script> |
| | | </body> |
| | | <!-- 表单弹窗 --> |
| | | <script type="text/html" id="editDialog"> |
| | | <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> |
| | | <input name="id" type="hidden"> |
| | | <div class="layui-row"> |
| | | <div class="layui-col-md12"> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label 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 class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">入库源站点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="enterStaNo" placeholder="请输入入库源站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="outStaNo" placeholder="请输入入库目标站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarEnterStaNo" placeholder="请输入入硫化罐站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarOutStaNo" placeholder="请输入出硫化罐站点" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">设备ID: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="jarId" placeholder="请输入设备ID" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarRegin" placeholder="请输入区域" lay-vertype="tips" lay-verify="required"> |
| | | </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="status" placeholder="请输入状态" lay-vertype="tips" lay-verify="required"> |
| | | </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="steId" placeholder="请输入穿梭板" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <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="rgvId" 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="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"> |
| | | <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入更新时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">任务状态: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="wrkType" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择任务状态</option> |
| | | <option value="0">初始</option> |
| | | <option value="1">作业中</option> |
| | | <option value="2">完成</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">工作状态: </label> |
| | | <div class="layui-input-block cool-auto-complete"> |
| | | <input class="layui-input" name="wrkSts" placeholder="请输入工作状态" lay-vertype="tips" lay-verify="required" style="display: none"> |
| | | <input id="wrkSts$" name="wrkSts$" 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="basJarMastStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))"> |
| | | <select class="cool-auto-complete-window-select" data-key="basJarMastStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">任务类型: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="ioType" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择任务类型</option> |
| | | <option value="0">未知</option> |
| | | <option value="1">开门</option> |
| | | <option value="2">关门</option> |
| | | <option value="3">入硫化罐</option> |
| | | <option value="4">入冷却槽</option> |
| | | <option value="5">穿梭车进冷却槽</option> |
| | | <option value="6">穿梭车离开冷却槽</option> |
| | | <option value="7">出冷却槽</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">设备: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="type" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择设备</option> |
| | | <option value="0">未知</option> |
| | | <option value="1">硫化罐</option> |
| | | <option value="2">冷却槽</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">尾部穿梭板: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="rgvEndId" 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> |
| | | |
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 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 class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">入库源站点: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="enterStaNo" placeholder="请输入入库源站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="outStaNo" placeholder="请输入入库目标站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarEnterStaNo" placeholder="请输入入硫化罐站点" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarOutStaNo" placeholder="请输入出硫化罐站点" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">设备ID: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="jarId" placeholder="请输入设备ID" lay-vertype="tips" lay-verify="required"> |
| | | </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="jarRegin" placeholder="请输入区域" lay-vertype="tips" lay-verify="required"> |
| | | </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="status" placeholder="请输入状态" lay-vertype="tips" lay-verify="required"> |
| | | </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="steId" placeholder="请输入穿梭板" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <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="rgvId" 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="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"> |
| | | <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入更新时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">任务状态: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="wrkType" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择任务状态</option> |
| | | <option value="0">初始</option> |
| | | <option value="1">作业中</option> |
| | | <option value="2">完成</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">工作状态: </label> |
| | | <div class="layui-input-block cool-auto-complete"> |
| | | <input class="layui-input" name="wrkSts" placeholder="请输入工作状态" lay-vertype="tips" lay-verify="required" style="display: none"> |
| | | <input id="wrkSts$" name="wrkSts$" 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="basJarMastStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))"> |
| | | <select class="cool-auto-complete-window-select" data-key="basJarMastStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">任务类型: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="ioType" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择任务类型</option> |
| | | <option value="0">未知</option> |
| | | <option value="1">开门</option> |
| | | <option value="2">关门</option> |
| | | <option value="3">入硫化罐</option> |
| | | <option value="4">入冷却槽</option> |
| | | <option value="5">穿梭车进冷却槽</option> |
| | | <option value="6">穿梭车离开冷却槽</option> |
| | | <option value="7">出冷却槽</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">设备: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="type" lay-vertype="tips" lay-verify="required"> |
| | | <option value="">请选择设备</option> |
| | | <option value="0">未知</option> |
| | | <option value="1">硫化罐</option> |
| | | <option value="2">冷却槽</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">尾部穿梭板: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="rgvEndId" 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> |
| | | |