From b67a07b42b8020929eaa434b4959f56868917662 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 3 Aug 2023 18:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A0=81=E8=A1=A8=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/DistributionTypeConstant.java | 4 +- .../ReservationDeliveryTypeConstant.java | 48 ++++++++ .../ReservationStockupStatusConstant.java | 4 +- .../serviceConstant/ServiceConstant.java | 9 ++ .../DistributionDeliveryListServiceImpl.java | 2 - .../DistributionReservationServiceImpl.java | 104 +++++++++++------- .../impl/DistributionSignforServiceImpl.java | 2 +- .../DistrilbutionBillLadingServiceImpl.java | 5 +- 8 files changed, 126 insertions(+), 52 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationDeliveryTypeConstant.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DistributionTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DistributionTypeConstant.java index 3007374a9..fd15d84a5 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DistributionTypeConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DistributionTypeConstant.java @@ -7,8 +7,8 @@ package org.springblade.common.constant; */ public enum DistributionTypeConstant { - shipie("市配","1"), - shangpei("商配","2"), + shangpei("商配","1"), + shipie("市配","2"), ziti("自提","3"); diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationDeliveryTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationDeliveryTypeConstant.java new file mode 100644 index 000000000..6167db8ac --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationDeliveryTypeConstant.java @@ -0,0 +1,48 @@ +package org.springblade.common.constant.reservation; + +/** + * 预约单状态枚举 + * 对应码表 + * resvervation_status + * @author pref + */ +public enum ReservationDeliveryTypeConstant { + + songhuo("送货","10"), + songhuoshanglou("送货上楼","20"), + songzhuangyiti("送装一体","30"), + zhuang("装","40"); + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private String value; + + + private ReservationDeliveryTypeConstant(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-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationStockupStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationStockupStatusConstant.java index 5106628ff..bb35ed8b3 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationStockupStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationStockupStatusConstant.java @@ -9,8 +9,8 @@ package org.springblade.common.constant.reservation; public enum ReservationStockupStatusConstant { weibeihuo("未备货","10"), - daibeihuo("待备货","10"), - yibeihuo("已备货","10"); + daibeihuo("待备货","20"), + yibeihuo("已备货","30"); diff --git a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java index 9ddcb2241..ec41e13b6 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java @@ -253,6 +253,15 @@ public interface ServiceConstant { // //已预约 // String ORDER_RESERVATION_STATE_RESERVED="30"; + /** + * 包件预约状态 + */ + //待预约 + String PACKAGE_RESERVATION_STATE_NOT="10"; + + //已预约 + String PACKAGE_RESERVATION_STATE_RESERVED="20"; + 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 09d33f3b4..e2660d612 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 @@ -1296,9 +1296,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); if (packageList.size() == parcelListEntities.size()){ //这里就是表示进行了包件选取的操作，但是选取的包件数量为全部 - s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED); + s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); + }else { + s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); + } } distributionReservationStockarticleEntity.setReservationNum(packageNum.get()); @@ -341,7 +356,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl r.getReservationNum()) { //这里表示订单下的包件没有进行全部配送 //修改订单状态为部分配送 - stockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_FOUR); +// stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); //修改订单的在库数量 stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - r.getReservationNum()); //对订单进行修改 @@ -645,7 +660,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl 1) { distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString()); } distributionDeliveryListEntity.setReservationId(reservationIds); distributionDeliveryListEntity.setDeliveryNumber(packageNum.get()); - distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER); +// distributionDeliveryListEntity.setType(DistributionTypeConstant.shipie.getValue()); distributionDeliveryListService.updateById(distributionDeliveryListEntity); return R.status(true); @@ -753,6 +768,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { + DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p1.getParceListId()); + //todo 这里需要将包件状态设置成未预约；备货信息设置为未备货 +// parcelListEntity.setOrderPackageReservationStatus(); + //这里对原表进行物理删除 distributionReservationPackageMapper.deleteReservationPackage(distributionReservationDTO.getId()); }); @@ -784,6 +803,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticle = allocationDTO.getStockArticle(); @@ -919,9 +941,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliverySelfEntity::getDeliveryId, distributionAppDeliveryListVO.getId()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 546bb256e..82da8dcab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -202,7 +202,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl