diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index 06f36ce65..66eb9386e 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -32,6 +32,25 @@ import java.util.*; */ @Log4j2 public class CommonUtil { + /** + * 把字符串改为list + * @param num + * @return + */ + public static List stringNum(String num){ + + List list = new ArrayList<>(); + if(num.contains(",")){ + list.addAll(Arrays.asList(num.split(","))); + }else if(num.contains(" ")){ + list.addAll( Arrays.asList(num.split(" "))); + }else if(num.contains("，")){ + list.addAll( Arrays.asList(num.split("，"))); + }else{ + list.add(num); + } + return list; + } public static LocalDate stringToLocalDate(String time){ if(!StringUtils.hasLength(time)){ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java index a2db30716..2c3c85b23 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -112,6 +112,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit */ @ApiModelProperty(value = "地址") private String deliveryAddress; + /** + * 备货地址 + */ + @ApiModelProperty(value = "备货地址") + private String stockupArea; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java index a4a3d454c..3eeeb1b6a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java @@ -67,6 +67,12 @@ public class DistributionAppReservationVO extends DistributionReservationEntity @ApiModelProperty(value = "订单总数") private Integer ordNub; + /** + * 备货地址 + */ + @ApiModelProperty(value = "备货地址") + private String stockupArea; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppSignforVO.java index 616e4c3a4..27dc0d490 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppSignforVO.java @@ -47,6 +47,11 @@ public class DistributionAppSignforVO extends DistributionSignforEntity { */ @ApiModelProperty(value = "订单总数") private Integer ordNub; + /** + * 是否加急 1-否、2-是 + */ + @ApiModelProperty(value = "是否加急 1-否、2-是") + private String isUrgent; /** * 扫描件数 @@ -59,5 +64,10 @@ public class DistributionAppSignforVO extends DistributionSignforEntity { */ @ApiModelProperty(value = "配送状态") private String deliveryStatus; + /** + * 预约备注信息 + */ + @ApiModelProperty(value = "预约备注信息") + private String remarks; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index ce664a77c..a5ffec7ec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -1,6 +1,8 @@ package com.logpm.distribution.appcontroller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; @@ -17,9 +19,12 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.HashMap; +import java.util.Map; /** * 签收 控制器 @@ -177,5 +182,25 @@ public class DistributionSignforAppController { R msg = distributionSignforService.offline(distributionSignfor.getOfflineJson()); return msg; } + /** + * 签收管理 回显照片信息 + */ + @PostMapping("/prices") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "回显照片", notes = "回显照片") + public R prices(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { + if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ + DistributionSignforEntity one = distributionSignforService.getOne(Wrappers.query().lambda() + .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) + ); + Map map = new HashMap<>(); + map.put("deliverySignPictures",one.getDeliverySignPictures()); + map.put("driverRemarks",one.getDriverRemarks()); + return R.data(map); + }else { + return R.fail(3002,"参数不能为空不对！！"); + } + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 6231f0027..777381e49 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -29,6 +29,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import org.springblade.common.utils.CommonUtil; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -84,8 +85,10 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> list(@ApiIgnore @RequestParam Map distributionStockArticle, Query query) { - Object o = distributionStockArticle.get("orderSelfNumbering"); - distributionStockArticle.remove("orderSelfNumbering"); + Object orderCodeNum = distributionStockArticle.get("orderCodeNum"); + distributionStockArticle.remove("orderCodeNum"); + Object waybillNum = distributionStockArticle.get("waybillNum"); + distributionStockArticle.remove("waybillNum"); Object o2 = distributionStockArticle.get("startDate"); Object o1 = distributionStockArticle.get("entDate"); Object d = distributionStockArticle.get("id"); @@ -97,13 +100,29 @@ public class DistributionStockArticleController extends BladeController { QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); if(Func.isNotEmpty(reservation)){ queryWrapper.in("reservation_status","10"); + } + if(Func.isNotEmpty(orderCodeNum)){ + String anumbering = orderCodeNum.toString(); + List list = CommonUtil.stringNum(anumbering); + if(list.size() > 1){ + queryWrapper.in("order_code",list); + }else{ + queryWrapper.like("order_code",anumbering); + } } - if(Func.isNotEmpty(o)){ - queryWrapper.in("order_self_numbering",String.valueOf(o).split(",")); + if(Func.isNotEmpty(waybillNum)){ + String waybill = waybillNum.toString(); + List list = CommonUtil.stringNum(waybill); + if(list.size() > 1){ + queryWrapper.in("waybill_number",list); + }else{ + queryWrapper.like("waybill_number",waybill); + } } if(ObjectUtil.isNotEmpty(d)){ - queryWrapper.in("id",String.valueOf(d).split(",")); + String ids = d.toString(); + queryWrapper.in("id",CommonUtil.stringNum(ids)); } if(ObjectUtil.isNotEmpty(o2)){ queryWrapper.between("warehouse_entry_time",o2,o1); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java index 0aaf253e0..85788166c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java @@ -39,6 +39,12 @@ public class DistributionAppDeliveryListDTO extends DistributionDeliveryListEnti @ApiModelProperty(value = "查询创建时间") private String createTime_query; + /** + * 服务类型 + */ + @ApiModelProperty(value = "服务类型") + private String type; + /** * 是否扫描 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index db515e57e..e82ef93cc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -310,19 +310,14 @@ - + SELECT DISTINCT lddl.id id, lddl.train_number trainNumber, - lddl.type type, - lddl.kind kind, - lddl.vehicle_name vehicleName, - lddl.driver_name driverName, - lddl.vehicle_id vehicleId, - lddl.driver_id driverId, - lddl.delivery_status deliveryStatus, - lddl.preparation_time preparationTime, + lddl.type type, lddl.kind kind, lddl.vehicle_name vehicleName, lddl.driver_name driverName, + lddl.vehicle_id vehicleId, lddl.driver_id driverId, lddl.delivery_status deliveryStatus, lddl.preparation_time preparationTime, - lddl.create_time createTime, - lddl.customers_number customersNumber, - lddl.price price, - lddl.added_services_id addedServicesId, + lddl.create_time createTime, lddl.customers_number customersNumber, + lddl.price price, lddl.added_services_id addedServicesId, (SELECT COALESCE (COUNT(*) ,0) FROM logpm_distribution_signfor lds @@ -705,6 +694,7 @@ left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id lddl.is_deleted =0 + and lddl.type = #{param.type} and lddl.id in 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 924cec2bd..5993bf808 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 @@ -518,14 +518,15 @@ lds.loaded_number loadingNub, ldr.delivery_phone deliveryPhone, ldr.delivery_address deliveryAddress, + ldr.is_urgent isUrgent, + ldr.remarks, + CASE WHEN lds.positioning IS NOT NULL THEN true ELSE false END AS positioning, (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id ) ordNub, COALESCE(lds.received_quantity + lds.receivedin_quantity, 0) signNub FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - WHERE - lds.is_deleted = 0 - AND lds.delivery_id = #{id} + WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id}