diff --git a/blade-biz-common/src/main/java/org/springblade/common/node/PackageNode.java b/blade-biz-common/src/main/java/org/springblade/common/node/PackageNode.java new file mode 100644 index 000000000..a2624aba9 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/node/PackageNode.java @@ -0,0 +1,46 @@ +package org.springblade.common.node; + +public enum PackageNode { + //1、入库 + //2、计划 + //3、备货 + //4、装车 + //5、滞留 + //6、异常 + //7、审核 + //8、签收 + ruku("入库"), + jihua("计划"), + beihuo("备货"), + zhaungche("装车"), + zhiliu("滞留"), + yichang("异常"), + shenhe("审核"), + qianshou("签收"); + + + + + /** + * 状态 + */ + private String name; + /** + * 值 + */ +// private String value; + + PackageNode(String name) { + this.name = name; +// this.value = value; + } + + + public String getName() { + return name; + } + +// public String getValue() { +// return value; +// } +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java new file mode 100644 index 000000000..f24292178 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import java.util.List; + +/** + * 在库订单包件清单 视图实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +public class DistributionParcelListNodeVO { + + //节点名称 + + //节点操作人 + + //节点修改人 + + //节点时间 + + + //操作描述 + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 8af795a05..cb8f31e9a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -254,7 +254,7 @@ public class DistributionParcelListController extends BladeController { @GetMapping("/searchNode") @ApiOperationSupport(order = 9) - @ApiOperation(value = "导出包件明细数据", notes = "传入paramMap") + @ApiOperation(value = "查看包件配送节点信息", notes = "传入包条码") public R searchNode(@ApiIgnore @RequestParam String packageCode) { R r = distributionParcelListService.searchNode(packageCode); return r; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 674bd48bd..6d4a496de 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -937,6 +937,29 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl userName = new ArrayList<>(); if (Func.isNotEmpty(distributionBillLadingScanEntityList)){ - List userIds = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateUser).collect(Collectors.toList()); + List userIds = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateUser).distinct().collect(Collectors.toList()); if (Func.isNotEmpty(userIds)){ //查询用户 for (Long userId : userIds) {