diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java index 8649f9196..04344ce1c 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java @@ -132,6 +132,11 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity { */ @ApiModelProperty(value = "入库批次号(库存品)") private String incomingBatch; + /** + * 品牌名称 + */ + @ApiModelProperty(value = "品牌名称") + private String brandName; /** * 关联工单ID */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 391b58fd3..57a26d644 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -153,7 +153,7 @@ public class AftersalesWorkOrderController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "查询处理超时的数据", notes = "传入aftersalesWorkOrder") @XxlJob("syncWarehouseToNew") - @Scheduled(cron = "0 0/1 * * * ?") +// @Scheduled(cron = "0 0/1 * * * ?") public void getIsItTimeout() { log.info("查询处理超时的数据>>>>>>>>"); aftersalesWorkOrderService.getIsItTimeout(); @@ -166,7 +166,7 @@ public class AftersalesWorkOrderController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder") @XxlJob("modifyClaimStatus") - @Scheduled(cron = "0 0/1 * * * ?") +// @Scheduled(cron = "0 0/1 * * * ?") public void updateModifyClaimStatus() { log.info("修改理赔工单是否可以申述>>>>>>>>"); aftersalesWorkOrderService.updateModifyClaimStatus(); diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml index ef111bd54..0d937aeae 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml @@ -37,10 +37,11 @@