增值服务增加零担需求

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueDetailEntity.java

@@ -123,4 +123,5 @@ public class DistributionAddvalueDetailEntity extends TenantEntity  {
 	@ApiModelProperty(value = "公里;用于 平移和超区的附属字段 整数  计量单位按照M 来计算")
 	private Double distance;
 
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java

@@ -119,4 +119,5 @@ public class DistributionAddvalueEntity extends TenantEntity {
 	@ApiModelProperty(value = "配送Id")
 	private Long deliveryListId;
 
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvaluePackageEntity.java

@@ -136,4 +136,5 @@ public class DistributionAddvaluePackageEntity extends TenantEntity implements S
 	@ApiModelProperty(value = "1 全部订单和包间 2 扫码订单和包件 3手动输入")
 	private String recordType;
 
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java

@@ -32,4 +32,6 @@ import lombok.EqualsAndHashCode;
 public class DistributionAddvaluePackageVO extends DistributionAddvaluePackageEntity {
 	private static final long serialVersionUID = 1L;
 
+	private Integer maxQuantity;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java

@@ -40,7 +40,7 @@ public class DistributionAddvalueVO extends DistributionAddvalueEntity {
 	private String packageListIds;
 
 	//包件列表
-	List<DistributionAddvaluePackageEntity> packageEntityList;
+	List<DistributionAddvaluePackageVO> packageEntityList;
 
 
 	private Integer num;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java

@@ -14,6 +14,7 @@ import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.service.IDistributionReservationService;
 import com.logpm.distribution.service.IDistributionSignforService;
 import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl;
+import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.app.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -79,7 +80,7 @@ public class DistributionAddvalueAppController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "查询该客户下的所有配送包件信息", notes = "DistributionAppDeliveryListDTO")
 	public R getAllPackageList(@Valid @RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
-		List<DistributionAddvaluePackageEntity> allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO);
+		List<DistributionAddvaluePackageVO> allPackageList = distributionAddvalueService.getAllPackageList(distributionAppAddvalueDTO);
 		return R.data(200,allPackageList,"成功");
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java

@@ -31,4 +31,6 @@ import lombok.EqualsAndHashCode;
 public class DistributionAddvaluePackageDTO extends DistributionAddvaluePackageEntity {
 	private static final long serialVersionUID = 1L;
 
+	private Integer zeroQuantity;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java

@@ -81,7 +81,7 @@ public class DistributionAppAddvalueDTO extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "包件列表")
 //	@NotEmpty(message = "客户Id不能为空")
-	private List<DistributionAddvaluePackageEntity> packageEntityList;
+	private List<DistributionAddvaluePackageDTO> packageEntityList;
 
 
 	/**
@@ -142,6 +142,13 @@ public class DistributionAppAddvalueDTO extends TenantEntity {
 //	@NotEmpty(message = "客户Id不能为空")
 	private Long  addvalueDetailId;
 
+	/**
+	 * 公里数
+	 */
+	@ApiModelProperty(value = "公里数")
+//	@NotEmpty(message = "客户Id不能为空")
+	private Integer  quantity;
+
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -172,14 +172,14 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @param reservationId
 	 * @return
 	 */
-    List<DistributionAddvaluePackageEntity> selectAppInventoryListByReservation(@Param("reservationId") Long reservationId);
+    List<DistributionAddvaluePackageVO> selectAppInventoryListByReservation(@Param("reservationId") Long reservationId);
 
 	/**
 	 * 查询客户下的包件信息
 	 * @param reservationId
 	 * @return
 	 */
-	List<DistributionAddvaluePackageEntity> selectAppPackageListByReservationId(@Param("reservationId")Long reservationId);
+	List<DistributionAddvaluePackageVO> selectAppPackageListByReservationId(@Param("reservationId")Long reservationId);
 
 	/**
 	 * 查询出客户下的库存品订单维度信息
@@ -246,5 +246,5 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionParcelNumberDTO> selectZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
 
 	//查询零担品类包件信息
-	List<DistributionAddvaluePackageEntity> selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
+	List<DistributionAddvaluePackageVO> selectAppZeroPackageListByReservationId(@Param("reservationId")Long reservationId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -703,7 +703,7 @@
             ldr.id = #{reservationId} and ldsld.stock_package_status in ('1','3')
     </select>
     <select id="selectAppInventoryListByReservation"
-            resultType="com.logpm.distribution.entity.DistributionAddvaluePackageEntity">
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
         SELECT
             ldsld.stock_list_id AS stockArticleId,
             ldsld.id AS packageId,
@@ -729,7 +729,7 @@
             ldr.id = #{reservationId} and ldsld.stock_package_status in ('1','3')
     </select>
     <select id="selectAppPackageListByReservationId"
-            resultType="com.logpm.distribution.entity.DistributionAddvaluePackageEntity">
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
         SELECT
              ldpl.stock_article_id AS stockArticleId,
              ldpl.order_package_code AS orderPackageCode,
@@ -1034,14 +1034,15 @@
             ldrzp.reservation_id=#{reservationId} and ldrs.stock_article_status in ('1','3') AND ldrzp.zero_package_status IN ( '1', '3' )
     </select>
     <select id="selectAppZeroPackageListByReservationId"
-            resultType="com.logpm.distribution.entity.DistributionAddvaluePackageEntity">
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
         SELECT
             ldrzp.parcel_list_id,
             ldrzp.quantity AS quantity,
             ldrzp.reservation_id AS reservationId,
             3 AS conditions,
             ldsa.order_code AS orderCode,
-            ldsa.id AS stockArticleId
+            ldsa.id AS stockArticleId,
+            ldpl.id AS packageId
         FROM
             logpm_distribution_reservation_stockarticle AS ldrs
             INNER JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java

@@ -24,6 +24,7 @@ import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
+import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
 import org.springblade.core.tool.api.R;
@@ -82,7 +83,7 @@ public interface IDistributionAddvalueService extends IService<DistributionAddva
 	 * @param distributionAppAddvalueDTO
 	 * @return
 	 */
-	List<DistributionAddvaluePackageEntity> getAllPackageList(DistributionAppAddvalueDTO distributionAppAddvalueDTO);
+	List<DistributionAddvaluePackageVO> getAllPackageList(DistributionAppAddvalueDTO distributionAppAddvalueDTO);
 
 	/**
 	 * 修改增值服务列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java

@@ -22,18 +22,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.bean.Res;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.DistributionAddvalueDTO;
+import com.logpm.distribution.dto.DistributionAddvaluePackageDTO;
 import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.logpm.distribution.mapper.*;
-import com.logpm.distribution.service.IDistributionAddvalueDetailService;
+import com.logpm.distribution.service.*;
-import com.logpm.distribution.service.IDistributionAddvaluePackageService;
+import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
-import com.logpm.distribution.service.IDistributionAddvalueService;
-import com.logpm.distribution.service.IDistributionStockListService;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -72,6 +72,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 	private final IDistributionAddvalueDetailService distributionAddvalueDetailService;
 	private final DistributionAddvalueDetailMapper distributionAddvalueDetailMapper;
 	private final DistributionAddvaluePackageMapper distributionAddvaluePackageMapper;
+	private final IDistributionLoadscanService distributionLoadscanService;
 
 
 	@Override
@@ -189,17 +190,29 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 	@Override
 	@Transactional
 	public R saveAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
-		List<DistributionAddvaluePackageEntity> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
+		List<DistributionAddvaluePackageDTO> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList().stream().filter(p->p.getQuantity()>0).collect(Collectors.toList());
+		//查询是否重复添加
+		DistributionAddvalueEntity addvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda()
+			.eq(DistributionAddvalueEntity::getAddvalueId, distributionAppAddvalueDTO.getAddvalueType())
+			.eq(DistributionAddvalueEntity::getRefId, distributionAppAddvalueDTO.getReservationId())
+			.eq(DistributionAddvalueEntity::getRefType, 1));
+		if (Func.isNotEmpty(addvalueEntity)){
+			return Resp.scanFail("操作失败", "存在该类型增值服务项,如需更改请编辑");
+		}
 		if (Func.isEmpty(packageEntityList)) {
 			return Resp.scanFail("请添加包件", "请添加包件");
 		}
-
 		DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity();
 		if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
 			return Resp.scanFail("添加失败", "错误的包件数量");
 		}else {
 			distributionAddvalueDetailEntity.setNum(distributionAppAddvalueDTO.getNum());
 		}
+		DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionAppAddvalueDTO.getReservationId());
+		if (Func.isEmpty(reservationEntity)){
+			return Resp.scanFail("添加失败", "客户信息错误");
+
+		}
 //		上楼   超区   平移   搬运   分拣   专车
 		switch (distributionAppAddvalueDTO.getAddvalueType()) {
 			case "1":
@@ -223,14 +236,14 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 					distributionAddvalueDetailEntity.setDistance(distributionAppAddvalueDTO.getDistance());
 				}
 				break;
-//			case "4" :
+			case "4":
-//			case "5":
+			case "5":
-//				if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
+				if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
-//					return Resp.scanFail("添加失败", "请输入件数");
+					return Resp.scanFail("添加失败", "请输入件数");
-//				} else {
+				} else {
-//					distributionAddvalueDetailEntity.setNum(distributionAppAddvalueDTO.getNum());
+					distributionAddvalueDetailEntity.setNum(packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum());
-//				}
+				}
-//				break;
+				break;
 			case "6":
 				if (Func.isEmpty(distributionAppAddvalueDTO.getFee())) {
 					return Resp.scanFail("添加失败", "请输入件数");
@@ -243,7 +256,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		}
 		DistributionAddvalueEntity distributionAddvalueEntity = new DistributionAddvalueEntity();
 		distributionAddvalueEntity.setAddvalueId(distributionAppAddvalueDTO.getAddvalueType());
-		distributionAddvalueEntity.setCode(Func.random(13, RandomType.INT));
+		distributionAddvalueEntity.setCode(reservationEntity.getReservationCode());
 		distributionAddvalueEntity.setRefType(1);
 		distributionAddvalueEntity.setRefId(distributionAppAddvalueDTO.getReservationId());
 		distributionAddvalueEntity.setDeliveryListId(distributionAppAddvalueDTO.getDeliveryId());
@@ -255,20 +268,32 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 			distributionAddvalueDetailEntity.setRecordType(1);
 		}
 		distributionAddvalueDetailService.save(distributionAddvalueDetailEntity);
-		packageEntityList.stream().forEach(p->p.setAddvalueDetailId(distributionAddvalueDetailEntity.getId()));
+		List<DistributionAddvaluePackageEntity> addvaluePackageEntities = new ArrayList<>();
-		distributionAddvaluePackageService.saveBatch(packageEntityList);
+		packageEntityList.stream().forEach(p->{p.setAddvalueDetailId(distributionAddvalueDetailEntity.getId());p.setQuantity(p.getZeroQuantity());addvaluePackageEntities.add(Func.copy(p,DistributionAddvaluePackageEntity.class));});
+		distributionAddvaluePackageService.saveBatch(addvaluePackageEntities);
 		return Resp.scanSuccess("添加成功","添加成功");
 	}
 
 	@Override
-	public List<DistributionAddvaluePackageEntity> getAllPackageList(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+	public List<DistributionAddvaluePackageVO> getAllPackageList(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
 //		List<DistributionAddvaluePackageEntity> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
 		List<Long> packageListIds = distributionAppAddvalueDTO.getPackageListIds();
 		Long reservationId = distributionAppAddvalueDTO.getReservationId();
-		List<DistributionAddvaluePackageEntity> parcelListEntities = distributionReservationMapper.selectAppPackageListByReservationId(reservationId);
+		List<DistributionAddvaluePackageVO> parcelListEntities = distributionReservationMapper.selectAppPackageListByReservationId(reservationId);
-		List<DistributionAddvaluePackageEntity> zeroPackageList = distributionReservationMapper.selectAppZeroPackageListByReservationId(reservationId);
+		List<DistributionAddvaluePackageVO> zeroPackageList = distributionReservationMapper.selectAppZeroPackageListByReservationId(reservationId);
-		List<DistributionAddvaluePackageEntity> detailEntities = distributionReservationMapper.selectAppInventoryListByReservation(reservationId);
+		List<DistributionAddvaluePackageVO> detailEntities = distributionReservationMapper.selectAppInventoryListByReservation(reservationId);
+		if (Func.isNotEmpty(zeroPackageList)){
+			zeroPackageList.forEach(zp->{
+				//查询最大输入数量
+				DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionAppAddvalueDTO.getReservationId()).eq(DistributionLoadscanEntity::getPackageId, zp.getPackageId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+				zp.setMaxQuantity(0);
+				if (Func.isNotEmpty(loadscanEntities)){
+					zp.setMaxQuantity(loadscanEntities.getReceivedQuantity());
+				}
+			});
+		}
 		parcelListEntities.addAll(detailEntities);
+		parcelListEntities.addAll(zeroPackageList);
 		if (Func.isEmpty(parcelListEntities)) {
 			log.error("################该客户下包件信息:{}", parcelListEntities);
 			log.error("################该客户下库存品包件信息:{}", detailEntities);
@@ -277,6 +302,9 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		if (Func.isNotEmpty(parcelListEntities)){
 			parcelListEntities.stream().forEach(p->{p.setRecordType("1");});
 		}
+		if (Func.isNotEmpty(zeroPackageList)){
+			zeroPackageList.stream().forEach(p->{p.setRecordType("1");});
+		}
 //		List<DistributionAddvaluePackageEntity> entityList = null;
 //		if (Func.isNotEmpty(packageEntityList)) {
 //			entityList = parcelListEntities.stream().filter(p1 -> packageEntityList.stream().noneMatch(p2 -> p2.equals(p1.getId()))).collect(Collectors.toList());
@@ -296,7 +324,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 	@Override
 	@Transactional
 	public R updateAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
-		List<DistributionAddvaluePackageEntity> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
+		List<DistributionAddvaluePackageDTO> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
 		//这里需要查询出原来的增值服务项详情
 		DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity();
 //		DistributionAddvalueVO addvalueVO = distributionAddvalueMapper.selectReservationAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType());
@@ -404,8 +432,21 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 			String packageListIds = addvalueVO.getPackageListIds();
 			if (Func.isNotEmpty(packageListIds)){
 				List<Long> longs = Func.toLongList(packageListIds);
-				List<DistributionAddvaluePackageEntity> distributionAddvaluePackageEntities = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda().in(DistributionAddvaluePackageEntity::getPackageId,longs).eq(DistributionAddvaluePackageEntity::getAddvalueDetailId,addvalueVO.getAddvalueDetailId()));
+				List<DistributionAddvaluePackageEntity> distributionAddvaluePackageEntities = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
-				addvalueVO.setPackageEntityList(distributionAddvaluePackageEntities);
+					.in(DistributionAddvaluePackageEntity::getPackageId,longs)
+					.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId,addvalueVO.getAddvalueDetailId()));
+				List<DistributionAddvaluePackageVO> addvaluePackageVOS = new ArrayList<>();
+				distributionAddvaluePackageEntities.stream().forEach(p->{
+					DistributionAddvaluePackageVO addvaluePackageVO = Func.copy(p, DistributionAddvaluePackageVO.class);
+					//查询当前最多增值服务数
+					DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionAppAddvalueDTO.getReservationId()).eq(DistributionLoadscanEntity::getPackageId, p.getPackageId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+					addvaluePackageVO.setMaxQuantity(0);
+					if (Func.isNotEmpty(loadscanEntity)){
+						addvaluePackageVO.setMaxQuantity(loadscanEntity.getReceivedQuantity());
+					}
+					addvaluePackageVOS.add(addvaluePackageVO);
+				});
+				addvalueVO.setPackageEntityList(addvaluePackageVOS);
 			}
 		}
 		return R.data(addvalueVO);
@@ -414,7 +455,14 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 	@Override
 	public R addvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
 		List<DistributionAddvalueVO> addvalueInfo= distributionAddvalueMapper.addvalueInfo(distributionAppAddvalueDTO.getReservationId());
-		addvalueInfo.stream().filter(a->Func.isNotEmpty(a.getPackageListIds())).forEach(a-> a.setPackageEntityList(distributionAddvaluePackageService.listByIds(Func.toLongList(a.getPackageListIds()))));
+		addvalueInfo.stream().filter(a->Func.isNotEmpty(a.getPackageListIds())).forEach(a-> {
+			List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvaluePackageService.listByIds(Func.toLongList(a.getPackageListIds()));
+			List<DistributionAddvaluePackageVO> addvaluePackageVOS = new ArrayList<>();
+			addvaluePackageEntities.stream().forEach(p->{
+				addvaluePackageVOS.add(Func.copy(p,DistributionAddvaluePackageVO.class));
+			});
+			a.setPackageEntityList(addvaluePackageVOS);
+		});
 		return R.data(addvalueInfo);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1075,16 +1075,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//转换字典字段
 		for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
 			//查询包件签收件数
-			Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
+			int lad = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
 				.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListVO.getId())
 				.eq(DistributionLoadscanEntity::getSignforState, 2)
-			).intValue();
+			).stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
 
 			//查询库存品签收件数
-			Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
+			Integer nad = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
 				.eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionAppDeliveryListVO.getId())
 				.eq(DistributionLoadscaninvnEntity::getSignforState, 2)
-			).intValue();
+			).stream().mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum();
 			distributionAppDeliveryListVO.setSignNub(lad + nad);
 			//查询完成客户数
 			Integer cusCount = distributionDeliveryListMapper.selectCompletecusInCount(distributionAppDeliveryListVO.getId());
@@ -1794,6 +1794,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//查询出该签收的客户信息
 		DistributionSignforEntity signforEntity = this.getById(signforId);
 		List<DistributionParcelListEntity> parcelListEntities = baseMapper.getSignforPackageList(signforEntity.getReservationId());
+		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()).ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
+		if (Func.isNotEmpty(reservationStockarticleEntityList)){
+
+		}
 		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities);
 		parcelListVOS.forEach(p -> {
 			DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getPackageId, p.getId()));
@@ -1880,8 +1884,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				List<DistributionAddvaluePackageEntity> distributionAddvaluePackageEntities = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
 					.in(DistributionAddvaluePackageEntity::getPackageId, longs)
 					.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, addvalueBySignfor.getAddvalueDetailId()));
-
+				List<DistributionAddvaluePackageVO> addvaluePackageVOS = new ArrayList<>();
-				addvalueBySignfor.setPackageEntityList(distributionAddvaluePackageEntities);
+				distributionAddvaluePackageEntities.forEach(p->{addvaluePackageVOS.add(Func.copy(p,DistributionAddvaluePackageVO.class));});
+				addvalueBySignfor.setPackageEntityList(addvaluePackageVOS);
 			}
 		}
 		return R.data(addvalueBySignfor);