diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPlanLogEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPlanLogEntity.java new file mode 100644 index 000000000..ee52de4ed --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPlanLogEntity.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +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; + +/** + * PAD备货扫描记录 实体类 + * + * @author cyz + * @since 2023-06-26 + */ +@Data +@TableName("logpm_distribution_plan_log") +@ApiModel(value = "DistributionPlanLogEntity对象", description = "计划日志") +@EqualsAndHashCode(callSuper = true) +public class DistributionPlanLogEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + + /** + * 关联ID + */ + @ApiModelProperty(value = "关联ID") + private Long refId; + + /** + * 关联任务Code + */ + @ApiModelProperty(value = "关联任务Code") + private String refCode; + + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private Long warehouseId; + + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String content; + + /** + * 操作人 + */ + @ApiModelProperty(value = "操作人") + private String operator; + /** + * 货位 + */ + @ApiModelProperty(value = "类型 1-预约计划,2-自提计划,3-配送计划,4-备货计划") + private Integer type; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.java new file mode 100644 index 000000000..d718cc55c --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.DistributionLoadingNumDTO; +import com.logpm.distribution.dto.DistributionParcelNumberDTO; +import com.logpm.distribution.dto.DistributionReservationDTO; +import com.logpm.distribution.entity.*; +import com.logpm.distribution.vo.*; +import com.logpm.oldproject.dto.SignPushDataContactDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 预约列表 Mapper 接口 + * + * @author TJJ + * @since 2023-06-12 + */ +@Mapper +public interface DistributionPlanLogMapper extends BaseMapper { + + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.xml new file mode 100644 index 000000000..a4e5116c7 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPlanLogMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPlanLogService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPlanLogService.java new file mode 100644 index 000000000..d5cdcabec --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPlanLogService.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service; + +import com.logpm.distribution.entity.DistributionPlanLogEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 配送计划日志服务类 + * + * @author cyz + * @since 2023-07-25 + */ +public interface IDistributionPlanLogService extends BaseService { + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 3590b9ad2..530fe9499 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -264,6 +264,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl oldList, List newList, BasicdataWarehouseEntity myCurrentWarehouse) { + List addNewList = newList.stream().filter(f -> !oldList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()).contains(f.getId())).collect(Collectors.toList()); + List reservationLogList= new ArrayList<>(); + if (!addNewList.isEmpty()) { + //存在新增 + for (DistributionReservationEntity reservationEntity : addNewList) { + String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"进行预约计划新增转配送;预约计划:"+reservationEntity.getReservationCode() + +"车次号:"+deliveryListEntity.getTrainNumber(); + DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity(); + reservationPlanLogEntity.setContent(reservationContent); + reservationPlanLogEntity.setRefId(reservationEntity.getId()); + reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode()); + reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + reservationPlanLogEntity.setOperator(user.getNickName()); + reservationPlanLogEntity.setType(1); + reservationLogList.add(reservationPlanLogEntity); + } + } + List deletedList = oldList.stream().filter(f -> !newList.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()).contains(f.getId())).collect(Collectors.toList()); + if (!deletedList.isEmpty()) { + //存在取消 + for (DistributionReservationEntity reservationEntity : addNewList) { + String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"进行预约计划取消转配送;预约计划:"+reservationEntity.getReservationCode() + +"车次号:"+deliveryListEntity.getTrainNumber(); + DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity(); + reservationPlanLogEntity.setContent(reservationContent); + reservationPlanLogEntity.setRefId(reservationEntity.getId()); + reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode()); + reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + reservationPlanLogEntity.setOperator(user.getNickName()); + reservationPlanLogEntity.setType(1); + reservationLogList.add(reservationPlanLogEntity); + } + } + if (!reservationLogList.isEmpty()){ + distributionPlanLogService.saveBatch(reservationLogList); + String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"修改市配配送计划;车次号:"+deliveryListEntity.getTrainNumber() + +"预约编号:["+oldList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]变更为-->["+newList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]"; + DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); + distributionPlanLogEntity.setContent(distributionContent); + distributionPlanLogEntity.setRefId(deliveryListEntity.getId()); + distributionPlanLogEntity.setRefCode(deliveryListEntity.getTrainNumber()); + distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + distributionPlanLogEntity.setOperator(user.getNickName()); + distributionPlanLogEntity.setType(3); + distributionPlanLogService.save(distributionPlanLogEntity); + } + } + @Override public IPage getPackageListByDeliverylistId(IPage page, Map distributionDeliveryInfoDTO) throws ParseException { if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))) { @@ -4307,7 +4367,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda().eq(DistributionDeliveryTripartiteEntity::getId, loadingId).set(DistributionDeliveryTripartiteEntity::getDepartureTime, format)); + b = distributionDeliveryTripartiteService.update(new UpdateWrapper().lambda() + .eq(DistributionDeliveryTripartiteEntity::getId, loadingId) + .set(DistributionDeliveryTripartiteEntity::getDepartureTime, format)); } //修改主表状态 @@ -4324,7 +4386,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl cancelMarketDeliveryListTask(Map distributionDeliveryListDTO) { - //1、查询配送计划下的预约、订单、包件信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Objects.isNull(myCurrentWarehouse)){ + return R.fail(403,"未授权!!!"); + } + String deliveryListId = (String) distributionDeliveryListDTO.get("deliveryListId"); DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryListId); List distributionSignforEntities = distributionSignforServicer.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionSignforEntity::getDeliveryId, deliveryListEntity.getId())); BladeUser user = AuthUtil.getUser(); + List reservationList = new ArrayList<>(); distributionSignforEntities.forEach(s -> { - //2、将预约计划进行确认状态的回滚 -// DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(s.getReservationId()); DistributionReservationEntity reservationEntity = distributionReservationMapper.selectOne(Wrappers.query().lambda() .eq(DistributionReservationEntity::getId, s.getReservationId()) .ne(DistributionReservationEntity::getReservationStatus, ReservationStatusConstant.yiquexiao.getValue()) ); + reservationList.add(reservationEntity); reservationEntity.setReservationStatus(ReservationStatusConstant.yiqueren.getValue()); reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue()); distributionReservationMapper.updateById(reservationEntity); @@ -4426,9 +4490,46 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationList, BasicdataWarehouseEntity myCurrentWarehouse) { + List reservationLogList = new ArrayList<>(); + //进行预约计划日志 + for (DistributionReservationEntity reservationEntity : reservationList) { + String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"进行预约计划取消转配送;预约计划:"+reservationEntity.getReservationCode() + +"车次号:"+deliveryListEntity.getTrainNumber(); + DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity(); + reservationPlanLogEntity.setContent(reservationContent); + reservationPlanLogEntity.setRefId(reservationEntity.getId()); + reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode()); + reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + reservationPlanLogEntity.setOperator(user.getNickName()); + reservationPlanLogEntity.setType(1); + reservationLogList.add(reservationPlanLogEntity); + } + if (!reservationLogList.isEmpty()) { + distributionPlanLogService.saveBatch(reservationLogList); + } + String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"取消市配配送计划;车次号:"+deliveryListEntity.getTrainNumber() + +"预约编号:["+reservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"]"; + DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); + distributionPlanLogEntity.setContent(distributionContent); + distributionPlanLogEntity.setRefId(deliveryListEntity.getId()); + distributionPlanLogEntity.setRefCode(deliveryListEntity.getTrainNumber()); + distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + distributionPlanLogEntity.setOperator(user.getNickName()); + distributionPlanLogEntity.setType(3); + distributionPlanLogService.save(distributionPlanLogEntity); + + } + @Override public List selectDistributionDeliveryinventory(IPage page, Map distributionInventoryDTO) { if (Func.isEmpty(distributionInventoryDTO.get("deliveryId"))) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPlanLogServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPlanLogServiceImpl.java new file mode 100644 index 000000000..59040f08b --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPlanLogServiceImpl.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service.impl; + +import com.logpm.distribution.entity.DistributionPlanLogEntity; +import com.logpm.distribution.mapper.DistributionPlanLogMapper; +import com.logpm.distribution.service.IDistributionPlanLogService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 通知提货记录 服务实现类 + * + * @author cyz + * @since 2023-06-14 + */ +@Service +@AllArgsConstructor +public class DistributionPlanLogServiceImpl extends BaseServiceImpl implements IDistributionPlanLogService { + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index aaa01d2cf..26fd90fdd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -38,23 +38,7 @@ import com.logpm.distribution.dto.DistributionReservationPackageDTO; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.dto.DistributionStockListDTO; import com.logpm.distribution.dto.DistributionStockupDTO; -import com.logpm.distribution.entity.DisStockListDetailEntity; -import com.logpm.distribution.entity.DistributionDeliveryListEntity; -import com.logpm.distribution.entity.DistributionDeliverySelfEntity; -import com.logpm.distribution.entity.DistributionDeliveryTripartiteEntity; -import com.logpm.distribution.entity.DistributionLoadscanEntity; -import com.logpm.distribution.entity.DistributionParcelListEntity; -import com.logpm.distribution.entity.DistributionParcelNumberEntity; -import com.logpm.distribution.entity.DistributionReservationEntity; -import com.logpm.distribution.entity.DistributionReservationPackageEntity; -import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; -import com.logpm.distribution.entity.DistributionReservationStocklistEntity; -import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity; -import com.logpm.distribution.entity.DistributionSignforEntity; -import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistributionStockListEntity; -import com.logpm.distribution.entity.DistributionStockupEntity; -import com.logpm.distribution.entity.DistributionStockupInfoEntity; +import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.mapper.DisStockListDetailMapper; import com.logpm.distribution.mapper.DistributionLoadscanMapper; @@ -69,24 +53,7 @@ import com.logpm.distribution.mapper.DistributionStockListMapper; import com.logpm.distribution.mapper.DistributionStockMapper; import com.logpm.distribution.mapper.DistributionStockupInfoMapper; import com.logpm.distribution.mapper.DistributionStockupMapper; -import com.logpm.distribution.service.IDisStockListDetailService; -import com.logpm.distribution.service.IDistributionAsyncService; -import com.logpm.distribution.service.IDistributionDeliveryListService; -import com.logpm.distribution.service.IDistributionDeliverySelfService; -import com.logpm.distribution.service.IDistributionDeliveryTripartiteService; -import com.logpm.distribution.service.IDistributionLoadscaninvnService; -import com.logpm.distribution.service.IDistributionParcelListService; -import com.logpm.distribution.service.IDistributionParcelNumberService; -import com.logpm.distribution.service.IDistributionReservationPackageService; -import com.logpm.distribution.service.IDistributionReservationService; -import com.logpm.distribution.service.IDistributionReservationStockarticleService; -import com.logpm.distribution.service.IDistributionReservationStocklistService; -import com.logpm.distribution.service.IDistributionReservationZeroPackageService; -import com.logpm.distribution.service.IDistributionSignforService; -import com.logpm.distribution.service.IDistributionStockArticleService; -import com.logpm.distribution.service.IDistributionStockListService; -import com.logpm.distribution.service.IDistributionStockupInfoService; -import com.logpm.distribution.service.IDistributionStockupService; +import com.logpm.distribution.service.*; import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelNumberVO; import com.logpm.distribution.vo.DistributionReservationOrderPackageVO; @@ -301,6 +268,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")); return R.fail(collect + "已进行配送 请移除"); } + //判断是否存在有取消的预约计划 + boolean cancelMatch = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.yiquexiao.getValue().equals(r.getReservationStatus())); + if (cancelMatch) { + String collect = reservationEntityList.stream().filter(r -> ReservationStatusConstant.yiquexiao.getValue().equals(r.getReservationStatus())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")); + return R.fail(collect + "已进行配送 请移除"); + } boolean flag = reservationEntityList.stream().anyMatch(s -> s.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue())); DistributionStockupEntity stockupEntity = null; if (flag) { @@ -1479,9 +1456,45 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationEntityList) { + List reservationLogList = new ArrayList<>(); + //进行预约计划日志 + for (DistributionReservationEntity reservationEntity : reservationEntityList) { + String reservationContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"进行预约计划转配送;预约计划:"+reservationEntity.getReservationCode() + +"车次号:"+distributionDeliveryListEntity.getTrainNumber(); + DistributionPlanLogEntity reservationPlanLogEntity = new DistributionPlanLogEntity(); + reservationPlanLogEntity.setContent(reservationContent); + reservationPlanLogEntity.setRefId(reservationEntity.getId()); + reservationPlanLogEntity.setRefCode(reservationEntity.getReservationCode()); + reservationPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + reservationPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + reservationPlanLogEntity.setOperator(user.getNickName()); + reservationPlanLogEntity.setType(1); + reservationLogList.add(reservationPlanLogEntity); + } + if (!reservationLogList.isEmpty()) { + distributionPlanLogService.saveBatch(reservationLogList); + } + String distributionContent =user.getNickName()+"在"+myCurrentWarehouse.getName() + +"创建市配配送计划;车次号:"+distributionDeliveryListEntity.getTrainNumber() + +"预约编号:["+reservationEntityList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))+"],总件数:"+distributionDeliveryListEntity.getDeliveryNumber(); + DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); + distributionPlanLogEntity.setContent(distributionContent); + distributionPlanLogEntity.setRefId(distributionDeliveryListEntity.getId()); + distributionPlanLogEntity.setRefCode(distributionDeliveryListEntity.getTrainNumber()); + distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + distributionPlanLogEntity.setOperator(user.getNickName()); + distributionPlanLogEntity.setType(3); + distributionPlanLogService.save(distributionPlanLogEntity); + } + /** * 处理广播数据 * @param distributionDeliveryListEntity @@ -1579,6 +1592,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionReservationStockarticleEntities = distributionReservationStockarticleService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, id).ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); Map> oldStockArticle = distributionReservationStockarticleEntities.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId)); @@ -2129,9 +2143,41 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl"+reservationEntity.getReceivingUnit()) + +",收货人:"+(reservationEntity.getConsignee().equals(oldReservation.getConsignee())?reservationEntity.getConsignee():"由"+oldReservation.getConsignee()+"变更为-->"+reservationEntity.getConsignee()) + +",联系电话:"+(reservationEntity.getDeliveryPhone().equals(oldReservation.getDeliveryPhone())?reservationEntity.getDeliveryPhone():"由"+oldReservation.getDeliveryPhone()+"变更为-->"+reservationEntity.getDeliveryPhone()) + +",收货地址:"+(reservationEntity.getDeliveryAddress().equals(oldReservation.getDeliveryAddress())?reservationEntity.getDeliveryAddress():"由"+oldReservation.getDeliveryAddress()+"变更为-->"+reservationEntity.getDeliveryAddress()) + +",计划件数:"+(newPlanNum.equals(oldPlanNum)?newPlanNum:"由"+oldPlanNum+"变更为-->"+newPlanNum); + DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); + distributionPlanLogEntity.setContent(planContent); + distributionPlanLogEntity.setRefId(reservationEntity.getId()); + distributionPlanLogEntity.setRefCode(reservationEntity.getReservationCode()); + distributionPlanLogEntity.setWarehouseId(myCurrentWarehouse.getId()); + distributionPlanLogEntity.setWarehouseName(myCurrentWarehouse.getName()); + distributionPlanLogEntity.setOperator(user.getNickName()); + distributionPlanLogEntity.setType(1); + distributionPlanLogService.save(distributionPlanLogEntity); + + + } + @Override @Transactional public R deliveryBusinessTask(DistributionDeliveryAllocationDTO allocationDTO) { @@ -3390,9 +3436,32 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl