From 4e98d67c26f75d159b9ebf821b94fdd6026c1ea5 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 11 Apr 2024 18:08:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E5=8F=8A=E5=85=A5=E5=BA=93=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=93=81=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataFactoryCategoryEntity.java | 1 + .../BasicdataOpenIncomingSettingEntity.java | 1 + .../com/logpm/trunkline/dto/LoadCarsDTO.java | 6 ++ .../entity/TrunklineLoadSignOrderEntity.java | 13 +++ .../entity/TrunklineLoadSignPhotoEntity.java | 44 +++++++++ .../vo/TrunklineLoadSignOrderVO.java | 5 + .../BasicdataOpenIncomingController.java | 16 ++-- .../dto/BasicdataOpenIncomingDTO.java | 1 + .../trunkline/api/CarsLoadApiController.java | 33 +++++++ .../mapper/TrunklineCarsOrderMapper.xml | 4 +- .../mapper/TrunklineLoadSignOrderMapper.xml | 9 +- .../mapper/TrunklineLoadSignPhotoMapper.java | 11 +++ .../service/ITrunklineCarsLoadService.java | 3 + .../ITrunklineLoadSignPhotoService.java | 10 ++ .../impl/TrunklineCarsLoadServiceImpl.java | 92 +++++++++++++++---- .../TrunklineLoadSignPhotoServiceImpl.java | 26 ++++++ 16 files changed, 241 insertions(+), 34 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignPhotoEntity.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignPhotoMapper.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineLoadSignPhotoService.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineLoadSignPhotoServiceImpl.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java index e50aad741..3b270b04e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java @@ -45,6 +45,7 @@ public class BasicdataFactoryCategoryEntity extends TenantEntity { private String seconds; private String thirds; private String brand; + private Long brandId; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java index 71a5d5d44..30775faa6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java @@ -42,5 +42,6 @@ public class BasicdataOpenIncomingSettingEntity extends TenantEntity { private Long warehouseId; private String brand; + private Long brandId; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 5a3b94d8f..0bc2c5400 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.dto; +import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; import com.logpm.trunkline.vo.LoadScanFinalNodeIdVO; import com.logpm.trunkline.vo.ZeroOrderVO; import com.logpm.trunkline.vo.ZeroSuppleVO; @@ -113,4 +114,9 @@ public class LoadCarsDTO implements Serializable { private String url; private Integer incomingType; + + private Long userId; + + private List signPhotoList; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignOrderEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignOrderEntity.java index 3d2cf7fb3..62b0e9481 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignOrderEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignOrderEntity.java @@ -87,4 +87,17 @@ public class TrunklineLoadSignOrderEntity extends TenantEntity { @ApiModelProperty(name = "签收时间",notes = "") private Date signTime; + /** 签收时间 */ + @ApiModelProperty(name = "计划目的仓节点id",notes = "") + private Long finalNodeId; + + /** 司机用户id */ + @ApiModelProperty(name = "司机用户id",notes = "") + private Long driverUserId; + + /** 副驾用户id */ + @ApiModelProperty(name = "副驾用户id",notes = "") + private Long assistantUserId; + + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignPhotoEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignPhotoEntity.java new file mode 100644 index 000000000..922421601 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineLoadSignPhotoEntity.java @@ -0,0 +1,44 @@ +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_load_sign_photo") +@ApiModel(value = "TrunklineLoadSignPhoto对象", description = "配载计划直发签收照片") +@EqualsAndHashCode(callSuper = true) +public class TrunklineLoadSignPhotoEntity 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 ; + + /** 签收单id */ + @ApiModelProperty(name = "签收单id",notes = "") + private Long signOrderId ; + + /** 照片类型 */ + @ApiModelProperty(name = "照片类型",notes = "") + private Integer photoType; + + /** 照片地址 */ + @ApiModelProperty(name = "照片地址",notes = "") + private String photoUrl; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java index ffd74a528..da14baefb 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java @@ -1,12 +1,17 @@ package com.logpm.trunkline.vo; import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; +import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; import lombok.Data; +import java.util.List; + @Data public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity { private String driverName; private String carsNo; + private List signPhotoList; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java index 066ae57a6..99dea9c6f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java @@ -83,19 +83,15 @@ public class BasicdataOpenIncomingController { public R remove(@RequestBody BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { String method = "############addEntity: "; log.info(method+"请求参数{}",basicdataOpenIncomingDTO); + Long openIncomingId = basicdataOpenIncomingDTO.getOpenIncomingId(); + try{ - String brand = basicdataOpenIncomingDTO.getBrand(); - Long warehouseId = basicdataOpenIncomingDTO.getWarehouseId(); - if(StringUtil.isBlank(brand)){ - log.warn(method+"品牌不能为空"); - return R.fail(405,"品牌不能为空"); - } - if(Objects.isNull(warehouseId)){ - log.warn(method+"仓库不能为空"); - return R.fail(405,"仓库不能为空"); + if(Objects.isNull(openIncomingId)){ + log.warn(method+"配置id为空 openIncomingId={}",openIncomingId); + return R.fail(405,"配置id为空"); } - return basicdataOpenIncomingSettingService.addEntity(basicdataOpenIncomingDTO); + return R.status(basicdataOpenIncomingSettingService.removeById(openIncomingId)); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java index 453186a30..912b2b784 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java @@ -9,4 +9,5 @@ public class BasicdataOpenIncomingDTO extends BasicdataOpenIncomingSettingEntity private Integer pageSize; private Integer pageNum; + private Long openIncomingId; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java index 55fa3c4a2..60ed6f05a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java @@ -836,6 +836,39 @@ public class CarsLoadApiController { } + @ResponseBody + @PostMapping("/uploadSignPhoto") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "上传签收图片", notes = "传入loadCarsDTO") + public R uploadSignPhoto(@RequestBody LoadCarsDTO loadCarsDTO) { + String method = "############uploadSignPhoto: "; + log.info(method + "请求参数{}", loadCarsDTO); +// Long signOrderId = loadCarsDTO.getSignOrderId(); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(405,"仓库信息为空"); + } + loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); +// if(Objects.isNull(signOrderId)){ +// log.warn(method+"签收单Id为空 signOrderId={}",signOrderId); +// return R.fail(405,"签收单Id为空"); +// } + + return carsLoadService.uploadSignPhoto(loadCarsDTO); + }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("/signScanPackageCode") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml index 4f88d361f..3f821fe37 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml @@ -199,6 +199,7 @@ ldsa.mall_name mallName, lww.id belongToWarehouseId, lww.name belongToWarehouseName, + ltco.final_node_id finalNodeId, 0 signNum, '0' signStatus, GROUP_CONCAT(distinct ldsa.consignee_person) mallPerson, @@ -219,7 +220,8 @@ ltco.node_id, ldsa.mall_name, lww.id, - lww.name + lww.name, + ltco.final_node_id diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignPhotoMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignPhotoMapper.java new file mode 100644 index 000000000..83e3f1526 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignPhotoMapper.java @@ -0,0 +1,11 @@ +package com.logpm.trunkline.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TrunklineLoadSignPhotoMapper extends BaseMapper { + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index bed90f9ed..a4df747fc 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -194,4 +194,7 @@ public interface ITrunklineCarsLoadService extends BaseService { + List findBySignPhotoList(Long signOrderId); +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index a8cf87d16..02b5f682e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity; import com.logpm.aftersales.feign.IAftersalesAbnormalRecordClient; +import com.logpm.basicdata.entity.BasicdataDriverArteryEntity; import com.logpm.basicdata.entity.BasicdataTrayEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataCodeClient; @@ -99,6 +100,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { IPage page = new Page<>(); @@ -375,15 +379,32 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsOrderService.findSignOrderListBy(loadId, warehouseId); for (TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity : list) { -// TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = new TrunklineLoadSignOrderEntity(); -// BeanUtil.copy(entity,trunklineLoadSignOrderEntity); + + trunklineLoadSignOrderEntity.setDriverUserId(driverUserId); + trunklineLoadSignOrderEntity.setAssistantUserId(assistantUserId); trunklineLoadSignOrderEntity.setLoadSignCode(codeClient.getCodeByType(CodeNumConstant.TRUNKLINE_LOAD_SIGN, warehouseCode, "")); trunklineLoadSignOrderService.save(trunklineLoadSignOrderEntity); - } - for (TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity : list) { Long signOrderId = trunklineLoadSignOrderEntity.getId(); String mallName = trunklineLoadSignOrderEntity.getMallName(); @@ -394,6 +415,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trunklineCarsOrderService.findCustomerOrderList(loadId, warehouseId, mallName); +// for (TrunklineCarsOrderEntity l : ls) { +// l.setSignOrderId(signOrderId); +// } +// trunklineCarsOrderService.updateBatchById(ls); +// } + } @Override @@ -3423,22 +3455,21 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl page = new Page<>(); page.setCurrent(pageNum); page.setSize(pageSize); + loadCarsDTO.setUserId(AuthUtil.getUserId()); -// Long userId = AuthUtil.getUserId(); -// if(Objects.isNull(userId)){ -// log.warn("###############finaSignOrderList: 登录人id为空"); -// return R.fail(405,"登录人id为空"); -// } -// -// BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryClient.getDriverArtery(userId); -// if(Objects.isNull(driverArteryEntity)){ -// log.warn("###############finaSignOrderList: 未找到司机信息 userId={}",userId); -// return R.fail(405,"未找到司机信息"); -// } -// loadCarsDTO.setDriverId(driverArteryEntity.getId()); + loadCarsDTO.setEnterTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getEnterTimeStartStr())); + loadCarsDTO.setEnterTimeEnd(CommonUtil.getStartByDateStr(loadCarsDTO.getEnterTimeEndStr())); IPage pageList = trunklineLoadSignOrderService.finaSignOrderList(page, loadCarsDTO); + List records = pageList.getRecords(); + for (TrunklineLoadSignOrderVO record : records) { + Long id = record.getId(); + List bySignPhotoList = loadSignPhotoService.findBySignPhotoList(id); + record.setSignPhotoList(bySignPhotoList); + } + + pageList.setRecords(records); return R.data(pageList); } @@ -3471,10 +3502,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl signPhotoList = loadSignPhotoService.findBySignPhotoList(signOrderId); + Map map = new HashMap<>(); map.put("signOrder", signOrderVO); map.put("signScanOrderList", signScanOrderList); map.put("signScanZeroOrderList", signScanZeroOrderList); + map.put("signPhotoList", signPhotoList); return R.data(map); } @@ -4191,6 +4225,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl signPhotoList = loadCarsDTO.getSignPhotoList(); + List oldSignPhotoList = loadSignPhotoService.findBySignPhotoList(signOrderId); + + loadSignPhotoService.removeBatchByIds(oldSignPhotoList); + loadSignPhotoService.saveBatch(signPhotoList); + + return R.success("添加成功"); + } + @Override public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) { log.info("##############loadingTrayInfo: 查询托盘的货物信息"); @@ -4953,9 +4999,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl num) { + log.warn("#############unloadZero: 零担信息卸车数量大于装车件数 enterNun={} num={}", enterNun, num); + return R.fail(405, "零担信息卸车数量大于装车件数"); + }else{ + + Integer difficute = num - enterNun; + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + Long orderId = stockArticleEntity.getId(); + distributionStockArticleClient.addHandQuantity(orderId,difficute); } carsLoadScanEntity.setUnloadNum(enterNun); @@ -5017,7 +5069,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl implements ITrunklineLoadSignPhotoService { + @Override + public List findBySignPhotoList(Long signOrderId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sign_order_id",signOrderId) + .eq("is_deleted",0); + + return baseMapper.selectList(queryWrapper); + } +}