diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalAuditingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalAuditingStatusConstant.java index 741379393..2753ed75c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalAuditingStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalAuditingStatusConstant.java @@ -10,7 +10,8 @@ public enum LoadingAbnormalAuditingStatusConstant { daishenhe("待审核",1), yishenhe("已审核",2), yichang("已驳回",3), - yiquxiao("已取消",4); + yiquxiao("已取消",4), + yiqueding("已确定",5); /** diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalTypeConstant.java index 18e386750..351b847c9 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalTypeConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingAbnormalTypeConstant.java @@ -10,7 +10,8 @@ public enum LoadingAbnormalTypeConstant { zhuangcheyichang("装车异常",1), jihuayichang("计划异常",2), qianshouyichang("签收异常",3), - yichangjuqian("异常拒签",4); + yichangjuqian("异常拒签",4), + zizhuhuiku("自主回库",5); /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPositioningEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPositioningEntity.java new file mode 100644 index 000000000..467e70310 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPositioningEntity.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 自主配送信息列表 实体类 + * + * @author Tjj + * @since 2023-07-04 + */ +@Data +@TableName("logpm_distribution_positioning") +@ApiModel(value = "DistributionPositioning对象", description = "自主配送信息列表") +@EqualsAndHashCode(callSuper = true) +public class DistributionPositioningEntity extends TenantEntity { + + + /** + * 配送司机 + */ + @ApiModelProperty(value = "配送司机") + private String driverId; + /** + * 车辆编号 + */ + @ApiModelProperty(value = "车辆编号") + private Long vehicleId; + + /** + * 配送ID + */ + @ApiModelProperty(value = "配送ID") + private Long deliveryId; + /** + * 预约ID + */ + @ApiModelProperty(value = "预约ID") + private Long reservationId; + + + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private String vehicleNumber; + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private String operationUsername; + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private Long operationId; + + /** + * 地址 + */ + @ApiModelProperty(value = "地址") + private String address; + + /** + * 经纬度 + */ + @ApiModelProperty(value = "经纬度") + private String latitudeAndLongitude; + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + + + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java index d0d44f677..beade49db 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -144,7 +144,13 @@ public interface IDistributionDeliveryListClient { * @return */ @GetMapping(TOP+"/retentionReservationZeroPackageByNum") - boolean retentionReservationZeroPackageByNum(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("retentionQuantity") Integer retentionQuantity,@RequestParam("orderId") Long orderId); + boolean retentionReservationZeroPackageByNum(@RequestParam("deliveryId")Long deliveryId, + @RequestParam("reservationId") Long reservationId, + @RequestParam("orderPackageId") Long orderPackageId, + @RequestParam("retentionQuantity") Integer retentionQuantity, + @RequestParam("orderId") Long orderId, + @RequestParam("loadingId") Long loadingId + ); // /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanAbnormalClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanAbnormalClient.java index 3d7c05d9f..258371904 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanAbnormalClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanAbnormalClient.java @@ -21,6 +21,8 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -49,4 +51,8 @@ public interface IDistributionLoadscanAbnormalClient { @GetMapping(TOP+"completeAbnormal") void completeAbnormal(@RequestParam("abnormalId")Long abnormalId); + + @PostMapping(TOP+"saveDistributionLoadscanAbnormalEntity") + Long saveDistributionLoadscanAbnormalEntity(@RequestBody DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java index 1b268e667..a90ebd3da 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java @@ -42,6 +42,7 @@ public interface IDistributionSignforClient { String CLERKCHECKPUSHDATA = API_PREFIX + "/clerkCheckPushData"; String CLERKINVENTORYCHECKDATA = API_PREFIX + "/clerkInventoryCheckPushData"; String MAINTAINISHAVEABNORMALPACKAGE = API_PREFIX + "/maintainIsHaveAbnormalPackage"; + String UPDATEISHAVEABNORMALPACKAGE = API_PREFIX + "/updateIsHaveAbnormalPackage"; /** * 获取签收管理列表 @@ -84,4 +85,11 @@ public interface IDistributionSignforClient { */ @GetMapping(MAINTAINISHAVEABNORMALPACKAGE) void maintainIsHaveAbnormalPackage(@RequestParam("reservationId")Long reservationId); + + /** + * 进行签收异常标注 + * @param reservationId + */ + @GetMapping(UPDATEISHAVEABNORMALPACKAGE) + void updateIsHaveAbnormalPackage(@RequestParam("reservationId")Long reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java index cfe47d16d..790cf3ba6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -139,8 +139,15 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList } @Override - public boolean retentionReservationZeroPackageByNum(Long deliveryId, Long reservationId, Long orderPackageId, Integer retentionQuantity, Long orderId) { - return distributionDeliveryListService.retentionReservationZeroPackageByNum(deliveryId,reservationId,orderPackageId,retentionQuantity,orderId); + public boolean retentionReservationZeroPackageByNum(Long deliveryId, + Long reservationId, + Long orderPackageId, + Integer retentionQuantity, + Long orderId, + Long loadingId + ) + { + return distributionDeliveryListService.retentionReservationZeroPackageByNum(deliveryId,reservationId,orderPackageId,retentionQuantity,orderId,loadingId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanAbnormalClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanAbnormalClient.java index 7f85bb9df..b59e2c649 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanAbnormalClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanAbnormalClient.java @@ -62,4 +62,10 @@ public class DistributionLoadscanAbnormalClient implements IDistributionLoadscan } + @Override + public Long saveDistributionLoadscanAbnormalEntity(DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) { + distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity); + return distributionLoadscanAbnormalEntity.getId(); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java index bc44f8c87..6ebf0b396 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java @@ -129,6 +129,14 @@ public class DistributionSignforClient implements IDistributionSignforClient { distributionSignforService.maintainIsHaveAbnormalPackage(reservationId); } + @Override + public void updateIsHaveAbnormalPackage(Long reservationId) { + distributionSignforService.update(Wrappers.update().lambda() + .eq(DistributionSignforEntity::getReservationId,reservationId) + .set(DistributionSignforEntity::getIsHaveAbnormalPackage,2) + ); + } + private void buildNameAndPhone(List pushOldPackageSigning) { for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.java new file mode 100644 index 000000000..a2b0ce577 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.entity.DistributionDeliverySelfEntity; +import com.logpm.distribution.entity.DistributionPositioningEntity; +import com.logpm.distribution.excel.DistributionDeliverySelfExcel; +import com.logpm.distribution.vo.DistributionDeliverySelfVO; +import com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 自主配送信息列表 Mapper 接口 + * + * @author Tjj + * @since 2023-07-04 + */ +public interface DistributionPositioningMapper extends BaseMapper { + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.xml new file mode 100644 index 000000000..3f88fdd3f --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPositioningMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DELETE FROM logpm_distribution_delivery_self WHERE delivery_id = #{id} + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 16aafaa12..c2fa9c2d0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -2212,7 +2212,9 @@ WHEN 3 THEN '已驳回' WHEN 4 THEN - '已取消' ELSE '未知' + '已取消' + WHEN 5 THEN + '已确认' ELSE '未知' END AS auditingStatusName, CASE ldla.complete @@ -2256,7 +2258,10 @@ WHEN 3 THEN '签收异常' WHEN 4 THEN - '异常拒签' ELSE '未知' + '异常拒签' + WHEN 5 THEN + '自主回库' + ELSE '未知' END abnormalTypeName FROM logpm_distribution_loadscan_abnormal AS ldla diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index 830b03caa..b2edaf87b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -82,7 +82,6 @@ public interface DistributionStockArticleMapper extends BaseMapper { + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java index 173f89e96..1db341e7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationZeroPackageService.java @@ -87,5 +87,5 @@ public interface IDistributionReservationZeroPackageService extends BaseService< * @param orderPackageId * @param retentionQuantity */ - void reduceNum(Long reservationId, Long orderId, Long orderPackageId, Integer retentionQuantity); + void reduceNum(Long reservationId, Long orderId, Long orderPackageId, Integer retentionQuantity,Long loadingId); } 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 fb4af2177..0341898ad 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 @@ -4654,7 +4654,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl ids = new ArrayList<>(); ids.add(orderId); - distributionReservationZeroPackageService.reduceNum(reservationId,orderId,orderPackageId,retentionQuantity); + distributionReservationZeroPackageService.reduceNum(reservationId,orderId,orderPackageId,retentionQuantity,loadingId); distributionStockArticleService.maintenanceOrderInfoByIds(ids); distributionParcelListService.maintenanceZerpPackageInfo(orderPackageId); distributionParcelListService.maintenanceZerpPackageInfo(orderPackageId); @@ -9626,17 +9626,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl implements IDistributionPositioningService { + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java index 4e4840da7..56c72e4ad 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java @@ -62,6 +62,10 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm @Lazy private IDistributionReservationStockarticleService distributionReservationStockarticleService; + @Autowired + @Lazy + private IDistributionLoadscanService distributionLoadscanService; + @Override public IPage selectDistributionReservationZeroPackagePage(IPage page, DistributionReservationZeroPackageVO distributionReservationZeroPackage) { @@ -160,7 +164,7 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm @Override @Transactional - public void reduceNum(Long reservationId, Long orderId, Long orderPackageId, Integer retentionQuantity) { + public void reduceNum(Long reservationId, Long orderId, Long orderPackageId, Integer retentionQuantity,Long loadingId) { DistributionReservationZeroPackageEntity one = this.getOne(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, orderId) @@ -183,6 +187,10 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm distributionParcelNumberEntity.setOutboundQuantity(outboundQuantity); distributionParcelNumberEntity.setHandQuantity(handQuantity); distributionParcelNumberService.updateById(distributionParcelNumberEntity); + //对指定的装车记录进行扣减 + distributionLoadscanService.deductionLoadingNum(retentionQuantity,loadingId); + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index f715689d0..534ca8924 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -270,6 +270,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { @@ -4741,29 +4744,42 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() - .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) - .eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId()) - .set(StringUtils.isNotBlank(distributionSignfor.getPositioning()), DistributionSignforEntity::getPositioning, distributionSignfor.getPositioning()) - .set(StringUtils.isNotBlank(add.getAddress()), DistributionSignforEntity::getPositioningAdr, add.getAddress()) - ); - DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignforEntity.getDeliveryId()); - DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignforEntity.getReservationId()); - - BladeUser user = AuthUtil.getUser(); - + DistributionPositioningEntity distributionPositioning = createdDistributionPositioningEntity(deliveryListEntity,reservationEntity,AuthUtil.getUser(),driver,positioning); + //进行打卡信息保存 + distributionPositioningService.save(distributionPositioning); NodeFanoutMsg nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user); iDistributionNodeWorkService.carArrived(nodeFanoutMsg, user); return Resp.scanSuccess("打卡成功", "打卡成功"); } + private DistributionPositioningEntity createdDistributionPositioningEntity(DistributionDeliveryListEntity deliveryListEntity, + DistributionReservationEntity reservationEntity, + BladeUser user, + Boolean driver, + String positioning) { + GAddressVo add = GaoDeApiUtil.getAdd(positioning); + DistributionPositioningEntity distributionPositioningEntity = new DistributionPositioningEntity(); + distributionPositioningEntity.setAddress(positioning); + distributionPositioningEntity.setLatitudeAndLongitude(add.getAddress()); + distributionPositioningEntity.setDeliveryId(deliveryListEntity.getId()); + distributionPositioningEntity.setReservationId(reservationEntity.getId()); + distributionPositioningEntity.setOperationUsername(user.getNickName()); + distributionPositioningEntity.setOperationId(user.getUserId()); + if ("1".equals(deliveryListEntity.getKind())){ + DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(deliveryListEntity, user, null, driver); + distributionPositioningEntity.setVehicleNumber(deliverySelfEntity.getVehicleNub()); + distributionPositioningEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId())); + } + return distributionPositioningEntity; + + } + private NodeFanoutMsg buildConsigneeArriveVO(DistributionDeliveryListEntity deliveryListEntity, DistributionReservationEntity reservationEntity, GAddressVo add, BladeUser user) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); @@ -7570,6 +7586,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl aaa = new ArrayList<>(); DistributionReservationPackageEntity planPackage = distributionReservationPackageService.getPlanPackageByReservationAndCode(reservationId,barcode); if (!Objects.isNull(planPackage)){ if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { - return Resp.scanFail("包件已签收", "包件已签收"); + return Resp.scanFail("包件未装车", "包件未装车"); } List abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageCode, barcode) @@ -7660,6 +7680,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailEntities = distributionReservationMapper.selectInventoryListByReservation(distrilbutionloadingscanDTO.getReservationId()); if (detailEntities.isEmpty()) { @@ -8509,6 +8536,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl logList = new ArrayList<>(); //生成异常 @@ -8519,7 +8550,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl