From f057ed1ee2e92605d9876fce1a6b823d57685d7f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 31 Jan 2024 10:31:35 +0800 Subject: [PATCH] =?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 --- .../common/constant/RabbitConstant.java | 5 + .../feign/IBasicdataClientClient.java | 2 +- .../com/logpm/trunkline/dto/AdvanceDTO.java | 9 ++ .../dto/ImportCustomizedOuPaiDTO.java | 2 +- .../trunkline/dto/ImportStandardOuPaiDTO.java | 2 +- .../com/logpm/trunkline/dto/OpenLabelDTO.java | 5 +- .../com/logpm/trunkline/dto/OpenOrderDTO.java | 3 + .../trunkline/dto/OrderNoPackageExcelDTO.java | 54 +++++++ .../com/logpm/trunkline/vo/OpenOrderVO.java | 1 + .../entity/WarehouseWaybillEntity.java | 5 + .../feign/BasicdataClientClient.java | 4 +- .../mapper/BasicdataClientMapper.java | 2 +- .../mapper/BasicdataClientMapper.xml | 21 ++- .../service/IBasicdataClientService.java | 2 +- .../impl/BasicdataClientServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 2 +- blade-service/logpm-trunkline/pom.xml | 5 + .../config/RabbitMqConfiguration.java | 62 ++++++++ .../controller/OpenOrderController.java | 57 +++++++- .../mapper/TrunklineAdvanceMapper.xml | 30 ++++ .../trunkline/service/IOpenOrderService.java | 7 +- .../service/impl/OpenOrderServiceImpl.java | 132 +++++++++++++++++- .../impl/TrunklineBillladingServiceImpl.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 18 +++ .../src/main/resources/application-dev.yml | 27 ++++ .../mapper/WarehouseWaybillMapper.xml | 1 + 26 files changed, 437 insertions(+), 27 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OrderNoPackageExcelDTO.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 15260de74..0bf655650 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -139,4 +139,9 @@ public interface RabbitConstant { String TEST_RECEIVE_INFO_ROUTING = "test_receive_info_routing" + ModuleNameConstant.DEVAUTH; + /****************干线卸车确认队列******************/ + String TRUNKLINE_UNLOAD_CONFIRM_QUEUE = "trunkline_unload_confirm_queue" + ModuleNameConstant.DEVAUTH; + String TRUNKLINE_UNLOAD_CONFIRM_EXCHANGE = "trunkline_unload_confirm_exchange" + ModuleNameConstant.DEVAUTH; + String TRUNKLINE_UNLOAD_CONFIRM_ROUTING = "trunkline_unload_confirm_routing" + ModuleNameConstant.DEVAUTH; + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java index 5789c6a83..7320af293 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java @@ -79,7 +79,7 @@ public interface IBasicdataClientClient { Long addReturnId(@RequestBody BasicdataClientEntity basicdataClientEntity); @GetMapping(API_PREFIX+"/findListByClientName") - List findListByClientName(@RequestParam String clientName); + List findListByClientName(@RequestParam String clientName,@RequestParam String linkMan,@RequestParam String linkPhone); /** * 根据Id查询客户 diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java index 0cca8642b..da4f55d58 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java @@ -24,4 +24,13 @@ public class AdvanceDTO implements Serializable { private String freezeStatus; + //列表查询参数 + private String orderCode; + private String dealerName; + private String storeName; + private String siteName; + private String trainNumber; + private String serviceNum; + private String brand; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportCustomizedOuPaiDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportCustomizedOuPaiDTO.java index 8333cae1a..a6472990a 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportCustomizedOuPaiDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportCustomizedOuPaiDTO.java @@ -62,7 +62,7 @@ public class ImportCustomizedOuPaiDTO implements Serializable { private String carNumber; @ExcelProperty(value = "货主") private String goodsMan; - @ExcelProperty(value = "客户名称") + @ExcelProperty(value = "客户姓名") private String customerName; @ExcelProperty(value = "客户电话") private String customerPhone; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportStandardOuPaiDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportStandardOuPaiDTO.java index 4df9f7402..956f8db8c 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportStandardOuPaiDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ImportStandardOuPaiDTO.java @@ -70,7 +70,7 @@ public class ImportStandardOuPaiDTO implements Serializable { @ExcelProperty(value = "订单号") private String order; - @ExcelProperty(value = "客户名称") + @ExcelProperty(value = "客户姓名") private String customerName; @ExcelProperty(value = "客户电话") private String customerPhone; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java index 60f62b398..7fb78a042 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java @@ -1,7 +1,6 @@ package com.logpm.trunkline.dto; import lombok.Data; -import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.math.BigDecimal; @@ -46,7 +45,9 @@ public class OpenLabelDTO implements Serializable { private String customerPhone; private String customerAddress; + private String consigneePerson; + private String consigneeMobile; + private String consigneeAddress; - private MultipartFile file; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index f1e4c1c00..d3c9df8a1 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -52,6 +52,7 @@ public class OpenOrderDTO implements Serializable { private BigDecimal warehouseManagementFee = BigDecimal.ZERO;//仓库管理费 private BigDecimal storageFee = BigDecimal.ZERO;//仓储费 private BigDecimal handlingFee = BigDecimal.ZERO;//装卸费 + private BigDecimal installFee = BigDecimal.ZERO;//安装费 private BigDecimal otherFee = BigDecimal.ZERO;//其他费 private BigDecimal insuranceFee = BigDecimal.ZERO;//保价费 private BigDecimal claimingValue;//申明价值 @@ -80,6 +81,8 @@ public class OpenOrderDTO implements Serializable { private Integer receiptNum;//回单份数 private String clientName;//客户名称 + private String linkMan;//联系人 + private String linkPhone;//联系人 private Long clientId;//客户id private String warehouseName; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OrderNoPackageExcelDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OrderNoPackageExcelDTO.java new file mode 100644 index 000000000..ddce424f5 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OrderNoPackageExcelDTO.java @@ -0,0 +1,54 @@ +package com.logpm.trunkline.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class OrderNoPackageExcelDTO implements Serializable { + + @ExcelProperty(value = "下单日期") + private String orderTime; + @ExcelProperty(value = "商场名称") + private String dealerName; + @ExcelProperty(value = "订单自编号") + private String orderCode; + @ExcelProperty(value = "物料名称") + private String materialName; + @ExcelProperty(value = "物料编码") + private String materialCode; + @ExcelProperty(value = "单位") + private String materialUnit; + @ExcelProperty(value = "销售数量") + private String num; + @ExcelProperty(value = "商场收货人") + private String consigneePerson; + @ExcelProperty(value = "商场收货人电话") + private String consigneeMobile; + @ExcelProperty(value = "商场收货地址") + private String consigneeAddress; + @ExcelProperty(value = "收货人") + private String customerName ; + @ExcelProperty(value = "联系电话") + private String customerPhone ; + @ExcelProperty(value = "地址") + private String customerAddress ; + @ExcelProperty(value = "车次") + private String trainNumber ; + @ExcelProperty(value = "发货日期") + private String sendDateStr ; + @ExcelProperty(value = "品牌") + private String brand ; + @ExcelProperty(value = "一级品类") + private String firsts ; + @ExcelProperty(value = "二级品类") + private String sencods ; + @ExcelProperty(value = "三级品类") + private String thirds ; + @ExcelProperty(value = "配送区域") + private String area ; + @ExcelProperty(value = "服务号") + private String serviceNum ; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java index f1bdcf217..391611967 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java @@ -44,5 +44,6 @@ public class OpenOrderVO implements Serializable { private String openOrderDate;//开单时间 private String openOrderUserName;//开单人 + private Integer totalNum; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 55cc68f87..f66832355 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -325,6 +325,11 @@ public class WarehouseWaybillEntity extends TenantEntity { */ @ApiModelProperty(value = "装卸费") private BigDecimal handlingFee;//装卸费 + /** + * 安装费 + */ + @ApiModelProperty(value = "安装费") + private BigDecimal installFee;//安装费 /** * 其他费 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java index 85f58c524..c1ff28cbb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java @@ -110,8 +110,8 @@ public class BasicdataClientClient implements IBasicdataClientClient { } @Override - public List findListByClientName(String clientName) { - return basicdataClientService.findListByClientName(clientName); + public List findListByClientName(String clientName,String linkMan,String linkPhone) { + return basicdataClientService.findListByClientName(clientName,linkMan,linkPhone); } @Override diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java index 889e275c3..451f457e9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java @@ -55,5 +55,5 @@ public interface BasicdataClientMapper extends BaseMapper List selectListDict(@Param("id") Long id); - List findListByClientName(@Param("clientName") String clientName); + List findListByClientName(@Param("clientName") String clientName,@Param("linkMan") String linkMan,@Param("linkPhone") String linkPhone); } 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 a6f3d80fb..2ab3b890e 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 @@ -55,16 +55,23 @@ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java index a2fcf7b91..c5048f262 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java @@ -94,5 +94,5 @@ public interface IBasicdataClientService extends BaseService data, Boolean isCovered); - List findListByClientName(String clientName); + List findListByClientName(String clientName,String linkMan,String linkPhone); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 9544a9b09..cd663a986 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -525,9 +525,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl findListByClientName(String clientName) { + public List findListByClientName(String clientName,String linkMan,String linkPhone) { - List ls = baseMapper.findListByClientName(clientName); + List ls = baseMapper.findListByClientName(clientName,linkMan,linkPhone); List list = new ArrayList<>(); for (ClientInfoVO clientInfoVO : ls) { list.add(JSONObject.parseObject(JSONObject.toJSONString(clientInfoVO))); diff --git a/blade-service/logpm-factory/src/main/resources/application-dev.yml b/blade-service/logpm-factory/src/main/resources/application-dev.yml index 3154bec1c..457330ce2 100644 --- a/blade-service/logpm-factory/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory/src/main/resources/application-dev.yml @@ -12,7 +12,7 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.10.46 + host: 192.168.2.46 port: 5672 username: admin password: admin diff --git a/blade-service/logpm-trunkline/pom.xml b/blade-service/logpm-trunkline/pom.xml index e814f2c59..8f65f27b2 100644 --- a/blade-service/logpm-trunkline/pom.xml +++ b/blade-service/logpm-trunkline/pom.xml @@ -65,6 +65,11 @@ 3.2.0.RELEASE compile + + + org.springframework.boot + spring-boot-starter-amqp + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java new file mode 100644 index 000000000..a8a297501 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java @@ -0,0 +1,62 @@ +package com.logpm.trunkline.config; + +import com.alibaba.nacos.shaded.com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.RabbitConstant; +import org.springframework.amqp.core.*; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Map; + +@Slf4j +@Configuration +public class RabbitMqConfiguration { + + @Bean + public RabbitTemplate createRabbitTemplate(ConnectionFactory connectionFactory){ + RabbitTemplate template = new RabbitTemplate(); + template.setConnectionFactory(connectionFactory); + template.setMandatory(true); + template.setConfirmCallback(new RabbitTemplate.ConfirmCallback() { + @Override + public void confirm(CorrelationData correlationData, boolean b, String s) { + System.out.println("确认回调-相关数据："+correlationData); + System.out.println("确认回调-确认情况："+b); + System.out.println("确认回调-原因："+s); + } + }); + + template.setReturnsCallback(new RabbitTemplate.ReturnsCallback() { + @Override + public void returnedMessage(ReturnedMessage returnedMessage) { + System.out.println("返回回调-消息："+returnedMessage.getMessage()); + System.out.println("返回回调-回应码："+returnedMessage.getReplyCode()); + System.out.println("返回回调-回应信息："+returnedMessage.getReplyText()); + System.out.println("返回回调-交换机："+returnedMessage.getExchange()); + System.out.println("返回回调-路由键："+returnedMessage.getRoutingKey()); + } + }); + return template; + } + + @Bean + public Queue unloadConfirmQueue() { + return new Queue(RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_QUEUE, true); + } + @Bean + public CustomExchange unloadConfirmExchange() { + Map args = Maps.newHashMap(); + args.put("x-delayed-type", "direct"); + return new CustomExchange(RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_EXCHANGE, "x-delayed-message", true, false, args); + } + @Bean + public Binding unloadConfirmBinding(Queue unloadConfirmQueue, CustomExchange unloadConfirmExchange) { + return BindingBuilder.bind(unloadConfirmQueue).to(unloadConfirmExchange).with(RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_ROUTING).noargs(); + } + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java index 6bd0ce3e5..29994cc67 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java @@ -387,6 +387,33 @@ public class OpenOrderController { } } + @ResponseBody + @PostMapping("/findPayWayByClientId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "根据收货单位查询付款方式", notes = "传入openOrderDTO") + public R findPayWayByClientId(@RequestBody OpenOrderDTO openOrderDTO) { + String method = "############findPayWayByClientId: "; + log.info(method+" 请求参数：{}",openOrderDTO); + try{ + Long clientId = openOrderDTO.getClientId(); + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(403,"仓库信息为空"); + } + + return openOrderService.findPayWayByClientId(clientId); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + @ResponseBody @PostMapping("/openZeroWaybill") @@ -426,6 +453,8 @@ public class OpenOrderController { String method = "############findClientInfo: "; log.info(method + "请求参数{}", openOrderDTO); String clientName = openOrderDTO.getClientName(); + String linkMan = openOrderDTO.getLinkMan(); + String linkPhone = openOrderDTO.getLinkPhone(); try{ @@ -434,7 +463,7 @@ public class OpenOrderController { // return R.fail(400,"客户名称为空"); // } - return openOrderService.findClientInfo(clientName); + return openOrderService.findClientInfo(clientName,linkMan,linkPhone); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); @@ -834,6 +863,32 @@ public class OpenOrderController { } + @ResponseBody + @PostMapping("/batchOpenLabel") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "批量开标签", notes = "传入openOrderDTO") + public R batchOpenLabel(@RequestParam(value = "file") MultipartFile file) { + String method = "############batchOpenLabel: "; + log.info(method + "请求参数{}", file); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(403,"仓库信息为空"); + } + + return openOrderService.batchOpenLabel(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),file); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + @ResponseBody @PostMapping("/openLabelHasPacakage") diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index 8d22a9833..eb06fcdf1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -20,6 +20,36 @@ and lta.warehouse_id = #{param.warehouseId} + + and lta.order_code like concat('%',${param.orderCode},'%') + + + and lta.dealer_name like concat('%',${param.dealerName},'%') + + + and lta.store_name like concat('%',${param.storeName},'%') + + + and lta.site_name like concat('%',${param.siteName},'%') + + + and lta.train_number like concat('%',${param.trainNumber},'%') + + + and lta.service_num like concat('%',${param.serviceNum},'%') + + + and lta.brand like concat('%',${param.brand},'%') + + + and lta.customer_name like concat('%',${param.customerName},'%') + + + and lta.customer_phone like concat('%',${param.customerPhone},'%') + + + and lta.customer_address like concat('%',${param.customerAddress},'%') +