Skip to content

J
jiedao-api-boot-master
Commit e8ec072b authored by honghy's avatar honghy
Browse files
Options

需求117 后台-集运-异常包裹

parent 45b054a5
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 48 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/consItem/ConsItemDO.java
View file @ e8ec072b
...@@ -106,4 +106,8 @@ public class ConsItemDO extends BaseDO { ...@@ -106,4 +106,8 @@ public class ConsItemDO extends BaseDO {
*/ */
private Long positionId; private Long positionId;
/**
* 订单项状态(数据字典item_status)
*/
private Integer itemStatus;
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/consItem/ConsItemMapper.java
View file @ e8ec072b
package cn.iocoder.yudao.module.order.dal.mysql.consItem; package cn.iocoder.yudao.module.order.dal.mysql.consItem;
import java.util.*; import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery; 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.mapper.AbstractMapper;
...@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
/** /**
* 集运包裹明细 Mapper * 集运包裹明细 Mapper
*
* @author 系统管理员 * @author 系统管理员
*/ */
@Mapper @Mapper
...@@ -19,29 +21,30 @@ public interface ConsItemMapper extends AbstractMapper<ConsItemDO> { ...@@ -19,29 +21,30 @@ public interface ConsItemMapper extends AbstractMapper<ConsItemDO> {
@Override @Override
default PageResult<ConsItemDO> selectPage(PageVO page, Object object) { default PageResult<ConsItemDO> selectPage(PageVO page, Object object) {
if (object instanceof ConsItemQueryVO) { if (object instanceof ConsItemQueryVO) {
ConsItemQueryVO vo = (ConsItemQueryVO)object; ConsItemQueryVO vo = (ConsItemQueryVO) object;
return selectPage(page, new LambdaQuery<ConsItemDO>() return selectPage(page, new LambdaQuery<ConsItemDO>()
.eqIfPresent(ConsItemDO::getConsId, vo.getConsId()) .eqIfPresent(ConsItemDO::getConsId, vo.getConsId())
.eqIfPresent(ConsItemDO::getProdId, vo.getProdId()) .eqIfPresent(ConsItemDO::getProdId, vo.getProdId())
.eqIfPresent(ConsItemDO::getBrand, vo.getBrand()) .eqIfPresent(ConsItemDO::getBrand, vo.getBrand())
.eqIfPresent(ConsItemDO::getBrandType, vo.getBrandType()) .eqIfPresent(ConsItemDO::getBrandType, vo.getBrandType())
.eqIfPresent(ConsItemDO::getMaterial, vo.getMaterial()) .eqIfPresent(ConsItemDO::getMaterial, vo.getMaterial())
.eqIfPresent(ConsItemDO::getQuantity, vo.getQuantity()) .eqIfPresent(ConsItemDO::getQuantity, vo.getQuantity())
.eqIfPresent(ConsItemDO::getInspectionNum, vo.getInspectionNum()) .eqIfPresent(ConsItemDO::getInspectionNum, vo.getInspectionNum())
.eqIfPresent(ConsItemDO::getInspectionUnit, vo.getInspectionUnit()) .eqIfPresent(ConsItemDO::getInspectionUnit, vo.getInspectionUnit())
.eqIfPresent(ConsItemDO::getInspectionQuantity, vo.getInspectionQuantity()) .eqIfPresent(ConsItemDO::getInspectionQuantity, vo.getInspectionQuantity())
.eqIfPresent(ConsItemDO::getInspectionProdAttrIds, vo.getInspectionProdAttrIds()) .eqIfPresent(ConsItemDO::getInspectionProdAttrIds, vo.getInspectionProdAttrIds())
.eqIfPresent(ConsItemDO::getInspectionBoxGauge, vo.getInspectionBoxGauge()) .eqIfPresent(ConsItemDO::getInspectionBoxGauge, vo.getInspectionBoxGauge())
.eqIfPresent(ConsItemDO::getInspectionVolume, vo.getInspectionVolume()) .eqIfPresent(ConsItemDO::getInspectionVolume, vo.getInspectionVolume())
.eqIfPresent(ConsItemDO::getInspectionWeight, vo.getInspectionWeight()) .eqIfPresent(ConsItemDO::getInspectionWeight, vo.getInspectionWeight())
.eqIfPresent(ConsItemDO::getInspectionWorth, vo.getInspectionWorth()) .eqIfPresent(ConsItemDO::getInspectionWorth, vo.getInspectionWorth())
.eqIfPresent(ConsItemDO::getInspectionWorthCurrency, vo.getInspectionWorthCurrency()) .eqIfPresent(ConsItemDO::getInspectionWorthCurrency, vo.getInspectionWorthCurrency())
.eqIfPresent(ConsItemDO::getInspectionUsageIds, vo.getInspectionUsageIds()) .eqIfPresent(ConsItemDO::getInspectionUsageIds, vo.getInspectionUsageIds())
.eqIfPresent(ConsItemDO::getInspectionJson, vo.getInspectionJson()) .eqIfPresent(ConsItemDO::getInspectionJson, vo.getInspectionJson())
.eqIfPresent(ConsItemDO::getWarehouseId, vo.getWarehouseId()) .eqIfPresent(ConsItemDO::getWarehouseId, vo.getWarehouseId())
.eqIfPresent(ConsItemDO::getAreaId, vo.getAreaId()) .eqIfPresent(ConsItemDO::getAreaId, vo.getAreaId())
.eqIfPresent(ConsItemDO::getPositionId, vo.getPositionId()) .eqIfPresent(ConsItemDO::getPositionId, vo.getPositionId())
.betweenIfPresent(ConsItemDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime()) .eqIfPresent(ConsItemDO::getItemStatus, vo.getItemStatus())
.betweenIfPresent(ConsItemDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
.orderByDesc(ConsItemDO::getId)); .orderByDesc(ConsItemDO::getId));
} }
...@@ -51,33 +54,35 @@ public interface ConsItemMapper extends AbstractMapper<ConsItemDO> { ...@@ -51,33 +54,35 @@ public interface ConsItemMapper extends AbstractMapper<ConsItemDO> {
@Override @Override
default List<ConsItemDO> selectList(Object object) { default List<ConsItemDO> selectList(Object object) {
if (object instanceof ConsItemQueryVO) { if (object instanceof ConsItemQueryVO) {
ConsItemQueryVO vo = (ConsItemQueryVO)object; ConsItemQueryVO vo = (ConsItemQueryVO) object;
return selectList(new LambdaQuery<ConsItemDO>() return selectList(new LambdaQuery<ConsItemDO>()
.eqIfPresent(ConsItemDO::getConsId, vo.getConsId()) .eqIfPresent(ConsItemDO::getConsId, vo.getConsId())
.eqIfPresent(ConsItemDO::getProdId, vo.getProdId()) .eqIfPresent(ConsItemDO::getProdId, vo.getProdId())
.eqIfPresent(ConsItemDO::getBrand, vo.getBrand()) .eqIfPresent(ConsItemDO::getBrand, vo.getBrand())
.eqIfPresent(ConsItemDO::getBrandType, vo.getBrandType()) .eqIfPresent(ConsItemDO::getBrandType, vo.getBrandType())
.eqIfPresent(ConsItemDO::getMaterial, vo.getMaterial()) .eqIfPresent(ConsItemDO::getMaterial, vo.getMaterial())
.eqIfPresent(ConsItemDO::getQuantity, vo.getQuantity()) .eqIfPresent(ConsItemDO::getQuantity, vo.getQuantity())
.eqIfPresent(ConsItemDO::getInspectionNum, vo.getInspectionNum()) .eqIfPresent(ConsItemDO::getInspectionNum, vo.getInspectionNum())
.eqIfPresent(ConsItemDO::getInspectionUnit, vo.getInspectionUnit()) .eqIfPresent(ConsItemDO::getInspectionUnit, vo.getInspectionUnit())
.eqIfPresent(ConsItemDO::getInspectionQuantity, vo.getInspectionQuantity()) .eqIfPresent(ConsItemDO::getInspectionQuantity, vo.getInspectionQuantity())
.eqIfPresent(ConsItemDO::getInspectionProdAttrIds, vo.getInspectionProdAttrIds()) .eqIfPresent(ConsItemDO::getInspectionProdAttrIds, vo.getInspectionProdAttrIds())
.eqIfPresent(ConsItemDO::getInspectionBoxGauge, vo.getInspectionBoxGauge()) .eqIfPresent(ConsItemDO::getInspectionBoxGauge, vo.getInspectionBoxGauge())
.eqIfPresent(ConsItemDO::getInspectionVolume, vo.getInspectionVolume()) .eqIfPresent(ConsItemDO::getInspectionVolume, vo.getInspectionVolume())
.eqIfPresent(ConsItemDO::getInspectionWeight, vo.getInspectionWeight()) .eqIfPresent(ConsItemDO::getInspectionWeight, vo.getInspectionWeight())
.eqIfPresent(ConsItemDO::getInspectionWorth, vo.getInspectionWorth()) .eqIfPresent(ConsItemDO::getInspectionWorth, vo.getInspectionWorth())
.eqIfPresent(ConsItemDO::getInspectionWorthCurrency, vo.getInspectionWorthCurrency()) .eqIfPresent(ConsItemDO::getInspectionWorthCurrency, vo.getInspectionWorthCurrency())
.eqIfPresent(ConsItemDO::getInspectionUsageIds, vo.getInspectionUsageIds()) .eqIfPresent(ConsItemDO::getInspectionUsageIds, vo.getInspectionUsageIds())
.eqIfPresent(ConsItemDO::getInspectionJson, vo.getInspectionJson()) .eqIfPresent(ConsItemDO::getInspectionJson, vo.getInspectionJson())
.eqIfPresent(ConsItemDO::getWarehouseId, vo.getWarehouseId()) .eqIfPresent(ConsItemDO::getWarehouseId, vo.getWarehouseId())
.eqIfPresent(ConsItemDO::getAreaId, vo.getAreaId()) .eqIfPresent(ConsItemDO::getAreaId, vo.getAreaId())
.eqIfPresent(ConsItemDO::getPositionId, vo.getPositionId()) .eqIfPresent(ConsItemDO::getPositionId, vo.getPositionId())
.betweenIfPresent(ConsItemDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime()) .eqIfPresent(ConsItemDO::getItemStatus, vo.getItemStatus())
.betweenIfPresent(ConsItemDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
.orderByDesc(ConsItemDO::getId)); .orderByDesc(ConsItemDO::getId));
} }
return null; return null;
} }
List<ConsItemBackVO> getConsItemBackVOList(ConsItemQueryVO query);
List<ConsItemBackVO> getConsItemBackVOList(ConsItemQueryVO query);
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consItem/ConsItemBackVO.java
View file @ e8ec072b
...@@ -112,5 +112,8 @@ public class ConsItemBackVO { ...@@ -112,5 +112,8 @@ public class ConsItemBackVO {
@ApiModelProperty(value = "", required = true) @ApiModelProperty(value = "", required = true)
private Date createTime; private Date createTime;
/**
* 订单项状态(数据字典item_status)
*/
private Integer itemStatus;
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consItem/ConsItemBaseVO.java
View file @ e8ec072b
...@@ -71,5 +71,8 @@ public class ConsItemBaseVO { ...@@ -71,5 +71,8 @@ public class ConsItemBaseVO {
@ApiModelProperty(value = "库位ID") @ApiModelProperty(value = "库位ID")
private Long positionId; private Long positionId;
/**
* 订单项状态(数据字典item_status)
*/
private Integer itemStatus;
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consItem/ConsItemQueryVO.java
View file @ e8ec072b
...@@ -83,5 +83,8 @@ public class ConsItemQueryVO { ...@@ -83,5 +83,8 @@ public class ConsItemQueryVO {
@ApiModelProperty(value = "语言") @ApiModelProperty(value = "语言")
private Integer lang; private Integer lang;
/**
* 订单项状态(数据字典item_status)
*/
private Integer itemStatus;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment