From f8dc445d64a784adac3b2ad922f593c776cb02ad Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 22 Nov 2023 17:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../entity/AftersalesWorkOrderEntity.java | 10 +++++++++- .../entity/BasicdataWarehouseEntity.java | 5 +++-- .../AftersalesWorkOrderController.java | 12 +++++++++++ .../mapper/AftersalesWorkOrderMapper.xml | 4 ++-- .../impl/AftersalesExchangeServiceImpl.java | 10 ++++++++++ .../impl/AftersalesWorkOrderServiceImpl.java | 20 +++++++++++++++++++ 7 files changed, 57 insertions(+), 6 deletions(-) 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 39aaf8d73..983c2ab4c 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 @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-pref"; + public static final String DEVAUTH ="-cyz"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java index f246e4377..cbcfec9c5 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java @@ -17,6 +17,7 @@ package com.logpm.aftersales.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -115,16 +116,19 @@ public class AftersalesWorkOrderEntity extends TenantEntity { * 送货时间 */ @ApiModelProperty(value = "送货时间") + @JsonFormat(locale = "zh" ,timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date deliverGoodsTime; /** * 发现时间 （库内作业环节,配送装车环节） */ @ApiModelProperty(value = "发现时间 （库内作业环节,配送装车环节）") + @JsonFormat(locale="zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date discoveryTime; /** * 入库时间（库内作业环节） */ @ApiModelProperty(value = "入库时间（库内作业环节）") + @JsonFormat(locale="zh",timezone ="GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date warehousingTime; /** * 运单商场 @@ -140,6 +144,7 @@ public class AftersalesWorkOrderEntity extends TenantEntity { * 配送时间(配送装车环节) */ @ApiModelProperty(value = "配送时间(配送装车环节)") + @JsonFormat(locale = "zh" ,timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss" ) private Date deliveryTime; /** * 配送司机(配送装车环节) @@ -170,6 +175,7 @@ public class AftersalesWorkOrderEntity extends TenantEntity { * 完结时间 */ @ApiModelProperty(value = "完结时间") + @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date overTime; /** * 异常问题描述 @@ -180,7 +186,7 @@ public class AftersalesWorkOrderEntity extends TenantEntity { * 仓库ID */ @ApiModelProperty(value = "仓库ID") - private String warehouseId; + private Long warehouseId; /** * 责任人 （库内作业环节） */ @@ -200,11 +206,13 @@ public class AftersalesWorkOrderEntity extends TenantEntity { * 审核时间 */ @ApiModelProperty(value = "审核时间") + @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date auditTime; /** * 财务入账时间 */ @ApiModelProperty(value = "财务入账时间") + @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date entryTime; /** * 操作人 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java index a8e7e39ce..f43231e16 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -38,8 +39,8 @@ import java.util.Date; @ApiModel(value = "WarehouseWarehouse对象", description = "仓库") @EqualsAndHashCode(callSuper = true) public class BasicdataWarehouseEntity extends TenantEntity { - - public Object var; + @TableField(exist = false) + public Object var; /** * 预留1 */ 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 1b5b47141..4e2ba919e 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 @@ -16,7 +16,10 @@ */ package com.logpm.aftersales.controller; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -61,6 +64,7 @@ import javax.servlet.http.HttpServletResponse; public class AftersalesWorkOrderController extends BladeController { private final IAftersalesWorkOrderService aftersalesWorkOrderService; + private final IBasicdataWarehouseClient warehouseClient; /** * 客服异常工单 详情 @@ -79,6 +83,10 @@ public class AftersalesWorkOrderController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder") public R> list(@ApiIgnore @RequestParam Map aftersalesWorkOrder, Query query) { + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNotNull(myCurrentWarehouse)){ + aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId()); + } IPage pages = aftersalesWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesWorkOrder, AftersalesWorkOrderEntity.class)); return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages)); } @@ -135,6 +143,10 @@ public class AftersalesWorkOrderController extends BladeController { @ApiOperation(value = "仓库查询待处理的异常工单", notes = "传入aftersalesWorkOrder") public R getPendingWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrder,Query query) { log.info("工单创建的数据{}",aftersalesWorkOrder.toString()); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNotNull(myCurrentWarehouse)){ + aftersalesWorkOrder.setWarehouseId(myCurrentWarehouse.getId()); + } IPage list= aftersalesWorkOrderService.getPendingWorkOrder(aftersalesWorkOrder,Condition.getPage(query)); return R.data(list); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index dacba828b..da7954a1a 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -66,11 +66,11 @@ ,law.work_order_status, law.customer_service_id, law.customer_service_name,law.waybill_mall_id,law.over_time, law.problem_description,law.warehouse_id, law.person_responsible, law.process_number, law.reviewed_by, law.audit_time, law.entry_time, law.operator from logpm_aftersales_processor lap - LEFT JOIN logpm_aftersales_work_order law on lap.business_id = law.id + LEFT JOIN logpm_aftersales_work_order law on lap.work_order_id = law.id lap.conditions != '3' and lap.is_deleted = 0 and law.work_order_status = #{param.work_order_status} - and law.warehouse_id = #{param.warehouseId} + and lap.business_id = #{param.warehouseId} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java index 405b446a6..ab56bb42d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesExchangeServiceImpl.java @@ -51,4 +51,14 @@ public class AftersalesExchangeServiceImpl extends BaseServiceImpl