From 9de3d450d394323c986f0c8d371cfc9d96de5aa0 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 7 Aug 2024 11:31:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BasicdataClientMapper.xml | 2 + .../service/impl/OpenOrderServiceImpl.java | 42 +++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml index df9ee3f69..395318cbd 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml @@ -101,6 +101,8 @@ from logpm_basicdata_client lbc left join logpm_basicdata_store_contact lbsc on lbsc.shop_id = lbc.id where lbc.id = #{clientId} + order by lbsc.default_type desc + limit 1 select ldr.* from logpm_distribution_reservation ldr - where ldr.delivery_type=2 + where ldr.delivery_type=2 and ldr.reservation_status !='40' and ldr.reservation_code like concat(#{distrbutionReservation.reservationCode},'%') From 8756740b967bf800a516f6c6b2c6a346fb280288 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 7 Aug 2024 18:33:13 +0800 Subject: [PATCH 8/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/trunkline/dto/BillladingDTO.java | 2 +- .../logpm/trunkline/vo/TrunklineLoadSignOrderVO.java | 1 + .../trunkline/controller/BillladingController.java | 3 ++- .../logpm/trunkline/controller/CarsLoadController.java | 1 + .../trunkline/mapper/TrunklineLoadSignOrderMapper.xml | 9 +++++++++ .../trunkline/service/ITrunklineBillladingService.java | 2 +- .../trunkline/service/impl/OpenOrderServiceImpl.java | 3 +++ .../service/impl/TrunklineBillladingServiceImpl.java | 4 ++-- .../impl/TrunklineWaybillPackageServiceImpl.java | 10 +++++++--- 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java index 74b8b2247..8fe676786 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java @@ -53,7 +53,7 @@ public class BillladingDTO extends TrunklineBillladingEntity { private String consignee;//收货单位 private String remark;//备注 private String destinationWarehouseName;//目的仓 + private String completeTime;//目的仓 private Long billladingId; - } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java index 92b129a9f..e3e827012 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java @@ -9,6 +9,7 @@ import java.util.List; @Data public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity { + private String warehouseName; private String driverName; private String carsNo; private String carsLineName; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java index 41882006f..dbc8f41a9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java @@ -277,6 +277,7 @@ public class BillladingController { //提货单状态 1=未开始，2=提货中，3=已完成，4=已结算 5=已取消 Integer type = billladingDTO.getType(); Long billladingId = billladingDTO.getId(); + String completeTime = billladingDTO.getCompleteTime(); try{ //当前登录人选择的仓库 @@ -295,7 +296,7 @@ public class BillladingController { return R.fail(405,"提货单id不能为空"); } - trunklineBillladingService.updateBillladingStatus(billladingId,type,myCurrentWarehouse.getId(),myCurrentWarehouse.getName()); + trunklineBillladingService.updateBillladingStatus(billladingId,type,myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),completeTime); return R.success("更新完成"); }catch (CustomerException e){ log.error(e.message,e); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index c363140f2..aa6ab07af 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -2405,6 +2405,7 @@ public class CarsLoadController { }else{ warehouseIds.add(myCurrentWarehouse.getId()); } + loadCarsDTO.setWarehouseIds(warehouseIds); return carsLoadService.findSignOrderPageList(loadCarsDTO); }catch (CustomerException e){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml index cb58060fa..971587c7b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml @@ -118,9 +118,17 @@ select ltlso.id id, ltlso.load_id loadId, ltlso.warehouse_id warehouseId, + lww.warehouse_name warehouseName, ltlso.plan_num planNum, ltlso.load_sign_code loadSignCode, ltlso.sign_num signNum, + ltlso.mall_name mallName, + ltlso.mall_person mallPerson, + ltlso.mall_mobile mallMobile, + ltlso.mall_address mallAddress, + ltlso.belong_to_warehouse_name belongToWarehouseName, + ltlso.sign_status signStatus, + ltlso.sign_time signTime, ltcl.driver_name driverName, ltcl.driver_mobile driverMobile, ltcl.car_number carNumber, @@ -130,6 +138,7 @@ from logpm_trunkline_load_sign_order ltlso left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id LEFT JOIN logpm_trunkline_cars_order ltco on ltco.sign_order_id = ltlso.id + left join logpm_warehouse_warehouse lww on lww.id = ltlso.warehouse_id and (ltlso.warehouse_id in diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java index e8a3e987a..331eaea1b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java @@ -22,7 +22,7 @@ public interface ITrunklineBillladingService extends BaseService advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes); + List updateAdvanceDetailList = new ArrayList<>(); advanceDetailEntities.forEach(advanceDetailEntity -> { - advanceDetailEntity.setNowWarehouseId(warehouseId); - advanceDetailEntity.setNowWarehouseName(warehouseEntity.getName()); + TrunklineAdvanceDetailEntity updateAdvanceDetail = new TrunklineAdvanceDetailEntity(); + updateAdvanceDetail.setId(advanceDetailEntity.getId()); + updateAdvanceDetail.setNowWarehouseId(warehouseId); + updateAdvanceDetail.setNowWarehouseName(warehouseEntity.getName()); + updateAdvanceDetailList.add(updateAdvanceDetail); }); - advanceDetailService.updateBatchById(advanceDetailEntities); + advanceDetailService.updateBatchById(updateAdvanceDetailList); } } } From fb32fd7b6d78ace083059872302eebd1a1c0ab72 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 7 Aug 2024 18:59:14 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E5=8F=96?= =?UTF-8?q?=E6=B6=88BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionReservationServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 5ba35fab7..6fba031a4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -3703,7 +3703,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageIds = packageEntityList.stream().map(DistributionReservationPackageEntity::getId).collect(Collectors.toList()); + distributionReservationPackageService.update(Wrappers.update().lambda() + .in(DistributionReservationPackageEntity::getId,packageIds) + .set(DistributionReservationPackageEntity::getCancelRemark,"商家端取消") + .set(DistributionReservationPackageEntity::getPacketBarStatus,ReservationPackageStatusConstant.quxiao.getValue()) + ); }