自提零担BUG修复

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

@@ -917,7 +917,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 			return R.fail("包件已存在");
 		}
 		//查询客户信息
-		boolean flag = packageEntityList.stream().anyMatch(p -> p.getClientId() != null);
+		boolean flag = packageEntityList.stream().anyMatch(p -> p.getClientId() == null);
 		if (flag) {
 			String str = packageEntityList.stream().filter(p -> p.getClientId() != null).map(DistributionAddvaluePackageDTO::getOrderPackageCode).collect(Collectors.joining(","));
 			return R.fail(str + "无客户信息");
@@ -989,7 +989,8 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 					//新增包件
 					DistributionAddvaluePackageDTO distributionAddvaluePackageDTO = packageDTOMap.get(ip);
 					List<PriceDispatchAddClientVO> priceDispatchAddClientVOS = basicdataPriceClient.dispatchAddPrice(BasicdatPriceApiVO.builder().clientId(distributionAddvaluePackageDTO.getClientId().toString()).brandId(distributionAddvaluePackageDTO.getClientId().toString()).build());
-					if (!priceDispatchAddClientVOS.isEmpty()) {
+
+					if (Func.isEmpty(priceDispatchAddClientVOS)){
 						//TODO 结算品类
 					}
 					//查询价格模板

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

@@ -62,6 +62,7 @@ import org.springblade.common.constant.order.OrderStockupStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
+import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.node.PackageNode;
 import org.springblade.common.utils.CommonUtil;
@@ -375,6 +376,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				.eq(DistributionReservationZeroPackageEntity::getParcelListId, i.getId())
 				.eq(DistributionReservationZeroPackageEntity::getStockArticleId, i.getStockArticleId())
 				.eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId)
+				.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
 			DistributionParcelListZeroVO parcelListVO = new DistributionParcelListZeroVO();
 			BeanUtils.copyProperties(i, parcelListVO);

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

@@ -121,7 +121,7 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm
 			DistributionParcelListEntity parcelListEntity = distributionParcelListMapper.selectById(reservationZeroPackageEntity.getParcelListId());
 			DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, parcelListEntity.getId()));
 			//进行预约数量的扣减
-			int i = distributionParcelNumberEntity.getDeliveryQuantity() - distributionParcelNumberEntity.getQuantity();
+			int i = distributionParcelNumberEntity.getDeliveryQuantity() - reservationZeroPackageEntity.getQuantity();
 			distributionParcelNumberEntity.setDeliveryQuantity(i);
 			if (i == 0){
 				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());

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

@@ -2625,7 +2625,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getSigningUser() + "扫描签收,装车方式:扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
 					JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getTrainNumber(), parcelListEntity.getWarehouseEntryTimeEnd());
 					aaa.add(trunklinePackageTrackLog);
-					orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
 				} else {
 					//这里装车的数据需要进行补录
 //					DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -2715,8 +2714,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionParcelListService.updateById(updatePackage);
 				//维护签收包件状态
 				distributionStockArticleService.maintenanceOrderInfo(collect.get(0).getOrderCode(), myCurrentWarehouse.getId());
-
-				orderPackageCodes.add(updatePackage.getOrderPackageCode());
 				//进行备货库位下架
 				List<JSONObject> jsonObjects = new ArrayList<>();
 				JSONObject jsonObject = new JSONObject();

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

@@ -218,6 +218,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 
 
+
 	@Override
 	public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
 		return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading));
@@ -1829,6 +1830,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 //				distributionZeroPackageService.cancelZeroPackage(longs);
 			}
+
+
+		} else {
 			// TODo 添加新的品类
 			List<DistributionReservationZeroPackageEntity> packageEntityList = new ArrayList<>();
 			if (Func.isNotEmpty(parcelLisList)){
@@ -1837,25 +1841,27 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					zeroPackageEntity.setParcelListId(w.getId());
 					zeroPackageEntity.setStockArticleId(w.getStockArticleId());
 					zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId());
-					zeroPackageEntity.setQuantity(w.getQuantity());
+					zeroPackageEntity.setQuantity(w.getTiQuantity());
 					zeroPackageEntity.setZeroPackageStatus("3");
 					zeroPackageEntity.setCategoryName(w.getFirsts());
 					zeroPackageEntity.setType("3");
 					zeroPackageEntity.setRealityQuantity(0);
 					packageEntityList.add(zeroPackageEntity);
+					//进行零担冻结数量维护
+					distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
+						.setSql("delivery_quantity = delivery_quantity +"+zeroPackageEntity.getQuantity())
+						.eq(DistributionParcelNumberEntity::getParcelListId,zeroPackageEntity.getParcelListId())
+						.eq(DistributionParcelNumberEntity::getStockArticleId,zeroPackageEntity.getStockArticleId())
+					);
 				});
-
 			}
-
 			if (!packageEntityList.isEmpty()) {
 				distributionZeroPackageService.saveBatch(packageEntityList);
+			}else {
+				log.warn("没有品类数据");
+				return 0;
 			}
-
-		} else {
-			log.warn("没有品类数据");
-			return 0;
 		}
-
 		return 1;
 	}
 
@@ -1937,6 +1943,25 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
 							);
 						}
+					}else {
+						List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+							.eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillStock.getBillLadingId())
+							.eq(DistributionReservationZeroPackageEntity::getStockArticleId, distrilbutionBillStock.getStockArticleId())
+							.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+						);
+						if (!reservationZeroPackageEntities.isEmpty()) {
+							for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
+								//进行预约数量回退
+								distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
+									.setSql("delivery_quantity = delivery_quantity -"+ reservationZeroPackageEntity.getQuantity())
+									.eq(DistributionParcelNumberEntity::getId,reservationZeroPackageEntity.getParcelListId())
+									.eq(DistributionParcelNumberEntity::getStockArticleId,reservationZeroPackageEntity.getStockArticleId())
+								);
+
+
+							}
+						}
+
 					}
 				}
 				distrilbutionBillStock.setOrderStatus("2");