From fd8329e6d8d1488d6924e40d133a4a65e4c0fe9c Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 6 Sep 2023 20:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=85=8D=E9=80=81=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=A3=85=E8=BD=A6=E3=80=81=E5=8D=B8=E8=BD=A6=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListEntity.java | 19 ++++-- .../dto/DistributionStockupDTO.java | 19 ++++-- .../DistributionDeliveryListServiceImpl.java | 60 ++++++++++++------- .../DistributionReservationServiceImpl.java | 44 +++++++++----- 4 files changed, 95 insertions(+), 47 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index f71b3701a..54987f70a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -178,15 +178,26 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "扫描件数") private Integer scannedNumber; /** - * 装卸班组（id） + * 装车班组（id） */ - @ApiModelProperty(value = "装卸班组（id）") + @ApiModelProperty(value = "装车班组（id）") private Long loadingTeamId; /** - * 装卸班组(名称) + * 装车班组(名称) */ - @ApiModelProperty(value = "装卸班组(名称)") + @ApiModelProperty(value = "装车班组(名称)") private String loadingTeamName; + + /** + * 卸车班组（id） + */ + @ApiModelProperty(value = "装卸班组（id）") + private Long unloadingTeamId; + /** + * 卸车班组(名称) + */ + @ApiModelProperty(value = "装卸班组(名称)") + private String unloadingTeamName; /** * 装卸类型 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java index e888baad8..eafc8a74a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java @@ -72,17 +72,28 @@ public class DistributionStockupDTO{ private String loadAndUnload; /** - * 预约单编号 + * 装车班组ID */ - @ApiModelProperty(value = "班组编号") + @ApiModelProperty(value = "装车班组ID") private Long loaderId; /** - * 班组名称 + * 装车班组名称 */ - @ApiModelProperty(value = "班组名称") + @ApiModelProperty(value = "装车班组名称") private String loaderName; + /** + * 卸车班组ID + */ + @ApiModelProperty(value = "卸车班组ID") + private Long unloaderId; + + /** + * 卸车班组名称 + */ + @ApiModelProperty(value = "卸车班组名称") + private String unloaderName; /** * 备注 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 74d598d76..c801ebebd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -241,9 +241,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationEntityList = baseMapper.selectList(Wrappers.query().lambda().in(DistributionReservationEntity::getId, ids)); boolean flag = reservationEntityList.stream().anyMatch(s -> s.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue())); if (flag) { - if (Func.isNotEmpty(stockup.getLoaderName())) { - distributionStockupEntity.setLoaderName(stockup.getLoaderName()); - distributionStockupEntity.setLoaderId(stockup.getLoaderId()); - } if (Func.isNotEmpty(stockup.getGoodsAreaName())) { distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName()); distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId()); } - if (Func.isNotEmpty(stockup.getGoodsAreaName())) { - distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName()); - distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId()); - } - if (Func.isNotEmpty(stockup.getLoadAndUnload())) { - distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload()); - } +// if (Func.isNotEmpty(stockup.getGoodsAreaName())) { +// distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName()); +// distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId()); +// } +// if (Func.isNotEmpty(stockup.getLoadAndUnload())) { +// distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload()); +// } if (Func.isNotEmpty(stockup.getOutboundDate())) { distributionStockupEntity.setOutboundDate(stockup.getOutboundDate()); } if (Func.isNotEmpty(stockup.getStockupDate())) { distributionStockupEntity.setStockupDate(stockup.getStockupDate()); } - if (Func.isNotEmpty(stockup.getLoadAndUnload())) { - distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload()); - } +// if (Func.isNotEmpty(stockup.getLoadAndUnload())) { +// distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload()); +// } BladeUser user = AuthUtil.getUser(); distributionStockupEntity.setStockupUser(user.getUserName()); distributionStockupEntity.setStockupUserId(user.getUserId()); @@ -872,6 +868,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl