diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderReceiveStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderReceiveStatusConstant.java new file mode 100644 index 000000000..4e7d9ee54 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderReceiveStatusConstant.java @@ -0,0 +1,47 @@ +package org.springblade.common.constant.order; + +/** + * 订单收货枚举 + * 对应码表 + * order_receive_status + * @author pref + */ +public enum OrderReceiveStatusConstant { + + weishouhuo("未收货","10"), + bufenshouhuo("部分收货","20"), + yishouhuo("已收货","30"); + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private String value; + + + private OrderReceiveStatusConstant(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 94ba229a1..ba5e36b96 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -401,6 +401,9 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "备货状态") private String stockupStatus; + @ApiModelProperty(value = "收货状态") + private String orderReceiveStatus; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 410e675b6..aa0cf861c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -88,6 +88,9 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "备货状态名称") private String stockupStatusName; + + @ApiModelProperty(value = "收货状态名称") + private String orderReceiveStatusName; /** * 是否齐套名称 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 433e3ec92..8957fb603 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -83,12 +83,12 @@ public class BasicdataWarehouseController extends BladeController { Object endDate = warehouseWarehouse.get("endDate"); warehouseWarehouse.put("startDate", null); warehouseWarehouse.put("endDate", null); - String deptId = AuthUtil.getUser().getDeptId(); +// String deptId = AuthUtil.getUser().getDeptId(); QueryWrapper qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class); qw.apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate) .apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate); - qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId()); - qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId); +// qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId()); +// qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId); IPage page = warehouseService.page(Condition.getPage(query), qw); //TODO 这里将仓库的行政区域放到Service中通过缓存进行陪陪结果后返回给前端 page.getRecords().forEach(basicdataWarehouseEntity -> { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index 56d497beb..7f8068dd2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -66,4 +66,13 @@ public interface IDistributionParcelListService extends BaseService getParcelListOwn(IPage page, Map distributionParcelList); + + + /** + * 根据包件状态维护订单的状态 + * @param orderPackageCode + * @param type + */ + void updateOrderStatus(String orderPackageCode,String type); + } 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 116615291..adafa3342 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 @@ -91,4 +91,14 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl