From ab0af22f59247182648ef5beb501d8f99f61dac1 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 13 Jun 2024 17:13:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E7=AB=AF?= =?UTF-8?q?=E9=A2=84=E5=85=A5=E5=BA=93=E6=89=AB=E7=A0=81=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../common/constant/RedisKeyConstant.java | 8 + .../logpm/business/dto/BusinessSanDTO.java | 7 + .../DistributionBusinessPreOrderEntity.java | 3 + ...tributionBusinessPreCarDetalPackageVO.java | 28 + .../vo/DistributionBusinessPreCarDetalVO.java | 42 ++ ...ibutionBusinessPreCarNumerPageQueryVO.java | 16 + ...DistributionBusinessPreCarNumerPageVO.java | 34 ++ ...istributionBusinessPreCarOrderDetalVO.java | 35 ++ .../feign/ITrunklineAdvanceDetailClient.java | 4 + ...ributionBusinessPreOrderAppController.java | 34 +- .../DistributionSignforAppController.java | 2 +- .../DistributionStockListPDAController.java | 3 +- .../com/logpm/distribution/bean/Resp.java | 2 + .../config/CustomMessageConverter.java | 6 +- .../config/GlobalExceptionHandler.java | 4 +- .../DistributionSignforController.java | 2 +- .../distribution/dto/OrderStatusDTO.java | 7 +- .../excel/DistributionStockListInfoExcel.java | 3 +- .../DistributionBusinessPreOrderMapper.java | 7 + .../DistributionBusinessPreOrderMapper.xml | 47 ++ .../mapper/DistributionDeliveryInfoMapper.xml | 2 +- .../mapper/DistributionDeliveryListMapper.xml | 2 +- .../IDistributionBusinessPreOrderService.java | 25 +- .../impl/DistributionAsyncServiceImpl.java | 19 +- .../DistributionDeliveryListServiceImpl.java | 28 +- .../DistributionReservationServiceImpl.java | 18 +- .../impl/DistributionSignforServiceImpl.java | 12 +- .../DistributionStockArticleServiceImpl.java | 10 +- .../DistributionStockListServiceImpl.java | 2 +- .../impl/DistributionStockupServiceImpl.java | 32 +- .../DistrilbutionBillLadingServiceImpl.java | 10 +- .../DistrilbutionBillStockServiceImpl.java | 7 +- ...stributionBusinessPreOrderServiceImpl.java | 414 +++++++++----- .../DistributionStockArticleNewWrapper.java | 6 +- .../DistributionStockArticleWrapper.java | 6 +- .../wrapper/DistributionStockWrapper.java | 8 +- .../feign/TrunklineAdvanceDetailClient.java | 7 +- .../service/impl/InComingServiceImpl.java | 509 +++++++----------- .../impl/TrunklineAdvanceServiceImpl.java | 15 +- 40 files changed, 849 insertions(+), 579 deletions(-) create mode 100644 blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalPackageVO.java create mode 100644 blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalVO.java create mode 100644 blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageQueryVO.java create mode 100644 blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageVO.java create mode 100644 blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarOrderDetalVO.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index d54a35e6d..f4c0de04d 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-pref"; /** * 工厂对接服务名称 diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java index 0c6525ed8..62581c566 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java @@ -21,6 +21,14 @@ public class RedisKeyConstant { public static final String BASIC_DATA_WAREHOUSE_LIST_KEY ="cache:basic-data-warehouse-list:"; public static final String USER_NAME_PHONE_KEY ="cache:user:id:"; public static final String FINAL_CLIENT_CODE ="final:client:code:"; + /** + * 商家端预入库车次数量缓存 + */ + public static final String BUSINESS_IN_CARNUMBER ="business:in:carnumber:"; + /** + * 异常件数 + */ + public static final String BUSINESS_INEXCE_CARNUMBER ="business:in:carnumber:"; } diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/dto/BusinessSanDTO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/dto/BusinessSanDTO.java index 340af91b5..81e7fb05c 100644 --- a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/dto/BusinessSanDTO.java +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/dto/BusinessSanDTO.java @@ -1,11 +1,18 @@ package com.logpm.business.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.web.bind.annotation.RequestParam; @Data public class BusinessSanDTO { + @ApiModelProperty(value = "配送车次") + private String distrCarNumber; + @ApiModelProperty(value = "包间码") String orderPackageCode; + @ApiModelProperty(value = "预约单号") String reservationCode; + @ApiModelProperty(value = "异常入库 0 正常 1 异常") + private Integer inWarehouseException; } diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java index 2c134c40b..380750ac1 100644 --- a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/entity/DistributionBusinessPreOrderEntity.java @@ -257,6 +257,9 @@ public class DistributionBusinessPreOrderEntity extends TenantEntity { @ApiModelProperty(value = "操作状态 0 正常操作 1.补录操作") private Integer operationStatus; + @ApiModelProperty(value = "发车时间") + private String taskTime; + // /** // * 配送状态 // */ diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalPackageVO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalPackageVO.java new file mode 100644 index 000000000..ca8cf57a5 --- /dev/null +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalPackageVO.java @@ -0,0 +1,28 @@ +package com.logpm.business.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DistributionBusinessPreCarDetalPackageVO { + + @ApiModelProperty(value = "包条码") + private String orderPackageCode; + @ApiModelProperty(value = "一级品") + private String firsts; + @ApiModelProperty(value = "二级品") + private String second; + @ApiModelProperty(value = "三级品") + private String third_product; + @ApiModelProperty(value = "物料名称") + private String materialName; + @ApiModelProperty(value = "运单号") + private String waybillNumber; + @ApiModelProperty(value = "订单号") + private String orderCode; + @ApiModelProperty(value = "是否入库 0 没有入库 1 已入库") + private Integer inWarehouse; + @ApiModelProperty(value = "操作状态 0 正常操作 1.补录操作") + private Integer operationStatus; + +} diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalVO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalVO.java new file mode 100644 index 000000000..85db99154 --- /dev/null +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarDetalVO.java @@ -0,0 +1,42 @@ +package com.logpm.business.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class DistributionBusinessPreCarDetalVO { + + + @ApiModelProperty(value = "配送车次") + private String distrCarNumber; + + + @ApiModelProperty(value = "配送司机") + private String driverName; + + @ApiModelProperty(value = "配送车辆") + private String vehicleName; + + @ApiModelProperty(value = "配送日期") + private String taskTime; + + @ApiModelProperty(value = "订单总数") + private Integer orderCount; + + @ApiModelProperty(value = "计划件数") + private Integer orderPackageCodeCount; + + @ApiModelProperty(value = "装车件数") + private Integer loadCarCount; + + @ApiModelProperty(value = "入库件数") + private Integer inWarehouseCount; + + @ApiModelProperty(value = "车次订单列表") + private List distributionBusinessPreCarOrderDetalVOList; + + + +} diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageQueryVO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageQueryVO.java new file mode 100644 index 000000000..a746d5578 --- /dev/null +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageQueryVO.java @@ -0,0 +1,16 @@ +package com.logpm.business.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DistributionBusinessPreCarNumerPageQueryVO { + @ApiModelProperty(value = "开始时间") + private String taskTimeStart; + @ApiModelProperty(value = "结束时间") + private String taskTimeEnd; + @ApiModelProperty(value = "订单号") + private String orderCode; + @ApiModelProperty(value = "配送车次号") + private String distrCarNumber; +} diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageVO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageVO.java new file mode 100644 index 000000000..1f5a6077b --- /dev/null +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarNumerPageVO.java @@ -0,0 +1,34 @@ +package com.logpm.business.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DistributionBusinessPreCarNumerPageVO { + @ApiModelProperty(value = "配送车次") + private String distrCarNumber; + + + @ApiModelProperty(value = "配送司机") + private String driverName; + + @ApiModelProperty(value = "配送车辆") + private String vehicleName; + + @ApiModelProperty(value = "配送日期") + private String taskTime; + + @ApiModelProperty(value = "订单总数") + private Integer orderCount; + + @ApiModelProperty(value = "计划件数") + private Integer orderPackageCodeCount; + + @ApiModelProperty(value = "装车件数") + private Integer loadCarCount; + + @ApiModelProperty(value = "入库件数") + private Integer inWarehouseCount; + + +} diff --git a/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarOrderDetalVO.java b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarOrderDetalVO.java new file mode 100644 index 000000000..aed5ff5fe --- /dev/null +++ b/blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/vo/DistributionBusinessPreCarOrderDetalVO.java @@ -0,0 +1,35 @@ +package com.logpm.business.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class DistributionBusinessPreCarOrderDetalVO { + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNumber; + + @ApiModelProperty(value = "计划件数") + private Integer orderPackageCodeCount; + + @ApiModelProperty(value = "装车件数") + private Integer loadCarCount; + + @ApiModelProperty(value = "入库件数") + private Integer inWarehouseCount; + + @ApiModelProperty(value = "异常入库件数") + private Integer inWarehouseExceCount; + + @ApiModelProperty(value = "包件列表") + private List distributionBusinessPreCarDetalPackageList; +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java index 7c90d40cd..1fb266675 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java @@ -4,8 +4,10 @@ import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -21,4 +23,6 @@ public interface ITrunklineAdvanceDetailClient { @PostMapping(API_PREFIX+"/findListByAdvanceIds") List findListByAdvanceIds(@RequestBody List collect); + @GetMapping(API_PREFIX+"/findEntityByOrderPackageCode") + TrunklineAdvanceDetailEntity findEntityByOrderPackageCode(@RequestParam String orderPackageCode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBusinessPreOrderAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBusinessPreOrderAppController.java index 53e3d0d7f..5567ac562 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBusinessPreOrderAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBusinessPreOrderAppController.java @@ -1,20 +1,23 @@ package com.logpm.distribution.appcontroller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.business.dto.BusinessPreListDTO; import com.logpm.business.dto.BusinessSanDTO; -import com.logpm.business.vo.DistributionBusinessPreOrderListVO; -import com.logpm.business.vo.DistributionBusinessPreOrderVO; +import com.logpm.business.vo.*; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.service.IDistributionBusinessPreOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.apache.ibatis.annotations.Param; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutionException; @RestController @@ -25,7 +28,6 @@ public class DistributionBusinessPreOrderAppController { private final IDistributionBusinessPreOrderService distributionBusinessPreOrderService; - @ResponseBody @PostMapping("/list") @ApiOperationSupport(order = 1) @ApiOperation(value = "模糊查询", notes = "传入trayTypeDTO") @@ -37,15 +39,14 @@ public class DistributionBusinessPreOrderAppController { } - @ResponseBody @PostMapping("/scanOrderPackageCode") @ApiOperationSupport(order = 1) public R scanOrderPackageCode(@RequestBody BusinessSanDTO businessSanDTO){ Resp resp = null; try { - resp = distributionBusinessPreOrderService.inOrderWarehourse(businessSanDTO.getOrderPackageCode(),businessSanDTO.getReservationCode()); - } catch (ExecutionException | InterruptedException e) { + resp = distributionBusinessPreOrderService.inOrderWarehourse(businessSanDTO); + } catch (Exception e) { throw new RuntimeException(e); } @@ -54,4 +55,25 @@ public class DistributionBusinessPreOrderAppController { + @GetMapping("/listCarNum") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "条件查询", notes = "传入trayTypeDTO") + public R listCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO, Query query){ + + IPage data =distributionBusinessPreOrderService.listCarNum(Condition.getPage(query),distributionBusinessPreCarNumerPageQueryVO); + + return R.data(data); + } + + @GetMapping("/preCarInfoDetailByCarNum") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "条件查询", notes = "传入trayTypeDTO") + public R preCarInfoDetailByCarNum(DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO){ + + DistributionBusinessPreCarDetalVO distributionBusinessPreCarDetalVO =distributionBusinessPreOrderService.preCarInfoDetailByCarNumber(distributionBusinessPreCarNumerPageQueryVO); + + return R.data(distributionBusinessPreCarDetalVO); + } + + } 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 5d77ba11d..5f9ac90cd 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 @@ -245,7 +245,7 @@ public class DistributionSignforAppController { String orderPackageCodes = null; for (String packageCode : packageCodes) { if (StringUtils.isBlank(orderPackageCodes)) { - orderPackageCodes = packageCode + ""; + orderPackageCodes = packageCode; } else { orderPackageCodes = orderPackageCodes + "," + packageCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockListPDAController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockListPDAController.java index 527303f46..59446600a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockListPDAController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockListPDAController.java @@ -35,8 +35,7 @@ public class DistributionStockListPDAController { IDistributionStockListService distributionStockListService = SpringUtil.getBean(IDistributionStockListService.class); List stockListEntityList =distributionStockListService.getMerchantStockList(materielCode); return R.data(stockListEntityList); - }; - + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java index bd8e9ddba..67d63928d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java @@ -12,6 +12,7 @@ public class Resp extends R { Resp resp = new Resp(); resp.setCode(200); resp.setMsg(msg); + resp.setSuccess(true); resp.setAudio(audio); return resp; } @@ -20,6 +21,7 @@ public class Resp extends R { Resp resp = new Resp(); resp.setCode(200); resp.setMsg(msg); + resp.setSuccess(true); resp.setData(data); resp.setAudio(audio); return resp; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java index 805f2e75b..04b6c61c3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java @@ -36,7 +36,7 @@ import java.util.Map; @Component public class CustomMessageConverter extends AllowedListDeserializingMessageConverter implements BeanClassLoaderAware { - private volatile String defaultCharset = "UTF-8"; + private final String defaultCharset = "UTF-8"; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); private String codebaseUrl; @@ -119,7 +119,7 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve messageProperties.setContentType("application/x-java-serialized-object"); } - HttpHeaders headers = (HttpHeaders) ThreadLocalUtil.get("bladeContext"); + HttpHeaders headers = ThreadLocalUtil.get("bladeContext"); if (headers != null && !headers.isEmpty()) { headers.forEach((key, values) -> { values.forEach((value) -> { @@ -136,7 +136,7 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve messageProperties.setHeader("bladeUser", JSONUtil.toJsonStr(bladeUser)); if (bytes != null) { - messageProperties.setContentLength((long) bytes.length); + messageProperties.setContentLength(bytes.length); return new Message(bytes, messageProperties); } else { throw new IllegalArgumentException(this.getClass().getSimpleName() + " only supports String, byte[] and Serializable payloads, received: " + object.getClass().getName()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java index 92519bd18..a8c03fbca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java @@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.ExceptionHandler; public class GlobalExceptionHandler { - @ExceptionHandler(Exception.class) +// @ExceptionHandler(Exception.class) public ResponseEntity handleCustomException(Exception e) { // 从CustomException中获取errorCode和errorMessage String errorMessage = e.getMessage(); // 创建一个自定义的响应体来封装错误信息 - if(errorMessage.contains("Communications link failure")){ + if(errorMessage!=null&&errorMessage.contains("Communications link failure")){ // 返回带有错误信息的HTTP响应 return new ResponseEntity<>(R.fail(405,"请求超时，请重试"), HttpStatus.BAD_REQUEST); } 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 64321e73c..3bdc8d8ee 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 @@ -307,7 +307,7 @@ public class DistributionSignforController extends BladeController { String orderPackageCodes = null; for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ - orderPackageCodes = packageCode+""; + orderPackageCodes = packageCode; }else{ orderPackageCodes = orderPackageCodes + "," +packageCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java index 2ef06df05..b55b0538c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java @@ -104,11 +104,8 @@ public class OrderStatusDTO implements Serializable { if(StringUtil.isBlank(status)){ return false; } - if(StringUtil.isBlank(distributionContactId)){ - return false; - } - return true; - } + return !StringUtil.isBlank(distributionContactId); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListInfoExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListInfoExcel.java index a76aced5f..11553b8ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListInfoExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListInfoExcel.java @@ -137,8 +137,7 @@ public class DistributionStockListInfoExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("服务类型") private String serviceTypeName; -; - /** + /** * 品牌名称 */ @ColumnWidth(20) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.java index 56957c258..9279639f8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.java @@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.business.dto.BusinessPreListDTO; import com.logpm.business.entity.DistributionBusinessPreOrderEntity; import com.logpm.business.vo.DistributionBusinessPreCarNumberVO; +import com.logpm.business.vo.DistributionBusinessPreCarNumerPageQueryVO; +import com.logpm.business.vo.DistributionBusinessPreCarNumerPageVO; import com.logpm.business.vo.DistributionBusinessPreOrderVO; import com.logpm.distribution.dto.DistributionBusinessPreOrderDTO; import org.apache.ibatis.annotations.Param; @@ -60,4 +62,9 @@ public interface DistributionBusinessPreOrderMapper extends BaseMapper pageByCarNum(IPage page, Map distributionBusinessPreOrderDTO); + + IPage listCarNum(IPage page, DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO); + + DistributionBusinessPreCarNumerPageVO listCarInforByCarNum(@Param("distributionBusinessPreCarNumerPageQueryVO") DistributionBusinessPreCarNumerPageQueryVO distributionBusinessPreCarNumerPageQueryVO); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.xml index 0970ea61a..1f1456e92 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionBusinessPreOrderMapper.xml @@ -183,5 +183,52 @@ waybill_number, order_code + + 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 6f3ad4603..0c6d1b936 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 @@ -798,7 +798,7 @@ FROM logpm_distribution_stockup_info AS ldsi LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id WHERE - ldsi.reservation_id = lds.reservation_id and + ldsi.reservation_id = lds.reservation_id AND ldsi.stock_status != '4' ) AS forkliftName, CASE diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 218def9c9..e8a122bbd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2038,7 +2038,7 @@ LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id and ldrp.reservation_id = ldr.id LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id and ldpl.stock_article_id = ldsa.id WHERE - lddl.id=#{deliveryId} AND ldrp.packet_bar_status in ('1','3') AND ldrs.is_zero = 0 AND ldpl.order_package_code = #{orderPackageCode} AND ldr.reservation_status != 40 + lddl.id=#{deliveryId} AND ldrp.packet_bar_status in ('1','3') AND ldrs.is_zero = 0 AND ldpl.order_package_code = #{orderPackageCode} AND ldr.reservation_status != 4