需求121 PDA-集运签收-批量签收

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/convert/consLocation/ConsLocationConvert.java

+package cn.iocoder.yudao.module.order.convert.consLocation;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationCreateReqVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 集运仓位 Convert
+ * @author jayden
+ */
+@Mapper
+public interface ConsLocationConvert {
+    /*****转换MapStruct*****/
+    ConsLocationConvert INSTANCE = Mappers.getMapper(ConsLocationConvert.class);
+
+    /***
+     * 创建VO转实体
+     * @param bean
+     * @return
+     */
+    ConsLocationDO convert(ConsLocationCreateReqVO bean);
+
+    /***
+     * 修改VO转实体
+     * @param bean
+     * @return
+     */
+    ConsLocationDO convert(ConsLocationUpdateReqVO bean);
+
+    /***
+     * 实体转返回VO
+     * @param bean
+     * @return
+    */
+    ConsLocationBackVO convert(ConsLocationDO bean);
+
+    /***
+     * 实体列表转返回VO列表
+     * @param list
+     * @return
+     */
+    List<ConsLocationBackVO> convertList(List<ConsLocationDO> list);
+
+    /***
+     * 实体分页转返回分页
+     * @param page
+     * @return
+     */
+    PageResult<ConsLocationBackVO> convertPage(PageResult<ConsLocationDO> page);
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/consLocation/ConsLocationDO.java

+package cn.iocoder.yudao.module.order.dal.dataobject.consLocation;
+
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 集运仓位 DO
+ *
+ * @author jayden
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ecw_cons_location")
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ConsLocationDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 集运id
+     */
+    private Long consId;
+    /**
+     * 库域id
+     */
+    private Long wareId;
+    /**
+     * 库区id
+     */
+    private Long areaId;
+    /**
+     * 仓位id
+     */
+    private Long locationId;
+
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/consLocation/ConsLocationMapper.java

+package cn.iocoder.yudao.module.order.dal.mysql.consLocation;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationQueryVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 集运仓位 Mapper
+ *
+ * @author jayden
+ */
+@Mapper
+public interface ConsLocationMapper extends AbstractMapper<ConsLocationDO> {
+    @Override
+    default PageResult<ConsLocationDO> selectPage(PageVO page, Object object) {
+        if (object instanceof ConsLocationQueryVO) {
+            ConsLocationQueryVO vo = (ConsLocationQueryVO) object;
+            return selectPage(page, new LambdaQuery<ConsLocationDO>()
+                    .eqIfPresent(ConsLocationDO::getConsId, vo.getConsId())
+                    .eqIfPresent(ConsLocationDO::getWareId, vo.getWareId())
+                    .eqIfPresent(ConsLocationDO::getAreaId, vo.getAreaId())
+                    .eqIfPresent(ConsLocationDO::getLocationId, vo.getLocationId())
+                    .betweenIfPresent(ConsLocationDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .orderByDesc(ConsLocationDO::getId));
+        }
+        return null;
+    }
+
+    @Override
+    default List<ConsLocationDO> selectList(Object object) {
+        if (object instanceof ConsLocationQueryVO) {
+            ConsLocationQueryVO vo = (ConsLocationQueryVO) object;
+            return selectList(new LambdaQuery<ConsLocationDO>()
+                    .eqIfPresent(ConsLocationDO::getConsId, vo.getConsId())
+                    .eqIfPresent(ConsLocationDO::getWareId, vo.getWareId())
+                    .eqIfPresent(ConsLocationDO::getAreaId, vo.getAreaId())
+                    .eqIfPresent(ConsLocationDO::getLocationId, vo.getLocationId())
+                    .betweenIfPresent(ConsLocationDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .orderByDesc(ConsLocationDO::getId));
+        }
+
+        return null;
+    }
+
+    @Select("select ecl.*, ware.name as warehouse_name, area.name as area_name, posi.code as location_name from ecw_cons_location ecl " +
+            "left join ecw_warehouse_area ware on ecl.ware_id = ware.id " +
+            "left join ecw_warehouse_area area on ecl.area_id = area.id " +
+            "left join ecw_warehouse_area_position posi on ecl.location_id = posi.id " +
+            "where ecl.cons_id = #{consId} and ecl.deleted=0")
+    List<ConsLocationUpdateReqVO> getConsLocationListByConsId(@Param("consId") Long consId);
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsServiceImpl.java

@@ -13,17 +13,22 @@ import cn.iocoder.yudao.module.customer.service.customerContacts.CustomerContact
 import cn.iocoder.yudao.module.depository.dal.mysql.warehouse.WarehouseLineMapper;
 import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.order.convert.cons.ConsConvert;
+import cn.iocoder.yudao.module.order.convert.consLocation.ConsLocationConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consItem.ConsItemDO;
+import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consMedia.ConsMediaDO;
 import cn.iocoder.yudao.module.order.dal.mysql.cons.ConsMapper;
 import cn.iocoder.yudao.module.order.service.consItem.ConsItemService;
+import cn.iocoder.yudao.module.order.service.consLocation.ConsLocationService;
 import cn.iocoder.yudao.module.order.service.consMedia.ConsMediaService;
 import cn.iocoder.yudao.module.order.service.consTrackingRecord.ConsTrackingRecordService;
 import cn.iocoder.yudao.module.order.vo.cons.*;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
 import cn.iocoder.yudao.module.order.vo.consMedia.ConsMediaCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackVO;
@@ -84,6 +89,9 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
     @Resource
     private WarehouseLineMapper warehouseLineMapper;
 
+    @Resource
+    private ConsLocationService consLocationService;
+
     @Override
     @Transactional
     public Long createCons(ConsCreateReqVO createReqVO) {
@@ -160,7 +168,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
         });
         //更新图片地址,仅签收情况
         if (updateReqVO.getMediaUrl() != null && updateReqVO.getSigner() != null) {
-            if (!updateReqVO.getSigned()){
+            if (!updateReqVO.getSigned()) {
                 updateReqVO.setSigned(true);
                 updateReqVO.setSignedTime(new Date());
                 updateReqVO.setStatus(1);
@@ -337,7 +345,6 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
         consMapper.insert(cons);
         //新增图片地址
         if (createReqVO.getMediaUrl() != null) {
-            ConsMediaDO consMedia = new ConsMediaDO();
             ConsMediaCreateReqVO consMediaCreateReqVO = new ConsMediaCreateReqVO();
             consMediaCreateReqVO.setConsId(cons.getId());
             consMediaCreateReqVO.setMediaUrl(createReqVO.getMediaUrl());
@@ -355,6 +362,12 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
                 consItemService.createConsItem(consItemCreateReqVO);
             }
         }
+        List<ConsLocationUpdateReqVO> consLocationBackList = createReqVO.getConsLocationBackList();
+        if (consLocationBackList != null && !consLocationBackList.isEmpty()) {
+            for (ConsLocationUpdateReqVO consLocationBackVO : consLocationBackList) {
+                consLocationService.save(ConsLocationConvert.INSTANCE.convert(consLocationBackVO));
+            }
+        }
     }
 
     /**
@@ -397,6 +410,33 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
         // 更新
         ConsDO updateObj = ConsConvert.INSTANCE.convert(updateReqVO);
         consMapper.updateById(updateObj);
+        List<ConsLocationDO> consLocationDOS = consLocationService.selectList(new LambdaQueryWrapperX<ConsLocationDO>()
+                .eq(ConsLocationDO::getConsId, updateReqVO.getId()));
+        Map<String, Long> oldMap = new HashMap<>();
+        for (ConsLocationDO consLocationDO : consLocationDOS) {
+            oldMap.put(String.valueOf(consLocationDO.getWareId()) + consLocationDO.getAreaId() + consLocationDO.getLocationId(), consLocationDO.getId());
+        }
+        List<ConsLocationUpdateReqVO> consLocationBackList = updateReqVO.getConsLocationBackList();
+        List<ConsLocationDO> addList = new ArrayList<>();
+        for (ConsLocationUpdateReqVO consLocationUpdateReqVO : consLocationBackList) {
+            String key = String.valueOf(consLocationUpdateReqVO.getWareId()) + consLocationUpdateReqVO.getAreaId() + consLocationUpdateReqVO.getLocationId();
+            if (oldMap.containsKey(key)) {
+                oldMap.remove(key);
+            } else {
+                ConsLocationDO consLocationDO = new ConsLocationDO()
+                        .setConsId(updateObj.getId())
+                        .setWareId(consLocationUpdateReqVO.getWareId())
+                        .setAreaId(consLocationUpdateReqVO.getAreaId())
+                        .setLocationId(consLocationUpdateReqVO.getLocationId());
+                addList.add(consLocationDO);
+            }
+        }
+        if (addList.size() > 0) {
+            consLocationService.insertBatch(addList);
+        }
+        if (!oldMap.isEmpty()) {
+            oldMap.forEach((k, v) -> consLocationService.deleteConsLocation(v));
+        }
     }
 
     @Override

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/consLocation/ConsLocationService.java

+package cn.iocoder.yudao.module.order.service.consLocation;
+
+import java.util.*;
+import javax.validation.*;
+
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.framework.mybatis.core.service.IService;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationCreateReqVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationQueryVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+
+/**
+ * 集运仓位 Service 接口
+ *
+ * @author jayden
+ */
+public interface ConsLocationService extends IService<ConsLocationDO> {
+
+    /**
+     * 创建集运仓位
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createConsLocation(@Valid ConsLocationCreateReqVO createReqVO);
+
+    /**
+     * 更新集运仓位
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateConsLocation(@Valid ConsLocationUpdateReqVO updateReqVO);
+
+    /**
+     * 删除集运仓位
+     *
+     * @param id 编号
+     */
+    void deleteConsLocation(Long id);
+
+    /**
+     * 获得集运仓位
+     *
+     * @param id 编号
+     * @return 集运仓位
+     */
+    ConsLocationDO getConsLocation(Long id);
+
+    /**
+     * 获得集运仓位列表
+     *
+     * @param ids 编号
+     * @return 集运仓位列表
+     */
+    List<ConsLocationDO> getConsLocationList(Collection<Long> ids);
+
+    /**
+     * 获得集运仓位分页
+     *
+     * @param page  分页查询
+     * @param query 查询
+     * @return 集运仓位分页
+     */
+    PageResult<ConsLocationDO> getConsLocationPage(ConsLocationQueryVO query, PageVO page);
+
+    /**
+     * 获得集运仓位列表, 用于 Excel 导出
+     *
+     * @param query 查询
+     * @return 集运仓位列表
+     */
+    List<ConsLocationDO> getConsLocationList(ConsLocationQueryVO query);
+
+    /**
+     * 根据集运id获取储位
+     */
+    List<ConsLocationUpdateReqVO> getConsLocationListByConsId(Long consId);
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/consLocation/ConsLocationServiceImpl.java

+package cn.iocoder.yudao.module.order.service.consLocation;
+
+import java.util.*;
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.module.order.convert.consLocation.ConsLocationConvert;
+import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
+import cn.iocoder.yudao.module.order.dal.mysql.consLocation.ConsLocationMapper;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationCreateReqVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationQueryVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 集运仓位 Service 实现类
+ *
+ * @author jayden
+ */
+@Service
+@Validated
+public class ConsLocationServiceImpl extends AbstractService<ConsLocationMapper, ConsLocationDO> implements ConsLocationService {
+
+    @Resource
+    private ConsLocationMapper consLocationMapper;
+
+    @Override
+    public Long createConsLocation(ConsLocationCreateReqVO createReqVO) {
+        // 插入
+        ConsLocationDO consLocation = ConsLocationConvert.INSTANCE.convert(createReqVO);
+        consLocationMapper.insert(consLocation);
+        // 返回
+        return consLocation.getId();
+    }
+
+    @Override
+    public void updateConsLocation(ConsLocationUpdateReqVO updateReqVO) {
+        // 更新
+        ConsLocationDO updateObj = ConsLocationConvert.INSTANCE.convert(updateReqVO);
+        consLocationMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteConsLocation(Long id) {
+        // 删除
+        consLocationMapper.deleteById(id);
+    }
+
+    @Override
+    public ConsLocationDO getConsLocation(Long id) {
+        return consLocationMapper.selectById(id);
+    }
+
+    @Override
+    public List<ConsLocationDO> getConsLocationList(Collection<Long> ids) {
+        return consLocationMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<ConsLocationDO> getConsLocationPage(ConsLocationQueryVO query, PageVO page) {
+        return consLocationMapper.selectPage(page, query);
+    }
+
+    @Override
+    public List<ConsLocationDO> getConsLocationList(ConsLocationQueryVO query) {
+        return consLocationMapper.selectList(query);
+    }
+
+    @Override
+    public List<ConsLocationUpdateReqVO> getConsLocationListByConsId(Long consId) {
+        return consLocationMapper.getConsLocationListByConsId(consId);
+    }
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java

@@ -2,17 +2,23 @@ package cn.iocoder.yudao.module.order.vo.cons;
 
 import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.annotations.*;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* 集运包裹主 Response VO
-* @author 系统管理员
-*/
+ * 集运包裹主 Response VO
+ *
+ * @author 系统管理员
+ */
 @Data
 @ApiModel("管理后台 - 集运包裹主 Response VO")
 public class ConsBackVO {
@@ -233,4 +239,6 @@ public class ConsBackVO {
     @ApiModelProperty(value = "签收图片")
     private String mediaUrl;
 
+    @ApiModelProperty("集运仓位")
+    private List<ConsLocationUpdateReqVO> consLocationBackList;
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBaseVO.java

 package cn.iocoder.yudao.module.order.vo.cons;
 
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -115,5 +118,6 @@ public class ConsBaseVO {
     @ApiModelProperty(value = "是否已拣出，0否，1是")
     private Integer isPickout;
 
-
+    @ApiModelProperty("集运仓位")
+    private List<ConsLocationUpdateReqVO> consLocationBackList;
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consLocation/ConsLocationBackVO.java

+package cn.iocoder.yudao.module.order.vo.consLocation;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 集运仓位 Response VO
+* @author jayden
+*/
+@Data
+@ApiModel("管理后台 - 集运仓位 Response VO")
+public class ConsLocationBackVO {
+
+    @ExcelProperty("id")
+    @ApiModelProperty(value = "id", required = true)
+    private Long id;
+
+    @ExcelProperty("集运id")
+    @ApiModelProperty(value = "集运id", required = true)
+    private Long consId;
+
+    @ExcelProperty("库域id")
+    @ApiModelProperty(value = "库域id", required = true)
+    private Long wareId;
+
+    private String warehouseName;
+
+    @ExcelProperty("库区id")
+    @ApiModelProperty(value = "库区id")
+    private Long areaId;
+
+    private String areaName;
+
+    @ExcelProperty("仓位id")
+    @ApiModelProperty(value = "仓位id")
+    private Long locationId;
+
+    private String locationName;
+
+    @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consLocation/ConsLocationBaseVO.java

+package cn.iocoder.yudao.module.order.vo.consLocation;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+/**
+* 集运仓位 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class ConsLocationBaseVO {
+
+    @ApiModelProperty(value = "集运id", required = true)
+    @NotNull(message = "集运id不能为空")
+    private Long consId;
+
+    @ApiModelProperty(value = "库域id", required = true)
+    @NotNull(message = "库域id不能为空")
+    private Long wareId;
+
+    @ApiModelProperty(value = "库区id")
+    private Long areaId;
+
+    @ApiModelProperty(value = "仓位id")
+    private Long locationId;
+
+    private String locationName;
+
+    private String areaName;
+
+    private String warehouseName;
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consLocation/ConsLocationCreateReqVO.java

+package cn.iocoder.yudao.module.order.vo.consLocation;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("管理后台 - 集运仓位创建 Request VO")
+public class ConsLocationCreateReqVO extends ConsLocationBaseVO {
+
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consLocation/ConsLocationQueryVO.java

+package cn.iocoder.yudao.module.order.vo.consLocation;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ApiModel("管理后台 - 集运仓位查询 VO")
+public class ConsLocationQueryVO {
+
+    @ApiModelProperty(value = "集运id")
+    private Long consId;
+
+    @ApiModelProperty(value = "库域id")
+    private Long wareId;
+
+    @ApiModelProperty(value = "库区id")
+    private Long areaId;
+
+    @ApiModelProperty(value = "仓位id")
+    private Long locationId;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "开始创建时间")
+    private Date beginCreateTime;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "结束创建时间")
+    private Date endCreateTime;
+
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consLocation/ConsLocationUpdateReqVO.java

+package cn.iocoder.yudao.module.order.vo.consLocation;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 集运仓位更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ConsLocationUpdateReqVO extends ConsLocationBaseVO {
+
+    @ApiModelProperty(value = "id", required = true)
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+}

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java

@@ -19,11 +19,14 @@ import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consMedia.ConsMediaDO;
 import cn.iocoder.yudao.module.order.service.cons.ConsService;
 import cn.iocoder.yudao.module.order.service.consItem.ConsItemService;
+import cn.iocoder.yudao.module.order.service.consLocation.ConsLocationService;
 import cn.iocoder.yudao.module.order.service.consMedia.ConsMediaService;
 import cn.iocoder.yudao.module.order.service.consTrackingRecord.ConsTrackingRecordService;
 import cn.iocoder.yudao.module.order.vo.cons.*;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationBackVO;
+import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -37,6 +40,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -74,6 +78,9 @@ public class ConsController {
     @Resource
     private ConsItemService consItemService;
 
+    @Resource
+    private ConsLocationService consLocationService;
+
     @PostMapping("/create")
     @ApiOperation("创建集运包裹主")
     @PreAuthorize("@ss.hasPermission('ecw:cons:create')")
@@ -214,9 +221,9 @@ public class ConsController {
         }
         CustomerDO customer = customerService.selectOne("id", cons.getCustomerId());
         CustomerContactsDO customerContacts = customerContactsService.getDefaultContacts(cons.getCustomerId());
-        List<ConsItemBackVO> consItemBackVOS = consItemService.getConsItemBackVOList(new ConsItemQueryVO().setConsId(cons.getId()));
+        List<ConsItemBackVO> consItemBacks = consItemService.getConsItemBackVOList(new ConsItemQueryVO().setConsId(cons.getId()));
         ConsBackVO consBackVO = ConsConvert.INSTANCE.convert(cons);
-        consBackVO.setConsItemVOList(consItemBackVOS);
+        consBackVO.setConsItemVOList(consItemBacks);
         if (customerContacts != null) {
             consBackVO.setAreaCode(customerContacts.getAreaCode());
             consBackVO.setPhoneNew(customerContacts.getPhoneNew());
@@ -225,6 +232,9 @@ public class ConsController {
             consBackVO.setCustomerName(customer.getName());
         }
 
+        List<ConsLocationUpdateReqVO> consLocationBackList = consLocationService.getConsLocationListByConsId(cons.getId());
+        consBackVO.setConsLocationBackList(consLocationBackList == null ? new ArrayList<>() : consLocationBackList);
+
         //获取签收图片
         ConsMediaDO consMedia = consentMediaService.getOne(new LambdaQueryWrapperX<ConsMediaDO>().eq(ConsMediaDO::getConsId, cons.getId())
                 .eq(ConsMediaDO::getBizId, cons.getId())