From 6e982cf3857332a44295e5703c24426c24384794 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 20 Jun 2023 18:08:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=91=E8=BD=A6=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryInfoEntity.java | 36 ++++++++++------- .../DistributionDeliveryListEntity.java | 9 ++++- .../entity/DistributionSigndetailEntity.java | 6 +++ .../IDistributionDeliveryChargeClient.java | 5 ++- .../IDistributionDeliveryInfoClient.java | 4 +- .../vo/DistributionDeliveryInfoVO.java | 2 +- .../vo/DistributionSignforsnmbVO.java | 39 +++++++++++++++++++ .../DistributionDeliveryInfoController.java | 22 +++++------ .../DistributionDeliveryListController.java | 11 ++++++ .../DistributionSignforController.java | 14 +++++++ .../dto/DistributionDeliveryInfoDTO.java | 2 +- .../dto/DistributionSignforDTO.java | 7 +++- .../excel/DistributionDeliveryInfoExcel.java | 2 +- .../feign/DistributionDeliveryInfoClient.java | 2 +- .../DistributionDeliveryInfoMapper.java | 2 +- .../mapper/DistributionSignforMapper.java | 30 +++++++++++++- .../mapper/DistributionSignforMapper.xml | 12 ++++++ .../IDistributionDeliveryInfoService.java | 2 +- .../IDistributionDeliveryListService.java | 7 ++++ .../service/IDistributionSignforService.java | 10 ++++- .../DistributionDeliveryInfoServiceImpl.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 23 +++++++++++ .../impl/DistributionSignforServiceImpl.java | 28 +++++++++++++ 23 files changed, 237 insertions(+), 40 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java index fd316579a..96c982f71 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java @@ -25,37 +25,47 @@ import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; /** - * 配送预约中间表 实体类 + * 配送装车中间表 实体类 * * @author TJJ * @since 2023-06-16 */ @Data @TableName("logpm_distribution_delivery_info") -@ApiModel(value = "DistributionDeliveryInfo对象", description = "配送预约中间表") +@ApiModel(value = "DistributionDeliveryInfo对象", description = "配送装车中间表") @EqualsAndHashCode(callSuper = true) public class DistributionDeliveryInfoEntity extends TenantEntity { /** - * 预约编号 + * 客户表Id */ - @ApiModelProperty(value = "预约编号") - private String reservationId; + @ApiModelProperty(value = "客户表Id") + private Long reservationId; /** - * 配送单编号 + * 配送表id */ - @ApiModelProperty(value = "配送单编号") + @ApiModelProperty(value = "配送表id") private String deliveryId; /** - * 预留1 + * 包条表id */ - @ApiModelProperty(value = "预留1") - private String reserve1; + @ApiModelProperty(value = "包条表id") + private String packageId; /** - * 预留2 + * 订单表id */ - @ApiModelProperty(value = "预留2") - private String reserve2; + @ApiModelProperty(value = "订单表id") + private String orderId; + /** + * 装车状态(1-未装车,2-已装车) + */ + @ApiModelProperty(value = "装车状态(1-未装车,2-已装车)") + private String loadedState; + /** + * 装车数量 + */ + @ApiModelProperty(value = "装车数量") + private Integer loadedNub; /** * 预留3 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 9afd60813..865cffa96 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -139,10 +139,15 @@ public class DistributionDeliveryListEntity extends TenantEntity { @ApiModelProperty(value = "装卸班组") private String loadingTeam; /** - * 预约表id + * 预约表id（客户） */ - @ApiModelProperty(value = "预约表id") + @ApiModelProperty(value = "预约表id(客户)") private String reservationId; + /** + * 关联订单id + */ + @ApiModelProperty(value = "关联订单id") + private String orderId; /** * 备货时间 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java index 9e894a2c8..81b1f15d6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java @@ -149,5 +149,11 @@ public class DistributionSigndetailEntity extends TenantEntity { @ApiModelProperty(value = "品牌") private String brand; + /** + * 是否签收 + */ + @ApiModelProperty(value = "是否签收") + private String isSignfor; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryChargeClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryChargeClient.java index 0d522f0e6..ca69d93f9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryChargeClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryChargeClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import org.springframework.cloud.openfeign.FeignClient; @@ -29,11 +30,11 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distributionDeliveryCharge" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionDeliveryChargeClient { - String API_PREFIX = "/client"; + String API_PREFIX = "DeliveryCharge/client"; String TOP = API_PREFIX + "/top12312"; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java index 0c6cc6de3..21ee43d52 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; /** - * 配送预约中间表 Feign接口类 + * 配送装车中间表 Feign接口类 * * @author TJJ * @since 2023-06-16 @@ -37,7 +37,7 @@ public interface IDistributionDeliveryInfoClient { String TOP = API_PREFIX + "/top"; /** - * 获取配送预约中间表列表 + * 获取配送装车中间表 * * @param current 页号 * @param size 页数 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index 4b1e0fde3..5a0d66cb3 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -22,7 +22,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 配送预约中间表 视图实体类 + * 配送装车中间表 视图实体类 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java new file mode 100644 index 000000000..b79928e5a --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java @@ -0,0 +1,39 @@ +package com.logpm.distribution.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 车次统计 + * + * @author lmy + * @since 2023-06-19 + */ +@Data +public class DistributionSignforsnmbVO { + + /** + * 客户总数 + */ + @ApiModelProperty(value = "客户总数") + private Integer customNub; + + /** + * 订单总数 + */ + @ApiModelProperty(value = "订单总数") + private Integer ordersNub; + + /** + * 已签收总数 + */ + @ApiModelProperty(value = "已签收总数") + private Integer signedNub; + /** + * 未签收总数 + */ + @ApiModelProperty(value = "未签收总数") + private Integer unsignedNub; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryInfoController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryInfoController.java index 263d0a289..dd5efe115 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryInfoController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryInfoController.java @@ -45,21 +45,21 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; /** - * 配送预约中间表 控制器 + * 配送装车中间表 控制器 * * @author TJJ * @since 2023-06-16 */ @RestController @AllArgsConstructor -@RequestMapping("deliveryInfo/distributionDeliveryInfo") -@Api(value = "配送预约中间表", tags = "配送预约中间表接口") +@RequestMapping("/deliveryInfo") +@Api(value = "配送装车中间表", tags = "配送装车中间表接口") public class DistributionDeliveryInfoController extends BladeController { private final IDistributionDeliveryInfoService distributionDeliveryInfoService; /** - * 配送预约中间表 详情 + * 配送装车中间表 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 1) @@ -69,7 +69,7 @@ public class DistributionDeliveryInfoController extends BladeController { return R.data(detail); } /** - * 配送预约中间表 分页 + * 配送装车中间表 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) @@ -80,7 +80,7 @@ public class DistributionDeliveryInfoController extends BladeController { } /** - * 配送预约中间表 自定义分页 + * 配送装车中间表 自定义分页 */ @GetMapping("/page") @ApiOperationSupport(order = 3) @@ -91,7 +91,7 @@ public class DistributionDeliveryInfoController extends BladeController { } /** - * 配送预约中间表 新增 + * 配送装车中间表 新增 */ @PostMapping("/save") @ApiOperationSupport(order = 4) @@ -101,7 +101,7 @@ public class DistributionDeliveryInfoController extends BladeController { } /** - * 配送预约中间表 修改 + * 配送装车中间表 修改 */ @PostMapping("/update") @ApiOperationSupport(order = 5) @@ -111,7 +111,7 @@ public class DistributionDeliveryInfoController extends BladeController { } /** - * 配送预约中间表 新增或修改 + * 配送装车中间表 新增或修改 */ @PostMapping("/submit") @ApiOperationSupport(order = 6) @@ -121,7 +121,7 @@ public class DistributionDeliveryInfoController extends BladeController { } /** - * 配送预约中间表 删除 + * 配送装车中间表 删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 7) @@ -144,7 +144,7 @@ public class DistributionDeliveryInfoController extends BladeController { //} queryWrapper.lambda().eq(DistributionDeliveryInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); List list = distributionDeliveryInfoService.exportDistributionDeliveryInfo(queryWrapper); - ExcelUtil.export(response, "配送预约中间表数据" + DateUtil.time(), "配送预约中间表数据表", list, DistributionDeliveryInfoExcel.class); + ExcelUtil.export(response, "配送装车中间表数据" + DateUtil.time(), "配送装车中间表数据表", list, DistributionDeliveryInfoExcel.class); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index ca1b9a66d..2a5bc0139 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -97,6 +97,17 @@ public class DistributionDeliveryListController extends BladeController { return R.data(distributionstatisticsnmbVO); } + /** + * 配送管理 点击发车 + */ + @GetMapping("/start") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + public R start(DistributionDeliveryListDTO distributionDeliveryList) { + Integer i = distributionDeliveryListService.start(distributionDeliveryList); + return R.data(i); + } + /** * 配送管理 自定义分页 */ 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 dfaa5d0b5..2e787e528 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 @@ -18,6 +18,8 @@ package com.logpm.distribution.controller; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.service.IDistributionReservationService; +import com.logpm.distribution.vo.DistributionSignforsnmbVO; +import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -79,6 +81,18 @@ public class DistributionSignforController extends BladeController { return R.data(distributionSignforVO); } + + /** + * 签收管理 签收订单统计 + */ + @GetMapping("/statistics") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distributionSignfor") + public R statistics(DistributionSignforDTO distributionSignfor) { + DistributionSignforsnmbVO distributionSignforsnmbVO = distributionSignforService.getNubTotal(distributionSignfor); + return R.data(distributionSignforsnmbVO); + } + /** * 签收管理 分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryInfoDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryInfoDTO.java index f2d9e81ed..aef86bb93 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryInfoDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryInfoDTO.java @@ -21,7 +21,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 配送预约中间表 数据传输对象实体类 + * 配送装车中间表 数据传输对象实体类 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java index e8d6f6eb2..de3e1981f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.dto; import com.logpm.distribution.entity.DistributionSignforEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,5 +31,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionSignforDTO extends DistributionSignforEntity { private static final long serialVersionUID = 1L; - + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "查询创建时间") + private String createTime_query; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryInfoExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryInfoExcel.java index 1264ece78..f951565c5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryInfoExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryInfoExcel.java @@ -28,7 +28,7 @@ import java.io.Serializable; /** - * 配送预约中间表 Excel实体类 + * 配送装车中间表 Excel实体类 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryInfoClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryInfoClient.java index edae12442..366ef63a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryInfoClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryInfoClient.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; /** - * 配送预约中间表 Feign实现类 + * 配送装车中间表 Feign实现类 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java index 20fa04acd..5475a3260 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 配送预约中间表 Mapper 接口 + * 配送装车中间表 Mapper 接口 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 1a76e4c4a..a9995e8b2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.excel.DistributionSignforExcel; @@ -50,5 +51,32 @@ public interface DistributionSignforMapper extends BaseMapper exportDistributionSignfor(@Param("ew") Wrapper queryWrapper); - + /** + * 订单总数 + * + * @param distributionSignfor + * @return + */ + Integer selectOrdersNub(DistributionSignforDTO distributionSignfor); + /** + * 签收总数 + * + * @param distributionSignfor + * @return + */ + Integer selectSignedNub(DistributionSignforDTO distributionSignfor); + /** + * 未签收总数 + * + * @param distributionSignfor + * @return + */ + Integer selectUnsignedNub(DistributionSignforDTO distributionSignfor); + /** + * 客户总数 + * + * @param distributionSignfor + * @return + */ + List selectCustomNub(DistributionSignforDTO distributionSignfor); } 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 e718796d8..2dcbcdb78 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 @@ -51,5 +51,17 @@ + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java index 2afecbbe6..e74c452cb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java @@ -25,7 +25,7 @@ import org.springblade.core.mp.base.BaseService; import java.util.List; /** - * 配送预约中间表 服务类 + * 配送装车中间表 服务类 * * @author TJJ * @since 2023-06-16 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 36a6cfce3..f2aed76b2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -67,4 +67,11 @@ public interface IDistributionDeliveryListService extends BaseService exportDistributionSignfor(Wrapper queryWrapper); - + /** + * 签收订单统计 + * + * @return + */ + DistributionSignforsnmbVO getNubTotal(DistributionSignforDTO distributionSignfor); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 65237a93c..8fa0088fd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -28,7 +28,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; /** - * 配送预约中间表 服务实现类 + * 配送装车中间表 服务实现类 * * @author TJJ * @since 2023-06-16 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 764e871e2..2639fb2f0 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 @@ -27,14 +27,20 @@ import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.vo.DistributionPackadeliVO; import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.math.BigInteger; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.List; /** @@ -45,6 +51,7 @@ import java.util.List; */ @Service @AllArgsConstructor +@Slf4j public class DistributionDeliveryListServiceImpl extends BaseServiceImpl implements IDistributionDeliveryListService { private final DistributionPackadeliMapper distributionPackadeliMapper; @Override @@ -100,4 +107,20 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>{}",distributionDeliveryList); + //获取关联的客户信息 + String reservationId = distributionDeliveryList.getReservationId(); + List reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(",")))); + //查询客户信息 + + //插入配送管理表 + //获取关联订单 + String orderId = distributionDeliveryList.getOrderId(); + List orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(",")))); + return null; + } + } 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 8108652cc..5ad0ad46e 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 @@ -16,15 +16,20 @@ */ package com.logpm.distribution.service.impl; +import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.mapper.DistributionSignforMapper; import com.logpm.distribution.service.IDistributionSignforService; +import com.logpm.distribution.vo.DistributionSignforsnmbVO; +import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; + +import java.text.SimpleDateFormat; import java.util.List; /** @@ -51,4 +56,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignforEntityList = baseMapper.selectCustomNub(distributionSignfor); + //订单总数 + Integer OrdersNub = baseMapper.selectOrdersNub(distributionSignfor); + //已签收总数 + Integer SignedNub = baseMapper.selectSignedNub(distributionSignfor); +// //未签收总数 +// Integer UnsignedNub = baseMapper.selectUnsignedNub(distributionSignfor); + distributionSignforsnmbVO.setCustomNub(distributionSignforEntityList.size()); + distributionSignforsnmbVO.setOrdersNub(OrdersNub); + distributionSignforsnmbVO.setUnsignedNub(OrdersNub - SignedNub); + distributionSignforsnmbVO.setSignedNub(SignedNub); + return distributionSignforsnmbVO; + } + }