diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index 66d6c3ca1..b49f5ad14 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -13,44 +13,67 @@ import java.io.Serializable; @Getter public enum WorkNodeEnums implements Serializable { - INITIAL_DATA_ENTRY(10, "数据入库"), - INITIAL_WAREHOUSE_ENTRY(20, "始发仓入库"), - BILLING(30, "开单"), - INITIAL_WAREHOUSE_LOADING(40, "装车"), - CANCEL_INITIAL_WAREHOUSE_LOADING(50, "取消装车"), - INITIAL_WAREHOUSE_DEPART(60, "始发仓发车"), - CANCEL_INITIAL_WAREHOUSE_DEPART(70, "始发仓取消发车"), - NET_ARRIVE_CAR(80,"网点到车"), - CANCEL_NET_ARRIVE_CAR(90,"网点取消到车"), - UNLOAD_INCOMING_WAREHOUSE(100,"卸车入库"), - TRANSFER_WAREHOUSE_UNLOADING(110, "卸车确认"), - TRANSFER_WAREHOUSE_DEPART(120, "网点发车"), - CANEL_TRANSFER_WAREHOUSE_DEPART(130, "网点取消发车"), - FINAL_NET_ARRIVE_CAR(140,"终点到车"), - CANCEL_FINAL_NET_ARRIVE_CAR(150,"终点取消到车"), - SIGN_DIRECT_SHIPPER(160,"直发商家签收"), - END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"), - TRIPARTITE_TRANSFER_DEPART(180, "三方中转发车"), - CANCEL_TRIPARTITE_TRANSFER_DEPART(190, "三方中转取消发车"), - ARRICE_TRIPARTITE_TRANSFER_DEPART(200, "三方中转到达"), - SIGN_TRIPARTITE_TRANSFER_DEPART(210, "三方中转签收"), - SORTING_TRAYS(220, "分拣打托"), - UN_SORTING_TRAYS(230, "包件解托"), - PUTAWAY(240, "上架"), - DELIST(250, "下架"), - STOCKING_OPERATION(260, "备货作业"), - PLAN_DELIVERY(261, "计划配送"), - CANCEL_DELIVERY(262, "计划取消"), - PLAN_BILLOFLADING(263, "计划自提"), - CANCEL_BILLOFLADING(264, "取消自提"), - PLAN_DISTRIBUTION(265, "计划配车"), - CANCEL_DISTRIBUTION(266, "取消配车"), - DISTRIBUTION_LOADING(270, "配送装车"), - DISTRIBUTION_ABNORMAL_LOADING(271, "异常装车"), - DISTRIBUTION_CANCEL_LOADING(272, "取消装车"), - DISTRIBUTION_SIGN_FOR(280, "配送签收"), - DISTRIBUTION_ABNORMAL_SIGN_FOR(281, "异常签收"), - CLERK_REVIEW(290, "文员复核"); + INITIAL_DATA_ENTRY(101010, "数据入库"), + INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"), + + BILLING(102010, "开单"), + CHANGE_ORDER(102020, "改单"), + REVIEW_ORDER(102030, "审单"), + + LOADING_PLAN(103010, "配载计划"), + INITIAL_WAREHOUSE_LOADING(103020, "装车"), + CANCEL_INITIAL_WAREHOUSE_LOADING(103030, "取消装车"), + INITIAL_WAREHOUSE_DEPART(103040, "始发仓发车"), + CANCEL_INITIAL_WAREHOUSE_DEPART(103050, "始发仓取消发车"), + NET_ARRIVE_CAR(103060,"网点到车"), + CANCEL_NET_ARRIVE_CAR(103070,"网点取消到车"), + TRANSFER_WAREHOUSE_DEPART(103080, "网点发车"), + CANEL_TRANSFER_WAREHOUSE_DEPART(103090, "网点取消发车"), + FINAL_NET_ARRIVE_CAR(1030100,"终点到车"), + CANCEL_FINAL_NET_ARRIVE_CAR(1030110,"终点取消到车"), + + TRIPARTITE_TRANSFER_DEPART(104010, "三方中转发车"), + CANCEL_TRIPARTITE_TRANSFER_DEPART(104020, "三方中转取消发车"), + ARRICE_TRIPARTITE_TRANSFER_DEPART(104030, "三方中转到达"), + SIGN_TRIPARTITE_TRANSFER_DEPART(104040, "三方中转签收"), + + UNLOAD_INCOMING_WAREHOUSE(105010,"卸车入库"), + TRANSFER_WAREHOUSE_UNLOADING(105020, "卸车确认"), + SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), + END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + + SORTING_TRAYS(201010, "分拣打托"), + UN_SORTING_TRAYS(201020, "包件解托"), + PUTAWAY(201030, "上架"), + DELIST(201040, "下架"), + STOCKING_OPERATION(201050, "备货作业"), + STOCKING_AREA_SHELVING(201060, "备货区上架"), + SPLIT_SHIPPING_ORDER(201070, "运单拆单"), + EMPTY_PALLET(201080, "托盘空置"), + STOCK_TRANSFER(201090, "转库存"), + PACKAGE_TRANSFER(2010100, "转包件"), + SPLIT_ORDER(2010110, "拆单"), + INVENTORY_STOCKING(2010120, "库存品入库"), + + PLANNED_RESERVATION(301010, "计划预约"), + PLAN_DELIVERY(301020, "计划配送"), + CANCEL_DELIVERY(301030, "计划取消"), + PLAN_BILLOFLADING(301040, "计划自提"), + CANCEL_BILLOFLADING(301050, "取消自提"), + PLAN_DISTRIBUTION(301060, "计划配车"), + CANCEL_DISTRIBUTION(301070, "取消配车"), + + DISTRIBUTION_LOADING(302010, "配送装车"), + DISTRIBUTION_ABNORMAL_LOADING(302020, "异常装车"), + DISTRIBUTION_CANCEL_LOADING(302030, "取消装车"), + DISTRIBUTION_CAR_START(302040, "配送发车"), + DISTRIBUTION_CAR_ARRIVED(302050, "配送到达"), + DISTRIBUTION_SIGN_FOR(302060, "配送签收"), + DISTRIBUTION_RETENTION(302070, "配送滞留"), + DISTRIBUTION_ABNORMAL_SIGN_FOR(302080, "异常签收"), + DISTRIBUTION_FAIL(302090, "配送失败"), + + CLERK_REVIEW(303010, "文员复核"); private Integer code; private String value; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java index 197affb4d..f7bc5cfc9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java @@ -29,6 +29,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** * 基础门店联系人表 服务实现类 @@ -61,14 +62,15 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl storeContactEntities = baseMapper.selectList(Wrappers.query().lambda() .eq(BasicdataStoreContactEntity::getShopId, basicdataStoreContact.getShopId()) ); - storeContactEntities.forEach( i ->{ - if(i.getShopId().equals(basicdataStoreContact.getShopId())){ - this.updateById(basicdataStoreContact); - }else{ - i.setDefaultType(false); - this.updateById(i); - } - }); + List ids = storeContactEntities.stream().filter(f -> !f.getId().equals(basicdataStoreContact.getId())).map(BasicdataStoreContactEntity::getId).collect(Collectors.toList()); + if (!ids.isEmpty()) { + this.update(Wrappers.update().lambda() + .in(BasicdataStoreContactEntity::getId,ids) + .set(BasicdataStoreContactEntity::getDefaultType,false) + ); + } + this.updateById(basicdataStoreContact); + return true; }catch (Exception e){ log.info("报错信息：{}",e.getMessage()); 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 d25e00d97..2041cc106 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 @@ -3214,13 +3214,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageListInfo = s.getPackageListInfo(); if (Func.isNotEmpty(packageListInfo)) { + if (Func.isNotEmpty(reservationEntity) && reservationEntity.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue())) { + log.error("#############商配文员对已复核预约进行订单追加reservationId:{}", reservationEntity.getId()); + throw new RuntimeException("收货单位:" + reservationEntity.getMallName() + "客户:" + reservationEntity.getConsignee() + "司机完成签收,无法追加订单"); + } packageListInfo.forEach(p -> { orderPackageNum.getAndAdd(p.getQuantity()); DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); @@ -3239,6 +3239,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { /** * 配送装车 */ - DISTRIBUTION_LOADING(270, "配送"), + DISTRIBUTION_LOADING(302010, "配送"), /** * 文员复核 */ - CLERK_REVIEW(290, "已签收"), + CLERK_REVIEW(303010, "已签收"), ; FactoryNodeEnums(Integer code, String text) { diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/enums/NodeNeedEnums.java index c795d0f2e..06a7ef468 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/enums/NodeNeedEnums.java @@ -16,11 +16,11 @@ public enum NodeNeedEnums implements Serializable { /** * 配送装车 */ - DISTRIBUTION_LOADING(270, "配送装车"), + DISTRIBUTION_LOADING(302010, "配送装车"), /** * 文员复核 */ - CLERK_REVIEW(290, "文员复核"), + CLERK_REVIEW(303010, "文员复核"), ; private Integer code; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java index b1dd05096..8099f1181 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java @@ -13,12 +13,12 @@ import java.io.Serializable; @Getter public enum NodeNeedEnums implements Serializable { - INITIAL_WAREHOUSE_DEPART(60, "始发仓发车"), - TRANSFER_WAREHOUSE_UNLOADING(110, "中转仓卸车确认"), - TRANSFER_WAREHOUSE_DEPART(120, "中转仓发车"), - SIGN_DIRECT_SHIPPER(160,"直发商家签收"), - END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"), - CLERK_REVIEW(290, "文员复核"); + INITIAL_WAREHOUSE_DEPART(103040, "始发仓发车"), + TRANSFER_WAREHOUSE_UNLOADING(105020, "中转仓卸车确认"), + TRANSFER_WAREHOUSE_DEPART(103080, "中转仓发车"), + SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), + END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + CLERK_REVIEW(303010, "文员复核"); private Integer code; private String value; diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/InterceptorAdapterConfig.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/InterceptorAdapterConfig.java index 83e7c2a59..036d0b99e 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/InterceptorAdapterConfig.java @@ -1,6 +1,5 @@ package com.logpm.patch.config; -import com.logpm.patch.interceptor.LocalServerLoginAccountsInterceptor; import lombok.AllArgsConstructor; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.redis.lock.RedisLockClient; @@ -22,7 +21,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry interceptorRegistry) { - interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment,redisLockClient)).addPathPatterns("/**").order(1); +// interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment,redisLockClient)).addPathPatterns("/**").order(1); } }