Merge branch 'dev' into pre-production

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

@@ -400,7 +400,7 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
 	public R getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) {
-		R parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId);
+		List<DistributionParcelNumberVO> parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId);
 		return R.data(parcelNumberVOS);
 	}
 

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

@@ -773,11 +773,11 @@
         ldpl.brand_name AS brandName,
         ldpn.quantity AS quantity,
         ldpn.hand_quantity AS handQuantity,
+        ldpn.hand_quantity AS number,
         ldpn.delivery_quantity AS deliveryQuantity,
         ldpn.outbound_quantity AS outboundQuantity,
         ldpn.signin_quantity AS signinQuantity,
-        (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum,
+        (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum
-        ldpn.quantity AS `number`
         FROM logpm_distribution_stock_article AS ldsa
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id

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

@@ -285,7 +285,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param orderId
 	 * @return
 	 */
-	R getDeliveryZeroOrderDetail(Long deliveryId, Long orderId);
+	List<DistributionParcelNumberVO> getDeliveryZeroOrderDetail(Long deliveryId, Long orderId);
 
 	/**
 	 * 零担装车

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

@@ -3211,7 +3211,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									}
 								});
 							}
-							distributionStockArticleService.maintenanceOrderInfo(s.getOrderCode(), myCurrentWarehouse.getId());
 						} else {
 							//该客户下增加零担订单
 							List<DistributionParcelNumberVO> parcelNumberVOS = s.getParcelNumberVOS();
@@ -3263,6 +3262,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								}
 							}
 						}
+						distributionStockArticleService.maintenanceOrderInfo(s.getOrderCode(), myCurrentWarehouse.getId());
 						reservationStockarticleEntity.setReservationId(reservationEntity.getId());
 						reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zengjia.getValue());
 						reservationStockarticleEntity.setIsHaveData(s.getIsHaveData());
@@ -3394,6 +3394,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 												BigDecimal yuanlaiNum = new BigDecimal(distributionReservationZeroPackageEntity.getQuantity().toString());
 												BigDecimal xiugaiNum = new BigDecimal(pn.getReservationNum().toString());
 												BigDecimal num = dongjieNum.add(xiugaiNum).subtract(yuanlaiNum);
+												if (Objects.equals(num.intValue(),yuanlaiNum.intValue()) ){
+													distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+														.eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId())
+														.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue())
+													);
+												}
 												parcelNumberEntity.setDeliveryQuantity(num.intValue());
 												distributionReservationZeroPackageEntity.setQuantity(pn.getReservationNum());
 												distributionParcelNumberService.updateById(parcelNumberEntity);
@@ -3414,6 +3420,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 											reservationZeroPackageEntity.setCategoryName(pn.getFirsts());
 											reservationZeroPackageEntity.setRealityQuantity(0);
 											distributionReservationZeroPackageService.save(reservationZeroPackageEntity);
+											distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+												.eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId())
+												.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue())
+											);
 											parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + pn.getReservationNum());
 											distributionParcelNumberService.updateById(parcelNumberEntity);
 											packageNum.getAndAdd(reservationZeroPackageEntity.getQuantity());
@@ -3442,12 +3452,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								}
 							}
 						}
-
 						//进行预约订单中间信息的修改
 						reservationStockarticleEntity.setReservationNum(packageNum.get());
 						distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
 						//预约订单上的包件数量维护
 						packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
+						//维护订单
+						distributionStockArticleService.maintenanceOrderInfo(s.getOrderCode(), myCurrentWarehouse.getId());
 					}
 					if (!packageLockIds.isEmpty()) {
 						List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode());
@@ -3490,17 +3501,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							//对零担订单进行移除
 							//零担
 							List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda().eq(DistributionReservationZeroPackageEntity::getReservationId, reservationEntity.getId()).eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId()).ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()));
-							reservationZeroPackageEntityList.forEach(rzp -> {
+							for (DistributionReservationZeroPackageEntity rzp : reservationZeroPackageEntityList) {
 								rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
 								distributionReservationZeroPackageService.updateById(rzp);
 								DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, rzp.getParcelListId()));
 								if (Func.isNotEmpty(parcelNumberEntity)) {
 //							parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity());
 									parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity());
+									int totalOutbound = parcelNumberEntity.getDeliveryQuantity() + parcelNumberEntity.getOutboundQuantity();
+									if (!Objects.equals(totalOutbound,parcelNumberEntity.getQuantity())){
+										//进行零担包件状态维护
+										distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+											.eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId())
+											.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue())
+										);
+									}
 									distributionParcelNumberService.updateById(parcelNumberEntity);
 									distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity);
 								}
-							});
+							}
 						} else {
 							log.error("###########################reservation_stockaticle的isZeroz字段维护错误,reservation_stockarticleID:{}", reservationStockarticleEntity.getId());
 							throw new RuntimeException("服务器正忙...");
@@ -3564,6 +3583,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						if (Func.isNotEmpty(parcelNumberEntity)) {
 //							parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity());
 							parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity());
+							int totalOutbound = parcelNumberEntity.getDeliveryQuantity() + parcelNumberEntity.getOutboundQuantity();
+							if (!Objects.equals(totalOutbound,parcelNumberEntity.getQuantity())){
+								//进行零担包件状态维护
+								distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+									.eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId())
+									.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue())
+								);
+							}
 							distributionParcelNumberService.updateById(parcelNumberEntity);
 							distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity);
 						}
@@ -3649,6 +3676,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
+		//对修改计划下的所有包件进行维护
+
 
 
 //		// 执行发送推送
@@ -5662,24 +5691,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public R getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) {
+	public List<DistributionParcelNumberVO> getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) {
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
 			.eq(DistributionLoadscanEntity::getOrderId, orderId)
 			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);
 		if (!Func.isEmpty(loadscanEntityList)){
-			return R.fail("此订单已进行装车操作,请滞留后编辑");
+			return null;
 		}
 		List<DistributionParcelNumberVO> zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId);
 		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId);
 		Map<Long, DistributionParcelNumberVO> reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));
 		zeroOrderDetail.forEach(z -> {
+			Integer integer = 0;
 			if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) {
+				integer = reservationNum.get(z.getParcelListId()).getReservationNum();
 				z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum());
 			}
+			int quantity = z.getHandQuantity() - z.getDeliveryQuantity() + integer;
+			z.setNumber(quantity);
 		});
-		return R.data(zeroOrderDetail);
+		return zeroOrderDetail;
 	}
 
 	@Override

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

@@ -36,7 +36,6 @@ import com.logpm.distribution.vo.*;
 import com.logpm.distribution.wrapper.*;
 import com.logpm.oldproject.feign.IWayBillClient;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
-import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient;
 import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient;
@@ -349,6 +348,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		ArrayList<DistributionStockArticleVO> distributionStockArticleVOS = new ArrayList<>();
 		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
 			reservationStockarticleEntityList.forEach(rs -> {
+				AtomicInteger num = new AtomicInteger();
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId());
 				DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity);
 				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
@@ -359,6 +359,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					if (Func.isNotEmpty(reservationPackageEntityList)) {
 						ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
 						reservationPackageEntityList.forEach(rp -> {
+							num.addAndGet(1);
 							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId());
 							DistributionParcelListVO parcelListVOS = DistributionParcelListWrapper.build().entityVO(parcelListEntity);
 							parcelListVOS.setQuantity(parcelListEntity.getQuantity());
@@ -380,6 +381,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							DistributionParcelListVO parcelListVOS = DistributionParcelListWrapper.build().entityVO(parcelListEntity);
 							parcelListVOS.setQuantity(rzp.getQuantity());
 							distributionParcelListVOS.add(parcelListVOS);
+							num.addAndGet(rzp.getQuantity());
 						});
 						distributionStockArticleVO.setPackageList(distributionParcelListVOS);
 					} else {
@@ -388,6 +390,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				} else {
 					log.error("####################预约订单中间表isZero字段缺失,reservation_stockArticle的ID为:{}", rs.getId());
 				}
+				distributionStockArticleVO.setReservationNum(num.get());
 				distributionStockArticleVOS.add(distributionStockArticleVO);
 
 			});

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

@@ -6529,6 +6529,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 
 					if (distributionReservationEntity.getReservationStockListNum() > 0) {
+
 						//查询库存品扫描签收
 						List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
 						List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -239,7 +239,7 @@ public class DistributionDatarepair {
 			Long id = entries.getLong("billId");
 			Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id);
 			if(b!=null&&b){
-				warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
+				warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1);
 				log.info(">>> pushBillNotification 成功 id={}",id);
 			}else{
 				log.error(">>> pushBillNotification 失败 id="+id);