From 9711d656d38df70611f3fab05433ea5124443539 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Jan 2024 17:01:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=90=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionReservationMapper.xml | 1 + .../service/impl/DistributionSignforServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 dd74a5209..a571211db 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/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 2997c00de..4b5ce1413 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 @@ -389,7 +389,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Mon, 22 Jan 2024 17:57:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=BB=B4=E6=8A=A4=E9=85=8D=E9=80=81=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionSignforController.java | 8 +++++++- .../service/impl/DistributionSignforServiceImpl.java | 3 --- 2 files changed, 7 insertions(+), 4 deletions(-) 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..8c39fd0a7 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; + /** * 签收管理 详情 */ @@ -307,7 +310,10 @@ public class DistributionSignforController extends BladeController { public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { R r= distributionSignforService.recheck(distributionSignfor.getId()); - + 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/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 4b5ce1413..402759b14 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 @@ -496,9 +496,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Mon, 22 Jan 2024 18:01:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 402759b14..3a7bf99cc 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 @@ -484,10 +484,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Mon, 22 Jan 2024 18:33:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionSignforController.java | 2 +- .../service/IDistributionSignforService.java | 2 +- .../impl/DistributionSignforServiceImpl.java | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) 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 8c39fd0a7..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 @@ -309,7 +309,7 @@ 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()); 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 dcfd9f2cc..a9b04fe2e 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