From f5ba07a9bcdbd550205dee5e03d624c8a56a6d7d Mon Sep 17 00:00:00 2001 From: Lin-XCC <754310653@QQ.COM> Date: Wed, 10 Nov 2021 09:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../empty/controller/OrderInfoController.java | 9 ++- .../wms/empty/service/OrderInfoService.java | 6 ++ .../service/impl/OrderInfoServiceImpl.java | 66 +++++++++++++++++-- .../mt/wms/empty/vo/OrderInfoTaskDetVo.java | 18 +++++ .../java/com/mt/wms/empty/vo/OrderInfoVo.java | 14 ---- 5 files changed, 94 insertions(+), 19 deletions(-) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/OrderInfoController.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/OrderInfoController.java index b62ff82..e598a46 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/OrderInfoController.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/OrderInfoController.java @@ -42,7 +42,7 @@ public class OrderInfoController extends BaseController { } @PostMapping(value = "page") - @ApiOperation(value = "获取分页报警基础信息") + @ApiOperation(value = "获取分页订单基础信息") private R> page(@Validated({PageGroup.class, Default.class}) @RequestBody OrderInfoBasePageParam orderBaseParam) { return orderInfoService.page(orderBaseParam); } @@ -63,4 +63,11 @@ public class OrderInfoController extends BaseController { private R> getTaskInfo(@Validated @RequestBody OrderInfoTaskDetParam orderInfoTaskDetParam) { return orderInfoService.getTaskInfo(orderInfoTaskDetParam); } + + @GetMapping(value = "getTaskInfoByIdenCardNum") + @ApiOperation(value = "根据标识卡获取信息") + private R getTaskInfoByIdenCardNum(@Validated @RequestParam String idenCardNum) { + return orderInfoService.getTaskInfoByIdenCardNum(idenCardNum); + } + } diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/OrderInfoService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/OrderInfoService.java index da91296..1171af7 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/OrderInfoService.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/OrderInfoService.java @@ -53,4 +53,10 @@ public interface OrderInfoService { * @return 结果 */ R> getTaskInfo(OrderInfoTaskDetParam orderInfoTaskDetParam); + /** + * 创建加工订单时查询订单信息 + * @param idenCardNum 标识卡号 + * @return 结果 + */ + R getTaskInfoByIdenCardNum(String idenCardNum); } diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java index c24ba95..79bbc9d 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java @@ -2,6 +2,16 @@ package com.mt.wms.empty.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mt.wms.basic.params.KilnInfoQueryParam; +import com.mt.wms.basic.params.LocationInfoQueryParam; +import com.mt.wms.basic.params.VehicleQueryParam; +import com.mt.wms.basic.service.KilnInfoService; +import com.mt.wms.basic.service.LocationInfoService; +import com.mt.wms.basic.service.VehicleService; +import com.mt.wms.basic.vo.KilnInfoVo; +import com.mt.wms.basic.vo.LocationInfoVo; +import com.mt.wms.basic.vo.VehicleVo; +import com.mt.wms.core.api.Assert; import com.mt.wms.core.base.BaseService; import com.mt.wms.core.dal.entity.OrderInfo; import com.mt.wms.core.dal.service.OrderInfoServiceBiz; @@ -14,7 +24,9 @@ import com.mt.wms.empty.params.OrderInfoBasePageParam; import com.mt.wms.empty.params.OrderInfoPersonCreateParam; import com.mt.wms.empty.params.OrderInfoTaskDetParam; import com.mt.wms.empty.service.CurrTaskDetService; +import com.mt.wms.empty.service.CurrTaskService; import com.mt.wms.empty.service.OrderInfoService; +import com.mt.wms.empty.vo.CurrTaskVo; import com.mt.wms.empty.vo.OrderInfoTaskDetVo; import com.mt.wms.empty.vo.OrderInfoVo; import org.apache.commons.lang.StringUtils; @@ -23,6 +35,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * xx服务实现类 * @@ -39,6 +55,16 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic @Autowired CurrTaskDetService currTaskDetService; + @Autowired + CurrTaskService currTaskService; + @Autowired + KilnInfoService kilnInfoService; + + @Autowired + VehicleService vehicleService; + + @Autowired + LocationInfoService locationInfoService; @Override @@ -87,20 +113,52 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic /** - * todo 获取详细的拆分任务信息 + * 获取详细的拆分任务信息 */ @Override public R> getTaskInfo(OrderInfoTaskDetParam param) { //从任务详细中获取该标识卡和订单的所有订单 PageVo currOrderCurrTask = currTaskDetService.getCurrOrderCurrTask(param); + Assert.gtZero(currOrderCurrTask.getRecords().size(),"该订单暂无详细记录。"); //获取车辆信息 - //获取库位信息 + R> vehicle = vehicleService.list(new VehicleQueryParam()); + Map> collect = vehicle.getData().stream().collect(Collectors.groupingBy(VehicleVo::getId)); //获取窑炉信息 + R> kiln = kilnInfoService.list(new KilnInfoQueryParam()); + Map> collect2 = kiln.getData().stream().collect(Collectors.groupingBy(KilnInfoVo::getId)); currOrderCurrTask.getRecords().forEach(orderInfo -> { - + //获取对应的任务 + CurrTaskVo currTask = currTaskService.getCurrTask(IdParam.builder().id(orderInfo.getCurrTaskId()).build()); + orderInfo.setABeginTime(currTask.getABeginTime()); + orderInfo.setAEndTime(currTask.getAEndTime()); + orderInfo.setTaskType(currTask.getTaskType()); + orderInfo.setStatus(currTask.getStatus()); + orderInfo.setKilnId(currTask.getKilnId()); + orderInfo.setStartPosition(currTask.getStartPosition()); + orderInfo.setTargetPosition(currTask.getTargetPosition()); + orderInfo.setVehicleId(currTask.getVehicleId()); + //获取窑炉和车辆的名称信息 + if (orderInfo.getKilnId() != null) + { + orderInfo.setKilnName(collect2.get(orderInfo.getKilnId()).get(0).getKilnName()); + } + if (orderInfo.getVehicleId() != null) + { + orderInfo.setVehicleName(collect.get(orderInfo.getVehicleId()).get(0).getVehicleName()); + } } ); - return null; + return successful(currOrderCurrTask); + } + + @Override + public R getTaskInfoByIdenCardNum(String idenCardNum) { + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq(OrderInfo.IDEN_CARD_NUM,idenCardNum).eq(OrderInfo.VALID,1).eq(OrderInfo.STATUS,0); + OrderInfo one = orderInfoService.getOne(wrapper); + OrderInfoVo build = OrderInfoVo.builder().build(); + BeanUtils.copyProperties(one, build); + return successful(build); } } diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoTaskDetVo.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoTaskDetVo.java index b65bb97..4bc8f3f 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoTaskDetVo.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoTaskDetVo.java @@ -34,6 +34,12 @@ public class OrderInfoTaskDetVo extends BaseVo implements PageVo.ConvertVo { @ApiModelProperty(value = "任务编码") private String taskCode; + /** + * 任务编码, 查看任务编码规则 + */ + @ApiModelProperty(value = "任务id") + private Long currTaskId; + /** * 缓存前开始时间，车辆开始执行 */ @@ -70,11 +76,23 @@ public class OrderInfoTaskDetVo extends BaseVo implements PageVo.ConvertVo { @ApiModelProperty(value = "目标位置") private String targetPosition; + /** + * 车辆id + */ + @ApiModelProperty(value = "车辆id") + private Long vehicleId; + /** * 车辆名称 */ @ApiModelProperty(value = "车辆名称") private String vehicleName; + + /** + * 加工炉id + */ + @ApiModelProperty(value = "加工炉id") + private Long kilnId; /** * 加工炉名称 */ diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoVo.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoVo.java index 9cab5e8..b6e110b 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoVo.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoVo.java @@ -37,12 +37,6 @@ public class OrderInfoVo extends BaseVo implements PageVo.ConvertVo { */ @ApiModelProperty(value = "订单来源") private Integer orderSource; - /** - * 删除标志，是否有效:1 可用 0不可用，2停止 - */ - @ApiModelProperty(value = "删除标志") - private Integer valid; - /** * 添加时间，每次修改记录要更新记录新增时间 */ @@ -66,14 +60,6 @@ public class OrderInfoVo extends BaseVo implements PageVo.ConvertVo { */ @ApiModelProperty(value = "修改时间") private LocalDateTime updateTime; - - /** - * 版本号 默认为 1 - */ - @ApiModelProperty(value = "版本号") - @Version - private String version; - /** * 状态： 0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算） */