From f05b8bd0613b7a56433452a1566e6f24aeff95d8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 23 九月 2024 11:18:37 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/bus/BusList.jsx | 2 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 4 ++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java | 3 +++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 6 +++--- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/BusCreateParam.java | 2 +- 6 files changed, 48 insertions(+), 5 deletions(-) diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx index fbe829d..c6b7c70 100644 --- a/zy-acs-flow/src/page/bus/BusList.jsx +++ b/zy-acs-flow/src/page/bus/BusList.jsx @@ -119,7 +119,7 @@ rowClick={(id, resource, record) => false} expand={() => <BusPanel />} expandSingle={true} - omit={['id', 'phase', 'updateBy', 'createTime', 'createBy', 'memo']} + omit={['id', 'uuid', 'phase', 'updateBy', 'createTime', 'createBy']} > <NumberField source="id" /> <TextField source="uuid" label="table.field.bus.uuid" /> diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java index 38b2068..83ee56c 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java @@ -94,6 +94,10 @@ @SuppressWarnings("all") @Transactional public Bus generateBusAndTask(OpenBusSubmitParam busSubmitParam, String memo) { + String errorMsg = busService.checkoutValid(busSubmitParam); + if (!Cools.isEmpty(errorMsg)) { + throw new BusinessException(errorMsg); + } String batch = busSubmitParam.getBatch(); List<TaskDto> taskDtoList = busSubmitParam.getTaskList(); if (Cools.isEmpty(taskDtoList)) { diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java index 83fdcaa..52ad4b0 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java @@ -66,7 +66,7 @@ @PostMapping("/bus/save") public R save(@RequestBody BusCreateParam param) { OpenBusSubmitParam submitParam = new OpenBusSubmitParam(); - submitParam.setBatch(param.getBatch()); + submitParam.setBatch(param.getBusNo()); for (TaskIdByLongDto dto : param.getTaskList()) { TaskDto taskDto = new TaskDto(); taskDto.setSeqNum(dto.getSeqNum()); @@ -78,10 +78,10 @@ taskDto.setOriSta(locService.getById(dto.getOriLoc()).getLocNo()); } if (!Cools.isEmpty(dto.getDestSta())) { - taskDto.setOriSta(staService.getById(dto.getDestSta()).getStaNo()); + taskDto.setDestSta(staService.getById(dto.getDestSta()).getStaNo()); } if (!Cools.isEmpty(dto.getDestLoc())) { - taskDto.setOriSta(locService.getById(dto.getDestLoc()).getLocNo()); + taskDto.setDestLoc(locService.getById(dto.getDestLoc()).getLocNo()); } submitParam.getTaskList().add(taskDto); } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/BusCreateParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/BusCreateParam.java index d8ee346..ec36f4d 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/BusCreateParam.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/BusCreateParam.java @@ -12,7 +12,7 @@ @Data public class BusCreateParam { - private String batch; + private String busNo; private List<TaskIdByLongDto> taskList = new ArrayList<>(); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java index 658d241..d3b09e7 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/BusService.java @@ -1,6 +1,7 @@ package com.zy.acs.manager.manager.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.Bus; import com.zy.acs.manager.manager.enums.BusStsType; @@ -10,6 +11,8 @@ Bus selectByUuid(String uuid); + String checkoutValid(OpenBusSubmitParam param); + List<Bus> selectBySts(BusStsType busStsType); List<Bus> selectInSts(BusStsType... busStsType); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java index 824a0e3..591f875 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java @@ -2,16 +2,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.acs.framework.common.BaseRes; +import com.zy.acs.manager.common.domain.TaskDto; +import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam; import com.zy.acs.manager.manager.entity.Bus; import com.zy.acs.manager.manager.enums.BusStsType; import com.zy.acs.manager.manager.mapper.BusMapper; import com.zy.acs.manager.manager.service.BusService; import com.zy.acs.framework.common.Cools; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +@Slf4j @Service("busService") public class BusServiceImpl extends ServiceImpl<BusMapper, Bus> implements BusService { @@ -21,6 +26,37 @@ } @Override + public String checkoutValid(OpenBusSubmitParam param) { + if (null == param) { + return BaseRes.PARAM; + } + if (Cools.isEmpty(param.getBatch())) { + return "Batch cannot be empty!"; + } + for (TaskDto dto : param.getTaskList()) { + if (!Cools.isEmpty(dto.getOriSta())) { + if (!Cools.isEmpty(dto.getOriLoc())) { + return "OriSta and OriLoc cannot exist at the same time!"; + } + if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) { + return "Destination cannot be empty!"; + } + } + + if (!Cools.isEmpty(dto.getDestSta())) { + if (!Cools.isEmpty(dto.getDestLoc())) { + return "DestSta and DestLoc cannot exist at the same time!"; + } + if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) { + return "Origin cannot be empty!"; + } + } + + } + return null; + } + + @Override public List<Bus> selectBySts(BusStsType busStsType) { return this.selectBySts(busStsType, null); } -- Gitblit v1.9.1