Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -96,9 +97,14 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distrbutionReservation")
 	public R<IPage<DistributionReservationVO>> list(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, Query query) {
 		String excludeId = (String) distrbutionReservation.get("excludeId");
+		String reservationStatus = (String) distrbutionReservation.get("reservationStatus");
 		if (Func.isNotEmpty(excludeId)){
 			distrbutionReservation.remove("excludeId");
 		}
+
+		if (!Objects.isNull(reservationStatus)){
+			distrbutionReservation.remove("reservationStatus");
+		}
 		QueryWrapper<DistributionReservationEntity> queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class);
 		//获取当前登录人仓库
 		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
@@ -111,7 +117,9 @@ public class DistributionReservationController extends BladeController {
 			List<Long> ids = Func.toLongList(",", excludeId);
 			lambda.notIn(DistributionReservationEntity::getId,ids);
 		}
+
 		lambda.orderByDesc(DistributionReservationEntity::getCreateTime);
+		lambda.eq(!Objects.isNull(reservationStatus),DistributionReservationEntity::getReservationStatus,reservationStatus);
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query),lambda );
 		pages.getRecords().forEach(i ->{
 			R<User> userR = userClient.userInfoById(i.getCreateUser());

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

@@ -960,8 +960,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
 						loadscaninvnEntity.setOneQclick(1);
 						distributionLoadscaninvnService.updateById(loadscaninvnEntity);
-						//维护签收数量
-						Integer j = distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+//						//维护签收数量
+//						Integer j = distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
 						//更新签收人
 						Integer i = distributionSignforMapper.updateSignUser(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), user);
 					} else {
@@ -1027,8 +1027,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscaninvnEntity.setSigningUserId(user.getUserId());
 						distributionLoadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
 						distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
-						//更新装车数量
-						Integer j = distributionSignforMapper.updateLoadAndsignforByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
+//						//更新装车数量
+//						Integer j = distributionSignforMapper.updateLoadAndsignforByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
 						//更新签收人
 						Integer i = distributionSignforMapper.updateSignUser(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), AuthUtil.getUser());
 						//扣减库存
@@ -1056,6 +1056,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
 		}
+		//维护签收数量
+		this.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
 		return R.status(true);
 	}