From 48dc9de1e0d8385309448a4e5ca5028055097869 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sun, 9 Mar 2025 00:58:57 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=8F=8A=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/StatusEnum.java | 6 ++ .../org/nl/common/utils/InterationUtil.java | 4 +- .../controller/SchBasePointController.java | 23 ++++- .../point/service/ISchBasePointService.java | 21 +++- .../point/service/dao/SchBasePoint.java | 6 +- .../dao/mapper/SchBasePointMapper.java | 4 + .../dao/mapper/xml/SchBasePointMapper.xml | 25 ++++- .../point/service/dto/SchBasePointQuery.java | 4 + .../service/impl/SchBasePointServiceImpl.java | 56 ++++++++--- .../impl/SecondFloorAgvTransferTask.java | 13 ++- .../impl/SecondFloorEmptyShelfTask.java | 8 +- .../service/dao/mapper/SchBaseTaskMapper.java | 2 +- .../dao/mapper/xml/SchBaseTaskMapper.xml | 6 ++ .../task/service/dto/SchBaseTaskQuery.java | 1 + .../service/impl/SchBaseTaskServiceImpl.java | 9 +- .../task/ApplyShelfScheduleService.java | 6 +- .../quartz/task/TaskScheduleService.java | 2 +- .../views/wms/dispatch_manage/point/index.vue | 98 ++++++++++++------- .../views/wms/dispatch_manage/task/index.vue | 40 ++++++-- 19 files changed, 257 insertions(+), 77 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index 7356a828..c2fc473f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -77,6 +77,12 @@ public enum StatusEnum { SORT_TYPE(ForkMap.of( "升序", "1", null, "降序", "2", null + )), + POINT_TYPE(ForkMap.of( + "空货架", "0", null, "满货架", "1", null + )), + BIND_TYPE(ForkMap.of( + "解绑", "0", null, "绑定", "1", null )); /** * L:label diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java index a757ee66..9ce033f6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java @@ -60,8 +60,8 @@ public class InterationUtil { } return response.toJavaObject(TableDataInfo.class); } catch (Exception ex) { - log.info("ACS反馈异常----------------------------------------+"+api+",---"+ex.getMessage()); - throw new BadRequestException("acs网络不通："+ex.getMessage()); + log.error("ACS反馈异常----------------------------------------+"+api+",---"+ex.getMessage()); + throw new BadRequestException("ACS反馈异常："+ex.getMessage()); } } public static TableDataInfo asyncNotifyExt(String api, JSONObject param) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java index 64ae8b0c..b0a39294 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; @@ -45,7 +46,7 @@ public class SchBasePointController { @GetMapping public ResponseEntity query(SchBasePointQuery whereJson, PageQuery page) { - return new ResponseEntity<>(TableDataInfo.build(pointService.page(page.build(SchBasePoint.class), whereJson.build())), HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(pointService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @@ -61,9 +62,23 @@ public class SchBasePointController { @PutMapping @Log("更新点位") public ResponseEntity update(@Validated @RequestBody SchBasePoint entity) { - entity.setUpdate_name(SecurityUtils.getCurrentNickName()); - entity.setUpdate_time(DateUtil.now()); - pointService.updateById(entity); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + //绑定或解绑 + if (entity.getVehicle_code() != null) { + TableDataInfo result = pointService.bindOrUnbind(entity.getCode(), entity.getVehicle_code(), (entity.getPriority())); + if (!"200".equals(result.getCode())) { + throw new BadRequestException( "地面站点:" + entity.getCode() + "绑定或解绑" + entity.getVehicle_code() + "指令下发CTU，返回操作失败，失败原因:" +result.getMsg()); + } + } + lambdaUpdateWrapper.set(SchBasePoint::getProduct_area, entity.getProduct_area()); + lambdaUpdateWrapper.set(SchBasePoint::getRegion_code, entity.getRegion_code()); + lambdaUpdateWrapper.set(SchBasePoint::getPoint_type, entity.getPoint_type()); + lambdaUpdateWrapper.set(SchBasePoint::getLock_type, entity.getLock_type()); + lambdaUpdateWrapper.set(SchBasePoint::getIs_used, entity.getIs_used()); + lambdaUpdateWrapper.set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()); + lambdaUpdateWrapper.set(SchBasePoint::getUpdate_time, DateUtil.now()); + lambdaUpdateWrapper.eq(SchBasePoint::getId, entity.getId()); + pointService.update(lambdaUpdateWrapper); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java index 8879e1f6..66f37a3e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java @@ -1,7 +1,13 @@ package org.nl.wms.dispatch_manage.point.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; +import org.nl.wms.dispatch_manage.point.service.dto.SchBasePointQuery; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; +import org.nl.wms.dispatch_manage.task.service.dto.SchBaseTaskQuery; import java.util.List; @@ -15,13 +21,23 @@ import java.util.List; */ public interface ISchBasePointService extends IService { + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(SchBasePointQuery whereJson, PageQuery pageable); + /** * 二楼货架与地面站点绑定或解绑 * @param siteCode 点位 * @param shelfCode 货架编号 * @param mode 0解绑1绑定 */ - void bindOrUnbind(String siteCode,String shelfCode,String mode); + TableDataInfo bindOrUnbind(String siteCode, String shelfCode, String mode); /** @@ -32,9 +48,10 @@ public interface ISchBasePointService extends IService { * @param sortType 点位排序规则1：升序2：降序 * @param pointType 0空载具1满载具 * @param pointCode 点位编码 + * @param vehicleIsNull 载具是否为空 * @return List */ List checkEndPointTask(String regionCode, String getLockType, String sortType, String - pointType, String pointCode); + pointType, String pointCode, String vehicleIsNull); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java index b2c29a17..cebdfc4e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java @@ -1,10 +1,11 @@ package org.nl.wms.dispatch_manage.point.service.dao; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 点位基础表 @@ -100,6 +101,9 @@ public class SchBasePoint implements Serializable { */ private String form_data; + /** + * 是否解绑 + */ private String priority; /** diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java index 86a4cf20..e87c216a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java @@ -1,7 +1,10 @@ package org.nl.wms.dispatch_manage.point.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; +import org.nl.wms.dispatch_manage.point.service.dto.SchBasePointQuery; /** *

@@ -12,5 +15,6 @@ import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; * @since 2024-06-12 */ public interface SchBasePointMapper extends BaseMapper { + IPage selectPointPage(IPage pages, @Param("whereJson") SchBasePointQuery whereJson); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml index db0f7873..84c57038 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml @@ -1,5 +1,28 @@ - + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java index c1c66ab5..d6eb7c06 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java @@ -13,6 +13,10 @@ import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; @Data public class SchBasePointQuery extends BaseQuery { private String search; + private String product_area; + private String region_code; + private String point_type; + private String lock_type; @Override public void paramMapping() { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java index d4048a19..f8a2ab3b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java @@ -1,27 +1,33 @@ package org.nl.wms.dispatch_manage.point.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.SecurityUtils; import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; import org.nl.wms.dispatch_manage.point.service.dao.mapper.SchBasePointMapper; +import org.nl.wms.dispatch_manage.point.service.dto.SchBasePointQuery; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.external_system.acs.service.WmsToAcsService; import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService; -import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -46,6 +52,15 @@ public class SchBasePointServiceImpl extends ServiceImpl queryAll(SchBasePointQuery whereJson, PageQuery page) { + page.setSize(20); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = this.baseMapper.selectPointPage(pages, whereJson); + return pages; + } + + /** * 二楼货架与地面站点绑定或解绑 * @@ -55,19 +70,19 @@ public class SchBasePointServiceImpl extends ServiceImpl pointList = this.list(new LambdaQueryWrapper().eq(SchBasePoint::getCode, siteCode).eq(SchBasePoint::getIs_used, true)); if (ObjectUtils.isEmpty(pointList)) { throw new BadRequestException("输入的站点编号有误或被禁用，请检查！"); } //检查是否为空架 - List stIvtStructattrList = iStIvtStructattrService.list(new LambdaQueryWrapper() - .eq(StIvtStructattr::getIs_used, true) - .eq(StIvtStructattr::getSect_code, shelfCode)); - List notEmptyList = stIvtStructattrList.stream().filter(r -> StringUtils.isNotBlank(r.getVehicle_code())).collect(Collectors.toList()); - if (ObjectUtils.isNotEmpty(notEmptyList)) { - throw new BadRequestException("该货架的货位：" + notEmptyList.get(0).getStruct_code() + ",存在未出库的料箱：" + notEmptyList.get(0).getVehicle_code() + "，请检查！"); - } + // List stIvtStructattrList = iStIvtStructattrService.list(new LambdaQueryWrapper() + // .eq(StIvtStructattr::getIs_used, true) + // .eq(StIvtStructattr::getSect_code, shelfCode)); + // List notEmptyList = stIvtStructattrList.stream().filter(r -> StringUtils.isNotBlank(r.getVehicle_code())).collect(Collectors.toList()); + // if (ObjectUtils.isNotEmpty(notEmptyList)) { + // throw new BadRequestException("该货架的货位：" + notEmptyList.get(0).getStruct_code() + ",存在未出库的料箱：" + notEmptyList.get(0).getVehicle_code() + "，请检查！"); + // } List shelfCodePointList = this.list(new LambdaQueryWrapper().eq(SchBasePoint::getVehicle_code, shelfCode)); LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() .eq(SchBasePoint::getCode, siteCode); @@ -103,22 +118,23 @@ public class SchBasePointServiceImpl extends ServiceImpl */ @Override public List checkEndPointTask(String regionCode, String getLockType, String sortType, String - pointType, String pointCode) { + pointType, String pointCode, String vehicleIsNull) { Set pointSets; List taskList; List returList = new ArrayList<>(); @@ -135,6 +151,14 @@ public class SchBasePointServiceImpl extends ServiceImpl().eq("task_code", data.getString("task_code"))); + //货架解绑 + TableDataInfo tableDataInfo = wmsToAcsService.bindPodAndBerth(schBaseTask.getPoint_code3(), schBaseTask.getPoint_code1(), "0", "bindPodAndBerth"); + String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU，返回解绑成功！" : + "地面站点:" + schBaseTask.getPoint_code1() + "解绑" + schBaseTask.getPoint_code3() + "指令下发CTU，返回解绑失败，请操作站点解绑，失败原因：" + tableDataInfo.getMsg(); + iSchBaseTaskService.update(new LambdaUpdateWrapper() + .set(SchBaseTask::getRemark, bindResult) + .eq(SchBaseTask::getId, schBaseTask.getId())); //起点位解锁 iSchBasePointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getLock_type, StatusEnum.LOCK.code("无锁")) .set(SchBasePoint::getVehicle_code, null) .set(SchBasePoint::getUpdate_time, DateUtil.now()) + .set(SchBasePoint::getRemark, bindResult) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .eq(SchBasePoint::getCode, schBaseTask.getPoint_code1())); //终点点位绑定货架,Point_type为满架 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java index 9706d8e1..a114c7d9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.CodeUtil; @@ -85,7 +86,12 @@ public class SecondFloorEmptyShelfTask extends AbstractTask { .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .eq(SchBasePoint::getCode, schBaseTask.getPoint_code1())); //货架绑定 - iSchBasePointService.bindOrUnbind(schBaseTask.getPoint_code2(), schBaseTask.getVehicle_code(), "1"); + TableDataInfo tableDataInfo = iSchBasePointService.bindOrUnbind(schBaseTask.getPoint_code2(), schBaseTask.getVehicle_code(), "1"); + String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code2() + "解绑" + schBaseTask.getVehicle_code() + "指令下发CTU，返回解绑成功！" : + "地面站点:" + schBaseTask.getPoint_code2() + "解绑" + schBaseTask.getVehicle_code() + "指令下发CTU，返回解绑失败，请操作站点绑定，失败原因：" + tableDataInfo.getMsg(); + iSchBaseTaskService.update(new LambdaUpdateWrapper() + .set(SchBaseTask::getRemark, bindResult) + .eq(SchBaseTask::getId, schBaseTask.getId())); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java index a0a41656..0045b17c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java @@ -24,7 +24,7 @@ import java.util.Set; * @since 2024-05-06 */ public interface SchBaseTaskMapper extends BaseMapper { - IPage selectPageLeftJoin(IPage pages, @Param("whereJson") SchBaseTaskQuery whereJson, @Param("collect") List collect); + IPage selectPageLeftJoin(IPage pages, @Param("whereJson") SchBaseTaskQuery whereJson, @Param("collect") List collect, @Param("taskTypes") List taskTypes); List getByVehicle(@Param("vehicles") List vehicles); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml index 49308df0..3426014b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml @@ -38,6 +38,12 @@ #{code} + + AND t.task_type IN + + #{code} + + ORDER BY t.create_time DESC diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java index 6496aabc..24f97098 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java @@ -12,6 +12,7 @@ import java.io.Serializable; public class SchBaseTaskQuery implements Serializable { private String task_id; private String task_code; + private String task_type; private String vehicle_code; private String point_code; private String start_time; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index bb0a1f06..08635697 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -82,8 +82,15 @@ public class SchBaseTaskServiceImpl extends ServiceImpl taskTypes = ObjectUtil.isNotEmpty(whereJson.getTask_type()) + ? Arrays.stream(whereJson.getTask_type().split(",")).collect(Collectors.toList()) : null; + if (taskTypes != null) { + if (taskTypes.contains("")) { + taskTypes = null; + } + } IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = this.baseMapper.selectPageLeftJoin(pages, whereJson, collect); + pages = this.baseMapper.selectPageLeftJoin(pages, whereJson, collect,taskTypes); return pages; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/ApplyShelfScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/ApplyShelfScheduleService.java index 96bb3fe5..35804cb7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/ApplyShelfScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/ApplyShelfScheduleService.java @@ -79,7 +79,7 @@ public class ApplyShelfScheduleService { List cxPointLists = iSchBasePointService.checkEndPointTask( StatusEnum.REGION_INFO.code("二楼AGV产线对接位"), StatusEnum.LOCK.code("无锁"), - StatusEnum.SORT_TYPE.code("升序"), "0", null); + StatusEnum.SORT_TYPE.code("升序"), "0", null,"false"); if (ObjectUtils.isNotEmpty(cxPointLists)) { startPointCode = cxPointLists.get(0).getCode(); vehicleCode = cxPointLists.get(0).getVehicle_code(); @@ -87,7 +87,7 @@ public class ApplyShelfScheduleService { StatusEnum.REGION_INFO.code("二楼CTU货架对接位"), StatusEnum.LOCK.code("无锁"), StatusEnum.SORT_TYPE.code("升序"), null, null - ); + ,"true"); if (ObjectUtils.isNotEmpty(ctuPointList)) { endPointCode = ctuPointList.get(0).getCode(); } @@ -96,7 +96,7 @@ public class ApplyShelfScheduleService { endPointCode = iSchBasePointService.checkEndPointTask( StatusEnum.REGION_INFO.code("二楼CTU货架对接位"), StatusEnum.LOCK.code("无锁"), - StatusEnum.SORT_TYPE.code("升序"), null, null + StatusEnum.SORT_TYPE.code("升序"), null, null,"true" ).get(0).getCode(); } if (StringUtils.isNotBlank(startPointCode) && StringUtils.isNotBlank(endPointCode)) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java index 840482fb..34e23d19 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java @@ -108,7 +108,7 @@ public class TaskScheduleService { // 终点满足条件 List endPointList = iSchBasePointService.checkEndPointTask(null, StatusEnum.LOCK.code("无锁"), - StatusEnum.SORT_TYPE.code("升序"), "0",targetCode); + StatusEnum.SORT_TYPE.code("升序"), "0", targetCode, "true"); if (ObjectUtils.isEmpty(endPointList)) { return; } diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue index 17bb0eaa..b7d46ab6 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue @@ -39,17 +39,16 @@ @@ -63,21 +62,29 @@ @change="hand" > - - + + > + + @@ -97,6 +104,7 @@ @@ -110,6 +118,7 @@ - + - + + + + + + + + + - - - + - - - + + + @@ -194,26 +219,30 @@ - - - + + + - - - - + + + + + + - + + + + + + @@ -162,37 +180,39 @@ - + - + - + - - + - + + + + + + - + - - - +