diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index 28eba55..d8287f8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.nl.b_lms.bst.ivt.paper.service.dao.MdPbPaper; -import org.nl.b_lms.bst.ivt.paper.service.dao.mapper.MdPbPaperMapper; import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService; import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; @@ -22,19 +20,12 @@ import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto; -import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; -import org.nl.b_lms.storage_manage.md.service.MaterialbaseService; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; -import org.nl.wms.ext.acs.service.WmsToAcsService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -54,10 +45,6 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl list = stockingivtService.getEmptyPointNotTask("1"); - if (list.size() == 0) { - throw new BadRequestException("管芯库无空闲点位!"); + //管芯入库 + if(operate_type.equals("1")){ + //点位类型必须为入库点，point_type = 0 + String point_type = pointByCode.getPoint_type(); + if (!point_type.equals("0")) { + throw new BadRequestException("请扫描一楼管芯库入库限位点！"); + } + //校验所扫点位上托盘是否和扫码托盘一致 + if (!vehicleCode.equals(pointByCode.getVehicle_code())) { + throw new BadRequestException("点位:"+pointCode+"已存在托盘"+pointByCode.getVehicle_code()+",与扫码托盘不一致！"); + } + //判断是否已经下发了任务 + JSONObject task1 = isSingleTask(pointCode); + if ( ObjectUtil.isNotEmpty(task1)) { + throw new BadRequestException("点位：" + pointCode + "存在未完成的任务:"+task1.getString("task_code")); + } + //生成管芯入库agv任务，两个点 + List list = stockingivtService.getEmptyPointNotTask("1"); + if (list.size() == 0) { + throw new BadRequestException("管芯库无空闲点位!"); + } + BstIvtStockingivt endPoint = list.get(0); + JSONObject param = new JSONObject(); + param.put("point_code1", pointByCode.getPoint_code()); + param.put("point_code2", endPoint.getPoint_code()); + param.put("vehicle_code", vehicleCode); + param.put("operate_type", operate_type); + param.put("task_type", SlitterEnum.TASK_TYPE.code("托盘入管芯库任务")); + param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + instorStockAgvTask.createTask(param); + }else if(operate_type.equals("0")){ + //空盘回收 + //点位类型必须为入库点，point_type = 0 + String point_type = pointByCode.getPoint_type(); + if (!point_type.equals("3")) { + throw new BadRequestException("请扫描二楼备货区点位！"); + } + //校验所扫点位上托盘是否和扫码托盘一致 + if (!vehicleCode.equals(pointByCode.getVehicle_code())) { + throw new BadRequestException("点位:"+pointCode+"已存在托盘"+pointByCode.getVehicle_code()+",与扫码托盘不一致！"); + } + //判断是否已经下发了任务 + JSONObject task1 = isSingleTask(pointCode); + if ( ObjectUtil.isNotEmpty(task1)) { + throw new BadRequestException("点位：" + pointCode + "存在未完成的任务:"+task1.getString("task_code")); + } + //生成空盘回收任务，两个点 + List list = stockingivtService.getEmptyPointNotTask("0"); + //优先分配一楼入库限位点，若没有再查询一楼管芯库点 + if (list.size() == 0) { + list = stockingivtService.getEmptyPointNotTask("1"); + if(list.size() == 0){ + throw new BadRequestException("管芯库暂无空闲点位回收空托盘!"); + } + } + BstIvtStockingivt endPoint = list.get(0); + JSONObject param = new JSONObject(); + param.put("point_code1", pointByCode.getPoint_code()); + param.put("point_code2", endPoint.getPoint_code()); + param.put("vehicle_code", vehicleCode); + param.put("operate_type", operate_type); + param.put("task_type", SlitterEnum.TASK_TYPE.code("托盘回收任务")); + param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + instorStockAgvTask.createTask(param); } - BstIvtStockingivt endPoint = list.get(0); - JSONObject param = new JSONObject(); - param.put("point_code1", pointByCode.getPoint_code()); - param.put("point_code2", endPoint.getPoint_code()); - param.put("vehicle_code", vehicleCode); - param.put("task_type", SlitterEnum.TASK_TYPE.code("托盘入管芯库任务")); - param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); - instorStockAgvTask.createTask(param); + JSONObject res = new JSONObject(); res.put("status", HttpStatus.HTTP_OK); - res.put("message", "入管芯库任务生成成功!"); + res.put("message", "操作成功!"); return res; } @@ -191,6 +230,9 @@ public class StockingIvtServiceImpl implements StockingIvtService { public JSONObject moveStock(JSONObject jo) { // param: point_code vehicle_code log.info("手持管芯备货的数据：{}", jo); + if (ObjectUtil.isEmpty(jo)) { + throw new BadRequestException("数据不能为空，请选择一条记录后再操作！"); + } String pointCode = jo.getString("point_code"); String vehicleCode = jo.getString("vehicle_code"); @@ -308,11 +350,20 @@ public class StockingIvtServiceImpl implements StockingIvtService { if (ObjectUtil.isNotEmpty(papervehicle) && !papervehicle.getMaterial_code().equals(material_code)) { throw new BadRequestException("当前排-列已有物料为【" + papervehicle.getMaterial_code() + "】，如需要修改请先清除库存，再进行绑定！"); } + //查询当前物料是否和之前排同类型物料，不一致提示报错 + List papers = papervehicleService.list(new LambdaQueryWrapper() + .eq(MdPbPapervehicle::getVehicle_code, vehicle_code) + .eq(MdPbPapervehicle::getRow_num, row_num)); + if(papers.size()>0){ + if(! StrUtil.equals(papers.get(0).getMaterial_code(), material_code)){ + throw new BadRequestException("当前排已有物料为【" + papers.get(0).getMaterial_code() + "】，不允许添加其他类型物料！"); + } + } //查询当前管芯编码是否在托盘中 MdPbPapervehicle papervehicle_flag = papervehicleService.getOne(new LambdaQueryWrapper() .eq(MdPbPapervehicle::getPaper_code, paper_code)); if (ObjectUtil.isNotEmpty(papervehicle_flag)) { - throw new BadRequestException("当前管芯编码已存在托盘上:" + papervehicle_flag.getVehicle_code() + "所在位置排列:"+papervehicle_flag.getRow_num()+"-"+papervehicle_flag.getCol_num()); + throw new BadRequestException("当前管芯编码已存在托盘上:" + papervehicle_flag.getVehicle_code() + ",位置排列:"+papervehicle_flag.getRow_num()+"-"+papervehicle_flag.getCol_num()); } //获取当前纸管的高度 // 解析描述数组 @@ -322,44 +373,30 @@ public class StockingIvtServiceImpl implements StockingIvtService { //校验高度差要大于50MM，否则不允许进行绑定 int num = Integer.parseInt(row_num); - if (num == 1) { - //只判断第二排的纸管长度 - int nextNum = num + 1; - MdPbPapervehicle nextPaper = papervehicleService.getOne(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) - .eq(MdPbPapervehicle::getRow_num, nextNum)); - if (ObjectUtil.isNotEmpty(nextPaper)) { - //获取第二排的纸管高度和纸管类型 - String nextMaterialName = nextPaper.getMaterial_name(); - String[] nextArray = nextMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|"); - int nextLength = Integer.parseInt(nextArray[nextArray.length - 1]); - if (Math.abs(nextLength - currLength) <= 50 && !material_code.equals(nextPaper.getMaterial_code())) { - throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！"); - } - } - } else { + if (num > 0) { //判断后一排的纸管高度 int nextNum = num + 1; - MdPbPapervehicle nextPaper = papervehicleService.getOne(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) + List nextPaper = papervehicleService.list(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) .eq(MdPbPapervehicle::getRow_num, nextNum)); - if (ObjectUtil.isNotEmpty(nextPaper)) { + if (nextPaper.size()>0) { //获取后一排的纸管高度和纸管类型 - String nextMaterialName = nextPaper.getMaterial_name(); + String nextMaterialName = nextPaper.get(0).getMaterial_name(); String[] nextArray = nextMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|"); int nextLength = Integer.parseInt(nextArray[nextArray.length - 1]); - if (Math.abs(nextLength - currLength) <= 50 && !material_code.equals(nextPaper.getMaterial_code())) { + if (Math.abs(nextLength - currLength) <= 50 && !material_code.equals(nextPaper.get(0).getMaterial_code())) { throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！"); } } //判断前一排的纸管高度 int preNum = num - 1; - MdPbPapervehicle prePaper = papervehicleService.getOne(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) + List prePaper = papervehicleService.list(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) .eq(MdPbPapervehicle::getRow_num, preNum)); if (ObjectUtil.isNotEmpty(prePaper)) { //获取后一排的纸管高度和纸管类型 - String preMaterialName = prePaper.getMaterial_name(); + String preMaterialName = prePaper.get(0).getMaterial_name(); String[] preArray = preMaterialName.replaceAll("\\|[\\u4e00-\\u9fa5]+$", "").split("\\|"); int preLength = Integer.parseInt(preArray[preArray.length - 1]); - if (Math.abs(preLength - currLength) <= 50 && !material_code.equals(prePaper.getMaterial_code())) { + if (Math.abs(preLength - currLength) <= 50 && !material_code.equals(prePaper.get(0).getMaterial_code())) { throw new BadRequestException("相邻排的纸管高度差要大于等于50MM！"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java index af17ec2..7b70070 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java @@ -5,21 +5,16 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService; -import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; -import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -27,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -44,10 +38,6 @@ public class StockAreaCallTubeTask extends AbstractAcsTask { private IschBaseTaskService taskService; @Autowired private IBstIvtStockingivtService stockingivtService; - @Autowired - private IMdPbPapervehicleService mdPbPapervehicleService; - @Autowired - private WmsToAcsService wmsToAcsService; @Override public List addTask() { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java index 6cd7a34..672bf67 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaSendVehicleTask.java @@ -92,32 +92,44 @@ public class StockAreaSendVehicleTask extends AbstractAcsTask { String endPoint = task.getPoint_code2(); BstIvtStockingivt startPointObj = stockingivtService.getPointByCode(startPoint, false); BstIvtStockingivt endPointObj = stockingivtService.getPointByCode(endPoint, false); - // 互换资源 （交换载具号） - endPointObj.setIvt_status("1"); - endPointObj.setVehicle_code(task.getVehicle_code()); - TaskUtils.updateOptMessageByBStockingPoint(endPointObj); - stockingivtService.update(endPointObj); - startPointObj.setVehicle_code(""); - startPointObj.setIvt_status("0"); - TaskUtils.updateOptMessageByBStockingPoint(startPointObj); - stockingivtService.update(startPointObj); - // 创建搬运任务, 将所需要的纸管对应的托盘换过来。 - String requestParam = task.getRequest_param(); - JSONObject jsonObject = JSONObject.parseObject(requestParam); - if (ObjectUtil.isEmpty(requestParam)) { - throw new BadRequestException("任务 code = " + task.getTask_code() + " 参数错误"); + if (SlitterEnum.TASK_TYPE.code("备货区单独送空载具").equals(task.getTask_type())) { + // 终点赋值 + endPointObj.setIvt_status("1"); + endPointObj.setVehicle_code(task.getVehicle_code()); + TaskUtils.updateOptMessageByBStockingPoint(endPointObj); + stockingivtService.update(endPointObj); + startPointObj.setVehicle_code(""); + startPointObj.setIvt_status("0"); + TaskUtils.updateOptMessageByBStockingPoint(startPointObj); + stockingivtService.update(startPointObj); + } else { + // 互换资源 （交换载具号） + endPointObj.setIvt_status("1"); + endPointObj.setVehicle_code(task.getVehicle_code()); + TaskUtils.updateOptMessageByBStockingPoint(endPointObj); + stockingivtService.update(endPointObj); + startPointObj.setVehicle_code(""); + startPointObj.setIvt_status("0"); + TaskUtils.updateOptMessageByBStockingPoint(startPointObj); + stockingivtService.update(startPointObj); + // 创建搬运任务, 将所需要的纸管对应的托盘换过来。 + String requestParam = task.getRequest_param(); + JSONObject jsonObject = JSONObject.parseObject(requestParam); + if (ObjectUtil.isEmpty(requestParam)) { + throw new BadRequestException("任务 code = " + task.getTask_code() + " 参数错误"); + } + JSONObject callPoint = jsonObject.getJSONObject("call_point"); + JSONObject param = new JSONObject(); + param.put("point_code1", callPoint.getString("point_code")); + param.put("point_code2", startPoint); + param.put("vehicle_code", callPoint.getString("vehicle_code")); + param.put("task_type", SlitterEnum.TASK_TYPE.code("备货区送纸管")); + param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + List paperList = mdPbPapervehicleService.list(new LambdaQueryWrapper() + .eq(MdPbPapervehicle::getVehicle_code, callPoint.getString("vehicle_code"))); + doSavePaperInfos(paperList, param); + stockAreaCallTubeTask.createTask(param); } - JSONObject callPoint = jsonObject.getJSONObject("call_point"); - JSONObject param = new JSONObject(); - param.put("point_code1", callPoint.getString("point_code")); - param.put("point_code2", startPoint); - param.put("vehicle_code", callPoint.getString("vehicle_code")); - param.put("task_type", SlitterEnum.TASK_TYPE.code("备货区送纸管")); - param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); - List paperList = mdPbPapervehicleService.list(new LambdaQueryWrapper() - .eq(MdPbPapervehicle::getVehicle_code, callPoint.getString("vehicle_code"))); - doSavePaperInfos(paperList, param); - stockAreaCallTubeTask.createTask(param); } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 7cc754e..69be0a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -1,5 +1,6 @@ package org.nl.b_lms.sch.tasks.slitter.auto; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -40,7 +41,7 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -83,6 +84,8 @@ public class AutoCallAirShaftTask extends Prun { private IschBaseTaskService taskService; @Autowired private ISysParamService paramService; + @Autowired + private IMdPbPapervehicleService papervehicleService; public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA"; public final static String IS_ONLY_PULLING = "IS_ONLY_PULLING"; @@ -124,7 +127,7 @@ public class AutoCallAirShaftTask extends Prun { public void doCallShaft(Param isOnlyPulling, Param tzDay, Param tzArea, Param useXn, Param max_qzz_num) { //查询套轴缓存位:点位启用、有子卷、气胀轴字段不为空、且无未完成的任务 List notTaskPoints = bcutpointivtService.getAreaNotTaskPointByTcQzzPoint(""); - //若有拔轴任务，则会执行本段代码 + //(1)若有拔轴任务，则会执行本段代码 //对满足的需拔轴子卷遍历下发任务，同时每次拔轴下发前判断是否有可以接续的套轴计划 for(int i= 0;i stockLam = new LambdaQueryWrapper<>(); + stockLam.eq(BstIvtStockingivt::getIvt_status,SlitterConstant.SLITTER_YES) + .eq(BstIvtStockingivt::getIs_used,SlitterConstant.SLITTER_YES) + .eq(BstIvtStockingivt::getPoint_type,"2"); + List stockList = stockingivtService.list(stockLam); + for(int i=0;i papers = papervehicleService.list(new LambdaQueryWrapper() + .eq(MdPbPapervehicle::getVehicle_code, vehicleCode) + .ne(MdPbPapervehicle::getQty, 0)); + if (papers.size() <= 0) { + // 搬走 + List unFinishtasks = taskService.checkHaveTask(point_code); + if (CollectionUtil.isEmpty(unFinishtasks)) { + // 查找一个没有任务的空位 + List list = stockingivtService.getEmptyPointNotTask("3"); + if (list.size() == 0) { + log.warn("备货区找不到空位置搬运!"); + break; + } + BstIvtStockingivt moveEmptyPoint = list.get(0); + JSONObject moveTaskParam = new JSONObject(); + moveTaskParam.put("point_code1", point_code); + moveTaskParam.put("point_code2", moveEmptyPoint.getPoint_code()); + moveTaskParam.put("vehicle_code", vehicleCode); + moveTaskParam.put("task_type", SlitterEnum.TASK_TYPE.code("备货区单独送空载具")); + moveTaskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + stockAreaSendVehicleTask.createTask(moveTaskParam); + //下发一个就行 + break; + } + } + } } /** @@ -577,9 +622,9 @@ public class AutoCallAirShaftTask extends Prun { // 兜底 needQuantity = needTemp > 0 ? needTemp : 1; } - // todo: 要考虑type=0的正在搬运往套轴区三个点的托盘是否有该库存，如有直接返回true - // 查找type=0的位置(待命的托盘)中是否存在(需要判断的是单独一个托盘) 校验了不在搬运中 - List stockingivtList = stockingivtService.getNeedPaperTubePoint("0", tubes.get(0), location); + // todo: 要考虑type=3的正在搬运往套轴区三个点的托盘是否有该库存，如有直接返回true + // 查找type=3的位置(待命的托盘)中是否存在(需要判断的是单独一个托盘) 校验了不在搬运中 + List stockingivtList = stockingivtService.getNeedPaperTubePoint("3", tubes.get(0), location); // 找一个点位: 目的需要的点位 // 筛选单独托盘有超过所需数 BhTubePointDto needPoint = null; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java index f565938..9640ee0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java @@ -23,7 +23,7 @@ public enum SlitterEnum { , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807" , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811" , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813", "拔轴完毕出轴", "010814", "穿拔轴缓存<>气胀轴缓存位", "010815", - "托盘入管芯库任务", "010816","管芯备货任务", "010817")); + "托盘入管芯库任务", "010816","管芯备货任务", "010817","托盘回收任务", "010818")); private Map code; public String code(String desc) {