From 006ff22ffb6d009dd1e3e0488008056d26aad543 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 29 Apr 2024 14:04:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesAbnormalRecordEntity.java | 4 +- .../com/logpm/trunkline/dto/OpenOrderDTO.java | 36 +++++++++- .../entity/TrunklineWaybillJsonEntity.java | 38 +++++++++++ .../entity/TrunklineWaybillTrackEntity.java | 8 +++ .../logpm/trunkline/vo/OrderDetailInfoVO.java | 1 + .../trunkline/vo/TrunklineWaybillTrackVO.java | 14 ++++ .../aftersales/dto/AbnormalRecordDTO.java | 1 - .../mapper/AftersalesAbnormalRecordMapper.xml | 6 +- .../controller/OpenOrderController.java | 20 ++++-- .../mapper/TrunklineAdvanceDetailMapper.xml | 1 + .../mapper/TrunklineWaybillJsonMapper.java | 12 ++++ .../mapper/TrunklineWaybillTrackMapper.java | 6 ++ .../mapper/TrunklineWaybillTrackMapper.xml | 65 +++++++++++++++++++ .../service/IOpenOrderAsyncService.java | 3 + .../trunkline/service/IOpenOrderService.java | 3 + .../service/ITrunklineWaybillJsonService.java | 7 ++ .../ITrunklineWaybillTrackService.java | 5 ++ .../impl/OpenOrderAsyncServiceImpl.java | 27 ++++++++ .../service/impl/OpenOrderServiceImpl.java | 25 ++++++- .../impl/TrunklineWaybillJsonServiceImpl.java | 15 +++++ .../TrunklineWaybillTrackServiceImpl.java | 8 +++ 21 files changed, 290 insertions(+), 15 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillJsonEntity.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillJsonMapper.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillJsonService.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillJsonServiceImpl.java diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java index 3a22ecef2..111825a43 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java @@ -42,10 +42,10 @@ public class AftersalesAbnormalRecordEntity extends TenantEntity { private String carType; @ApiModelProperty(name = "上报仓库id",notes = "") - private Long upWarehouseId; + private Long warehouseId; @ApiModelProperty(name = "上报仓库名称",notes = "") - private String upWarehouseName; + private String warehouseName; @ApiModelProperty(name = "车次号",notes = "") private String carsNo; 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 392b63911..5ad7ed68d 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 @@ -1,16 +1,19 @@ package com.logpm.trunkline.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Data public class OpenOrderDTO implements Serializable { + private Integer pageSize; + private Integer pageNum; + private Long waybillId; private Long brandId;//品牌id @@ -115,4 +118,35 @@ public class OpenOrderDTO implements Serializable { private String pickupVehicleType;//提货车型 + private Integer checkStatus; + + private String agent; + + private String createUserName; + + private String refer; + + private String openWarehouseName; + private String applyWarehouseName; + + private String openTimeStartStr; + private String openTimeEndStr; + + private Date openTimeStart; + private Date openTimeEnd; + + private String applyTimeStartStr; + private String applyTimeEndStr; + + private Date applyTimeStart; + private Date applyTimeEnd; + + private String checkTimeStartStr; + private String checkTimeEndStr; + + private Date checkTimeStart; + private Date checkTimeEnd; + + private List warehouseIds; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillJsonEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillJsonEntity.java new file mode 100644 index 000000000..e5291a240 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillJsonEntity.java @@ -0,0 +1,38 @@ +package com.logpm.trunkline.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_trunkline_waybill_json") +@ApiModel(value = "TrunklineWaybillJson对象", description = "更新运单记录表") +@EqualsAndHashCode(callSuper = true) +public class TrunklineWaybillJsonEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + + @ApiModelProperty(name = "日志id",notes = "") + private Long trackId; + + @ApiModelProperty(name = "运单更新json",notes = "") + private String waybillJson; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java index d60890b55..a176e89a2 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.util.Date; + @Data @TableName("logpm_trunkline_waybill_track") @ApiModel(value = "TrunklineWaybillTrack对象", description = "运单跟踪记录表") @@ -52,5 +54,11 @@ public class TrunklineWaybillTrackEntity extends TenantEntity { /** 操作人名称 */ @ApiModelProperty(name = "操作人名称",notes = "") private String createUserName ; + /** 审核状态 */ + @ApiModelProperty(name = "审核状态0未审核 1已通过",notes = "") + private Integer checkStatus; + /** 审核时间 */ + @ApiModelProperty(name = "审核时间",notes = "") + private Date checkTime; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java index d53fc95be..8f39ae94a 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java @@ -20,6 +20,7 @@ public class OrderDetailInfoVO implements Serializable { private String thirdPackName; private String materialCode; private String materialName; + private String orderCode; private String orderPackageCode; private String brand; private String serviceNumber; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java index e706d3e65..731472385 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java @@ -3,7 +3,21 @@ package com.logpm.trunkline.vo; import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; import lombok.Data; +import java.util.Date; + @Data public class TrunklineWaybillTrackVO extends TrunklineWaybillTrackEntity { + private String openWarehouseName; + + private String waybillType; + + private String agent; + + private Date openTime; + + private Date applyTime; + + private String applyWarehouseName; + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AbnormalRecordDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AbnormalRecordDTO.java index 3894ffbbd..d082382ce 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AbnormalRecordDTO.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AbnormalRecordDTO.java @@ -7,7 +7,6 @@ import lombok.Data; public class AbnormalRecordDTO extends AftersalesAbnormalRecordEntity { private Long abnormalRecordId; - private Long warehouseId; private Integer pageNum; private Integer pageSize; diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml index 0d1c8059e..0d1c74e9f 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml @@ -15,8 +15,8 @@ and car_type = #{param.carType} - - and Locate(#{param.upWarehouseName},up_warehouse_name) > 0 + + and Locate(#{param.warehouseName},warehouse_name) > 0 and Locate(#{param.carsNo},cars_no) > 0 @@ -47,7 +47,7 @@ IFNULL(sum(IF(abnormal_status = 1,1,0)),0) noDealwithNum from logpm_aftersales_abnormal_record where cars_no = #{carsNo} - and up_warehouse_id = #{warehouseId} + and warehouse_id = #{warehouseId} 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 54067c532..31adb51ef 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 @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -1589,13 +1590,20 @@ public class OpenOrderController { log.info(method + "请求参数{}", openOrderDTO); Long waybillId = openOrderDTO.getWaybillId(); try{ - - if(Objects.isNull(waybillId)){ - log.warn(method+"运单id为空 waybillId={}",waybillId); - return R.fail(405,"运单id为空"); + List warehouseIds = new ArrayList<>(); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + //循环myWatchWarehouse，把id存入warehouseIds中 + myWatchWarehouse.forEach(basicdataWarehouseEntity -> { + warehouseIds.add(basicdataWarehouseEntity.getId()); + }); + }else{ + warehouseIds.add(myCurrentWarehouse.getId()); } + openOrderDTO.setWarehouseIds(warehouseIds); - return openOrderService.findWaybillReturnList(waybillId); + return openOrderService.findUpdateWaybillList(openOrderDTO); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); @@ -1605,6 +1613,4 @@ public class OpenOrderController { } } - - } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index e92406a24..336624d44 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -227,6 +227,7 @@ ltad.third_pack_name thirdPackName, ltad.material_code materialCode, ltad.material_name materialName, + ltad.order_code orderCode, ltad.order_package_code orderPackageCode, ltad.brand brand, lta.service_num serviceNumber, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillJsonMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillJsonMapper.java new file mode 100644 index 000000000..730aec84d --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillJsonMapper.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TrunklineWaybillJsonMapper extends BaseMapper { + + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java index 96be3f508..d0039a219 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java @@ -1,7 +1,10 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.OpenOrderDTO; import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import com.logpm.trunkline.vo.TrunklineWaybillTrackVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,4 +14,7 @@ import java.util.List; public interface TrunklineWaybillTrackMapper extends BaseMapper { List findWaybillLog(@Param("waybillId") Long waybillId, @Param("trackType") String trackType); + + IPage findUpdateWaybillList(IPage page, @Param("param") OpenOrderDTO openOrderDTO); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml index 3c2da86ad..15d3b59a0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml @@ -19,5 +19,70 @@ + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java index 7a86c3162..aee687625 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java @@ -1,6 +1,7 @@ package com.logpm.trunkline.service; import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; +import com.logpm.warehouse.entity.WarehouseWaybillEntity; import java.util.List; @@ -18,4 +19,6 @@ public interface IOpenOrderAsyncService { void saveUnloadStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId); void incomingPackageBatch(List advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId); + + void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java index c807177cd..2fef79294 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java @@ -80,6 +80,9 @@ public interface IOpenOrderService { R findWaybillReturnList(Long waybillId); + R findUpdateWaybillList(OpenOrderDTO openOrderDTO); + + // R findWaybillInfo(String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillJsonService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillJsonService.java new file mode 100644 index 000000000..271e00883 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillJsonService.java @@ -0,0 +1,7 @@ +package com.logpm.trunkline.service; + +import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITrunklineWaybillJsonService extends BaseService { +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java index 49f238f09..4dfebd82d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java @@ -1,10 +1,15 @@ package com.logpm.trunkline.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.OpenOrderDTO; import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; +import com.logpm.trunkline.vo.TrunklineWaybillTrackVO; import org.springblade.core.mp.base.BaseService; import java.util.List; public interface ITrunklineWaybillTrackService extends BaseService { List findWaybillLog(Long waybillId, String trackType); + + IPage findUpdateWaybillList(IPage page, OpenOrderDTO openOrderDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java index 1edbec97d..60dc45888 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java @@ -11,6 +11,8 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.TenantNum; import org.springblade.common.utils.CommonUtil; +import org.springblade.system.cache.UserCache; +import org.springblade.system.entity.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; @@ -53,6 +55,8 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService { waybillTrackEntity.setTenantId(TenantNum.HUITONGCODE); waybillTrackEntity.setCreateUser(userId); waybillTrackEntity.setUpdateUser(userId); + waybillTrackEntity.setCheckStatus(1); + waybillTrackEntity.setCheckTime(new Date()); trunklineWaybillTrackService.save(waybillTrackEntity); } @@ -236,4 +240,27 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService { inComingDTO.setIncomingType(incomingType); inComingService.incomingBatchOrder(inComingDTO); } + + @Override + public void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity) { + User user = UserCache.getUser(userId); + TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity(); + waybillTrackEntity.setWarehouseId(warehouseId); + waybillTrackEntity.setWarehouseName(warehouseName); + waybillTrackEntity.setWaybillId(waybillId); + waybillTrackEntity.setWaybillNo(waybillNo); + waybillTrackEntity.setTrackType(trackType); + waybillTrackEntity.setRefer(refer); + waybillTrackEntity.setOperationRemark(operationRemark); + waybillTrackEntity.setCreateUserName(nickName); + waybillTrackEntity.setTenantId(user.getTenantId()); + waybillTrackEntity.setCreateUser(userId); + waybillTrackEntity.setUpdateUser(userId); + waybillTrackEntity.setCheckStatus(1); + waybillTrackEntity.setCheckTime(new Date()); + trunklineWaybillTrackService.save(waybillTrackEntity); + + //存入运单json + + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 1d691e472..2599b448c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -1476,7 +1476,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg; //异步存入日志 - openOrderAsyncService.saveLog(waybillId, waybillNo, "888", "修改运单", editReson + " " + remark, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName); + openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, remark+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity); return R.success("改单成功"); } @@ -2149,6 +2149,29 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.data(list); } + @Override + public R findUpdateWaybillList(OpenOrderDTO openOrderDTO) { + Integer pageNum = openOrderDTO.getPageNum(); + Integer pageSize = openOrderDTO.getPageSize(); + + IPage page = new Page<>(); + page.setCurrent(pageNum); + page.setSize(pageSize); + + openOrderDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getOpenTimeStartStr())); + openOrderDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getOpenTimeEndStr())); + + openOrderDTO.setApplyTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getApplyTimeStartStr())); + openOrderDTO.setApplyTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getApplyTimeEndStr())); + + openOrderDTO.setCheckTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getCheckTimeStartStr())); + openOrderDTO.setCheckTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getCheckTimeEndStr())); + + IPage pageList = trunklineWaybillTrackService.findUpdateWaybillList(page,openOrderDTO); + + return R.data(pageList); + } + private List verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) { log.info("###################verifyData: 验证改单数据"); StringBuilder stringBuilder = new StringBuilder(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillJsonServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillJsonServiceImpl.java new file mode 100644 index 000000000..0090717b2 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillJsonServiceImpl.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.service.impl; + +import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity; +import com.logpm.trunkline.mapper.TrunklineWaybillJsonMapper; +import com.logpm.trunkline.service.ITrunklineWaybillJsonService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class TrunklineWaybillJsonServiceImpl extends BaseServiceImpl implements ITrunklineWaybillJsonService { +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java index c431eaf9b..e8dedd832 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java @@ -1,8 +1,11 @@ package com.logpm.trunkline.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.OpenOrderDTO; import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity; import com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper; import com.logpm.trunkline.service.ITrunklineWaybillTrackService; +import com.logpm.trunkline.vo.TrunklineWaybillTrackVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; @@ -18,4 +21,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl findWaybillLog(Long waybillId, String trackType) { return baseMapper.findWaybillLog(waybillId,trackType); } + + @Override + public IPage findUpdateWaybillList(IPage page, OpenOrderDTO openOrderDTO) { + return baseMapper.findUpdateWaybillList(page,openOrderDTO); + } }