diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/controller/AgvTaskController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/controller/AgvTaskController.java index f07181c..0abc137 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/controller/AgvTaskController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/controller/AgvTaskController.java @@ -4,7 +4,7 @@ import java.util.Arrays; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.cpte.modules.constant.enums.BusinessTypeEnum; +import org.cpte.modules.constant.enums.AgvStatusEnum; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.cpte.modules.agvTask.entity.AgvTask; @@ -72,6 +72,7 @@ public class AgvTaskController extends JeecgController @RequiresPermissions("agvTask:data_agv_task:add") @PostMapping(value = "/add") public Result add(@RequestBody AgvTask agvTask) { + agvTask.setStatus(AgvStatusEnum.CREATED.getValue()); agvTaskService.save(agvTask); return Result.OK("添加成功!"); } @@ -87,9 +88,7 @@ public class AgvTaskController extends JeecgController @RequiresPermissions("agvTask:data_agv_task:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result edit(@RequestBody AgvTask agvTask) { - if (BusinessTypeEnum.INBOUND.getValue().equals(agvTask.getType())) { - agvTaskService.editInBoundAgvTask(agvTask); - } + agvTaskService.editAgvTask(agvTask); agvTaskService.updateById(agvTask); return Result.OK("编辑成功!"); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/IAgvTaskService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/IAgvTaskService.java index a5e60f4..d96af94 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/IAgvTaskService.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/IAgvTaskService.java @@ -51,6 +51,6 @@ public interface IAgvTaskService extends IService { * 修改入库AGV任务 * @param agvTask AGV任务 */ - void editInBoundAgvTask(AgvTask agvTask); + void editAgvTask(AgvTask agvTask); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java index 4a27655..4291d6d 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/service/impl/AgvTaskServiceImpl.java @@ -144,16 +144,21 @@ public class AgvTaskServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public void editInBoundAgvTask(AgvTask agvTask) { + public void editAgvTask(AgvTask agvTask) { Point point = pointMapper.queryByPointCode(agvTask.getEndCode()); - point.setStatus(CommonStatusEnum.USED.getValue()); - pointMapper.updateById(point); - List asnDetails= asnDetailMapper.selectByMainId(agvTask.getBusinessDetailId()); - for (AsnDetail asnDetail : asnDetails){ - asnDetail.setToPointId(point.getId()); + if(BusinessTypeEnum.INBOUND.getValue().equals(agvTask.getType())){ + List asnDetails= asnDetailMapper.selectByMainId(agvTask.getBusinessDetailId()); + for (AsnDetail asnDetail : asnDetails){ + asnDetail.setToPointId(point.getId()); + } + if(CollectionUtils.isNotEmpty(asnDetails)){ + asnDetailMapper.updateById(asnDetails); + } } - if(CollectionUtils.isNotEmpty(asnDetails)){ - asnDetailMapper.updateById(asnDetails); + if(!BusinessTypeEnum.OUTBOUND.getValue().equals(agvTask.getType())){ + point.setStatus(CommonStatusEnum.USED.getValue()); + pointMapper.updateById(point); } + } }