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 997667a7e..115fc13ea 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 @@ -65,7 +65,7 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity { * 异常ID */ @ApiModelProperty(value = "异常ID") - private String workOrderId; + private Long workOrderId; /** * 数量 */ @@ -80,7 +80,7 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity { * 仓库ID */ @ApiModelProperty(value = "仓库ID") - private String warehouseId; + private Long warehouseId; /** * 包件图片路径 */ diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java index 621bd23b9..f6de2bc1f 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesDecreaseImageEntity.java @@ -65,7 +65,7 @@ public class AftersalesDecreaseImageEntity extends TenantEntity { * 异常工单Id */ @ApiModelProperty(value = "异常工单Id") - private String workOrderId; + private Long workOrderId; /** * 图片类型 */ @@ -85,6 +85,6 @@ public class AftersalesDecreaseImageEntity extends TenantEntity { * 仓库id */ @ApiModelProperty(value = "仓库id") - private String warehouseId; + private Long warehouseId; } diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java index 219e2cc7e..7d043fffc 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessorEntity.java @@ -75,7 +75,7 @@ public class AftersalesProcessorEntity extends TenantEntity { * 异常工单ID */ @ApiModelProperty(value = "异常工单ID") - private String workOrderId; + private Long workOrderId; /** * 状态 */ @@ -90,6 +90,6 @@ public class AftersalesProcessorEntity extends TenantEntity { * 仓库ID */ @ApiModelProperty(value = "仓库ID") - private String warehouseId; + private Long warehouseId; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java index 7ec2b8e0d..630c0e252 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java @@ -84,6 +84,16 @@ public class QuestDetailVO extends QuestDetailEntity { */ @ApiModelProperty(value = "品牌") private String brandName; + /** + * 盘点对象;1.定制品 2零担 3 库存品 + */ + @ApiModelProperty(value = "盘点对象;1.定制品 2零担 3 库存品") + private Integer questTarget; + /** + * 在库数量 + */ + @ApiModelProperty(value = "在库数量") + private Integer stockNum; /** * 一级品 diff --git a/blade-service/logpm-aftersales/pom.xml b/blade-service/logpm-aftersales/pom.xml index 86653f783..a934b97bb 100644 --- a/blade-service/logpm-aftersales/pom.xml +++ b/blade-service/logpm-aftersales/pom.xml @@ -39,6 +39,12 @@ ${bladex.project.version} compile + + org.springblade + logpm-basicdata-api + 3.2.0.RELEASE + compile + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index c5cb6fc78..919e5015d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -18,21 +18,34 @@ package com.logpm.aftersales.service.impl; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity; +import com.logpm.aftersales.entity.AftersalesDecreaseImageEntity; +import com.logpm.aftersales.entity.AftersalesProcessorEntity; import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; import com.logpm.aftersales.service.IAftersalesAbnormalPackageService; +import com.logpm.aftersales.service.IAftersalesDecreaseImageService; +import com.logpm.aftersales.service.IAftersalesProcessorService; import com.logpm.aftersales.vo.AftersalesWorkOrderVO; import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper; import com.logpm.aftersales.service.IAftersalesWorkOrderService; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.BeanUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -47,6 +60,10 @@ import java.util.List; public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl implements IAftersalesWorkOrderService { private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService; + private final IAftersalesDecreaseImageService aftersalesDecreaseImageService; + private final IAftersalesProcessorService aftersalesProcessorService; + + private final IBasicdataWarehouseClient warehouseClient; @Override @@ -72,28 +89,64 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + aftersalesWorkOrder.getPackageEntityList().stream().forEach(i ->{ + AftersalesAbnormalPackageEntity packageEntity = new AftersalesAbnormalPackageEntity(); + BeanUtil.copyProperties(i,packageEntity); + packageEntity.setWorkOrderId(aftersalesWorkOrder.getId()); + packageEntity.setWarehouseId(myCurrentWarehouse.getId()); + list.add(packageEntity); + }); + if(!list.isEmpty()){ + aftersalesAbnormalPackageService.saveBatch(list); + } } if(ObjectUtils.isNotNull(aftersalesWorkOrder.getDecreaseImageEntityList())){ //货损图片 + List list = new ArrayList<>(); + aftersalesWorkOrder.getDecreaseImageEntityList().stream().forEach(i ->{ + AftersalesDecreaseImageEntity packageEntity = new AftersalesDecreaseImageEntity(); + BeanUtil.copyProperties(i,packageEntity); + packageEntity.setWorkOrderId(aftersalesWorkOrder.getId()); + packageEntity.setWarehouseId(myCurrentWarehouse.getId()); + list.add(packageEntity); + }); + if(!list.isEmpty()){ + aftersalesDecreaseImageService.saveBatch(list); + } + } if(ObjectUtils.isNotNull(aftersalesWorkOrder.getProcessorEntityList())){ //责任方 处理方 + List list = new ArrayList<>(); + aftersalesWorkOrder.getProcessorEntityList().stream().forEach(i ->{ + AftersalesProcessorEntity packageEntity = new AftersalesProcessorEntity(); + BeanUtil.copyProperties(i,packageEntity); + packageEntity.setWorkOrderId(aftersalesWorkOrder.getId()); + packageEntity.setWarehouseId(myCurrentWarehouse.getId()); + list.add(packageEntity); + }); + if(!list.isEmpty()){ + aftersalesProcessorService.saveBatch(list); + } } - - - - - - - - return baseMapper.insert(aftersalesWorkOrder) > 0 ? true : false; + return true; }else{ //修改 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index 12ff908ed..c7c21e5d9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -193,6 +193,26 @@ public class TaskQuestController extends BladeController { return R.status(taskQuestService.updateByIdCustom(taskQuest)); } + /** + * 盘点任务 修改 + */ + @PostMapping("/updateInfo") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入taskQuest") + public R updateInfo(@Valid @RequestBody TaskQuestDTO taskQuest) { + return R.status(taskQuestService.updateByInfo(taskQuest)); + } + + /** + * 盘点任务 盘点后的数据修改 + */ + @PutMapping("/updateQuestChildInfo") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入taskQuest") + public R updateQuestInfo(@Valid @RequestBody List questDetailDTO) { + return R.status(taskQuestService.updateQuestInfo(questDetailDTO)); + } + /** * 盘点任务 修改时间 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java index 44015e91a..52ffaad92 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java @@ -47,5 +47,8 @@ public class QuestDetailDTO extends QuestDetailEntity { private String allocationId;//上架后的库位id + private String cargoName;//盘点的包件状态名称 + + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index f9593c56b..8bb6a70bf 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -231,4 +231,18 @@ public interface ITaskQuestService extends BaseService { * @return */ R getMaterialName(TaskSearchDTO taskSearchDTO, IPage page); + + /** + * 修改数据 + * @param taskQuest + * @return + */ + Boolean updateByInfo(TaskQuestDTO taskQuest); + + /** + * 盘点数据修改 + * @param questDetailDTO + * @return + */ + boolean updateQuestInfo(List questDetailDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index f8484a59c..da115fbc8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -1047,6 +1047,75 @@ public class TaskQuestServiceImpl extends BaseServiceImpl 0 ? true : false; + } + + /** + * 修改盘点后的数据 + * @param questDetailDTO + * @return + */ + @Override + public boolean updateQuestInfo(List questDetailDTO) { + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("请选择仓库！！"); + } + BladeUser user = AuthUtil.getUser(); + if(ObjectUtils.isNull(questDetailDTO)){ + questDetailDTO.stream().forEach( i ->{ + if(i.getStockNum() > 0 || i.getWornNum() > 0 || i.getLossNum() > 0 || i.getNoRepairNum() > 0 || i.getDeliveNum() > 0 || i.getNoReceivedNum()> 0){ + //添加 + List childList = new ArrayList<>(); + childList.add(addQuestDetailChild(i.getStockNum(),"10",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + childList.add(addQuestDetailChild(i.getWornNum(),"20",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + childList.add(addQuestDetailChild(i.getLossNum(),"30",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + childList.add(addQuestDetailChild(i.getNoRepairNum(),"40",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + childList.add(addQuestDetailChild(i.getDeliveNum(),"50",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + childList.add(addQuestDetailChild(i.getNoReceivedNum(),"60",i.getQuestId(),myCurrentWarehouse.getId(),i.getQuestNum())); + if(!childList.isEmpty()){ + boolean b = childList.stream().anyMatch(ii -> ObjectUtils.isNull(ii.getId())); + if(b){ + //添加 + baseMapper.insertQuestDetailChildList(i.getQuestNum()+"_child",childList); + }else{ + //修改 + List collect = childList.stream().filter( ii -> ObjectUtils.isNotNull(ii.getQuestNum()) && ii.getQuestNum() > 0).collect(Collectors.toList()); + baseMapper.updetaQuestDetailChildList(i.getQuestNum()+"_child",collect); + } + } + } + //修改盘点数据 + List list = new ArrayList<>(); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setId(i.getId()); + questDetail.setQuestStatus(i.getQuestStatus()); + questDetail.setUpdateUser(user.getUserId()); + questDetail.setUpdateTime(new Date()); + if(ObjectUtils.isNotNull(i.getOrderCode())){ + questDetail.setOrderCode(i.getOrderCode()); + } + if(ObjectUtils.isNotNull(i.getOrderPackageCode())){ + questDetail.setOrderPackageCode(i.getOrderPackageCode()); + } + list.add(questDetail); + baseMapper.updatePositionCodeList(i.getQuestNum(),list); + }); + return true; + }else{ + return false; + } + + } + /** * 查询货位上的数据 * @param taskSearchDTO