rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/PakinIOStatus.java
New file @@ -0,0 +1,27 @@ package com.vincent.rsf.server.manager.enums; /** * @author Ryan * @version 1.0 * @title PakinIOStatus * @description * @create 2025/4/7 08:48 */ public enum PakinIOStatus { //质检状态 PAKIN_IO_STATUS_HOLD("0", "待入库"), QLY_ISPT_STAS_DONE("1", "组拖完成"), QLY_ISPT_STAS_TASK_EXCE("2", "任务执行中"), QLY_ISPT_STAS_TASK_DONE("3", "任务完成") ; PakinIOStatus(String val, String desc) { this.val = val; this.desc = desc; } public String val; public String desc; } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -8,6 +8,7 @@ import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.entity.enums.TaskType; import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.enums.PakinIOStatus; import com.vincent.rsf.server.manager.mapper.TaskMapper; import com.vincent.rsf.server.manager.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -67,7 +68,9 @@ } /**获取组拖*/ List<Long> ids = waitPakin.stream().map(WaitPakin::getId).collect(Collectors.toList()); List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, ids)); List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>() .in(WaitPakin::getId, ids) .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.QLY_ISPT_STAS_DONE.val))); if (waitPakins.isEmpty()) { throw new CoolException("组拖信息不存在!!"); } @@ -118,6 +121,9 @@ } }); waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>() .in(WaitPakin::getId, ids) .set(WaitPakin::getIoStatus, PakinIOStatus.QLY_ISPT_STAS_TASK_EXCE.val)); return R.ok("任务生成完毕!"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -6,6 +6,7 @@ import com.vincent.rsf.server.manager.controller.params.PakinItem; import com.vincent.rsf.server.manager.controller.params.WaitPakinParam; import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.enums.PakinIOStatus; import com.vincent.rsf.server.manager.mapper.WaitPakinMapper; import com.vincent.rsf.server.manager.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -79,7 +80,7 @@ } pakin.setCode(ruleCode) //状态修改为入库中 .setIoStatus(Short.parseShort("1")) .setIoStatus(Short.parseShort(PakinIOStatus.QLY_ISPT_STAS_DONE.val)) .setAnfme(sum) .setBarcode(waitPakin.getBarcode()); if (!this.save(pakin)) {