diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 83ba58abb..a26695d2c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -31,6 +31,7 @@ import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.service.IDistributionAsyncService; +import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; @@ -85,6 +86,8 @@ public class DistributionSignforController extends BladeController { private final IDistributionAsyncService distributionAsyncService; + private final IDistributionDeliveryListService distributionDeliveryListService; + /** * 签收管理 详情 */ @@ -306,8 +309,11 @@ public class DistributionSignforController extends BladeController { @ApiOperation(value = "修改", notes = "传入distributionSignfor") public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { - R r= distributionSignforService.recheck(distributionSignfor.getId()); - + R r= distributionSignforService.recheck(distributionSignfor); + if (r.isSuccess()){ + //维护配送状态 + distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignfor.getDeliveryId()); + } // return R.status(distributionSignforService.updateById(distributionSignfor)); return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index e1da4510f..12c99489b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1158,6 +1158,7 @@ ldsa.order_code, ldrs.is_have_data, ldsa.id AS id, + ldsa.waybill_number AS waybillNumber, ldrs.is_zero FROM logpm_distribution_reservation AS lds diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index cd1d25e66..3b69adcec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -244,7 +244,7 @@ public interface IDistributionSignforService extends BaseService