修改商配零担查询

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

@@ -280,6 +280,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "托盘名称")
 	private String trayName;
+	/**
+	 * 来源 1 订单 2 导入
+	 */
+	@ApiModelProperty(value = "来源 1 订单 2 导入")
+	private String sourceType;
 
 
 

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

@@ -267,6 +267,13 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "sku")
 	private String sku;
+
+	/**
+	 * 来源
+	 */
+	@ApiModelProperty(value = "来源 ")
+	private String sourceType;
+
 	/**
 	 *  上架时间
 	 */

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

@@ -148,6 +148,18 @@ public class DistributionParcelListController extends BladeController  {
 		return R.data(pages);
 	}
 
+
+//	/**
+//	 *
+//	 */
+//	@GetMapping("/zeroMaterial")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "查询零担物料数据", notes = "传入distributionParcelList")
+//	public R<List<DistributionParcelListZeroVO>> getZeroMaterial(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
+//		List<DistributionParcelListZeroVO> pages = distributionParcelListService.getZeroMaterial(distributionParcelList);
+//		return R.data(pages);
+//	}
+
 	/**
 	 * 修改零担在库数量
 	 */

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

@@ -903,19 +903,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				}
 			}else{
 				//商，市
-				//查询包件数据
-				List<DistributionReservationPackageEntity> packageEntities = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda()
-					.eq(DistributionReservationPackageEntity::getReservationId, stockupDTO.getReservationId())
-					.eq(DistributionReservationPackageEntity::getPacketBarStatus, '1')
+				//查询数据
+				List<DistributionStockupInfoEntity> distributionStockupInfoEntities = distributionStockupInfoMapper.selectList(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.eq(DistributionStockupInfoEntity::getStockupId, stockupDTO.getStockupId())
 				);
-				if(!packageEntities.isEmpty()){
+				distributionStockupInfoEntities.forEach(v ->{
+					//查询包件数据
+					List<DistributionReservationPackageEntity> packageEntities = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+						.eq(DistributionReservationPackageEntity::getReservationId, v.getReservationId())
+						.eq(DistributionReservationPackageEntity::getPacketBarStatus, '1')
+					);
 					packageEntities.forEach( i ->{
-						if(getDoneStockUp(i.getStockArticleId(), i.getParceListId(), stockupDTO.getReservationId(), stockupDTO.getTypeService())){
+						if(getDoneStockUp(i.getStockArticleId(), i.getParceListId(), v.getReservationId(), stockupDTO.getTypeService())){
 							//没有扫
 							s.set(true);
 						}
 					});
-				}else{
+				});
+				if(!s.get()){
 					//查询有没有库存品
 					List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationStocklistMapper.selectList(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
 						.eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
@@ -933,9 +938,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					stockupEntity.setFixTime(new Date());
 				}
 			}
-
-
-
 			if(s.get()){
 				stockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue());
 			}else{

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

@@ -491,6 +491,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			listEntity.setQuantityStock(quantity + quantityStock);
 			distributionStockListService.updateById(listEntity);
 		}else{
+			distributionStockListEntity.setServiceType("1");//订单
 			distributionStockListService.save(distributionStockListEntity);
 		}
 		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
@@ -506,6 +507,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
 //		distributionStockListInfo.setLicensePlate(distributionStockArticleEntity.get); //车牌
 		distributionStockListInfo.setDespatch(distributionStockArticleEntity.getWaybillNumber()); //物流单号
+		distributionStockListInfo.setServiceType("1");
 		distributionStockListInfoService.save(distributionStockListInfo);
 		return distributionStockArticleEntity;
 	}

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

@@ -2176,12 +2176,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if(i.getQuantity() > byId.getQuantity()){
 				return Resp.scanFail(i.getCategoryName()+"备货数量大于待备货数量！",i.getCategoryName()+"备货数量大于待备货数量！");
 			}
+			Optional<StockupZeroVO> first = stockupDTO.getList().stream().filter(q -> i.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= i.getQuantity() && q.getQuantity() > 0).findFirst();
 
 			if(ObjectUtils.isNotNull(one)){
 				//修改数量
 				DistributionStockEntity stockEntity = new DistributionStockEntity();
 				stockEntity.setId(one.getId());
-				stockEntity.setStockQuantity(i.getQuantity());
+				stockEntity.setStockQuantity(first.get().getQuantity());
 				distributionStockService.updateById(stockEntity);
 			}else{
 				DistributionStockEntity stockEntity = new DistributionStockEntity();
@@ -2197,12 +2198,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				stockEntity.setGoodsName(i.getCategoryName());
 				stockEntity.setOutboundType("3");
 				stockEntity.setType(3);
-				stockEntity.setStockQuantity(i.getQuantity());// 备货数量
+				stockEntity.setStockQuantity(first.get().getQuantity());// 备货数量
 				stockEntityList.add(stockEntity);
 			}
 			//修改备货数量
 			DistributionReservationZeroPackageEntity reservationZeroPackageEntity = new DistributionReservationZeroPackageEntity();
-			reservationZeroPackageEntity.setRealityQuantity(i.getQuantity());
+			reservationZeroPackageEntity.setRealityQuantity(first.get().getQuantity());
 			reservationZeroPackageEntity.setId(i.getId());
 			boolean b = reservationZeroPackageService.updateById(reservationZeroPackageEntity);
 			if(!b){
@@ -2223,6 +2224,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}else{
 			if(collect.size() == xiugai){
+				//修改备货状态
+				distributionAsyncService.stockZero(stockupDTO);
 				return Resp.scanSuccess("备货成功！","备货成功！");
 			}
 			return Resp.scanFail("备货失败！","备货失败！");

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

@@ -71,7 +71,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 提货单 服务实现类
@@ -137,6 +136,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			las = true;
 			//修改
 			this.updateById(distrilbutionBillLading);
+			if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty()){
+				updateBillPackeg(distrilbutionBillLading);
+			}
 			//修改零担数据
 			updetaParcelNum(distrilbutionBillLading);
 			//修改图片
@@ -453,6 +455,61 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return true;
 	}
 
+	/**
+	 * 修改提货包件数据
+	 * @return
+	 */
+	public Boolean updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading){
+		 distrilbutionBillLading.getBillPackageEntityList().stream().collect(Collectors.groupingBy(DistrilbutionBillPackageEntity::getStockArticleId))
+			.forEach((k,v) ->{
+				List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
+					.eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLading.getId())
+					.eq(DistrilbutionBillPackageEntity::getStockArticleId, k)
+				);
+				//没有数据
+				if(list.isEmpty()){
+					throw new ServiceException("没有包件数据！");
+				}
+				List<Long> sc = new ArrayList<>();
+				Iterator<DistrilbutionBillPackageEntity> iterator = v.iterator();
+				list.stream().forEach( i ->{
+					Boolean cz = false;
+					while (iterator.hasNext()){
+						DistrilbutionBillPackageEntity next = iterator.next();
+						if(i.getParceListId().equals(next.getParceListId())){
+							//存在
+							iterator.remove();
+							cz = true;
+							continue;
+						}
+					}
+					if(!cz){
+						//删除
+						sc.add(i.getId());
+					}
+
+				});
+				//新增包件
+				if(!v.isEmpty()){
+					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
+					v.stream().forEach(i ->{
+						DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
+						BeanUtils.copyProperties(i,billPackageEntity);
+						billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
+						packageEntityList.add(billPackageEntity);
+					});
+					distrilbutionBillPackageService.saveBatch(packageEntityList);
+				}
+				//删除包件
+				if(!sc.isEmpty()){
+					distrilbutionBillPackageService.deleteLogic(sc);
+				}
+			});
+		return true;
+	}
+
+
+
 	/**
 	 * 修改零担
 	 * @param distrilbutionBillLadingDTO
@@ -1461,7 +1518,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					//查询
 					DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId());
 					DistributionParcelNumberEntity one = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, i.getId()));
-					if(ObjectUtils.isNotNull(one) && i.getQuantity() <= one.getHandQuantity()) {
+
+					int i1 = one.getDeliveryQuantity() + i.getQuantity();
+					//全部数据不能大于预约数
+					if(ObjectUtils.isNotNull(one) && i1 <= one.getHandQuantity() ) {
 						nu.addAndGet(i.getQuantity());
 						DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
 						parcelNumberEntity.setId(one.getId());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -328,6 +328,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			distributionStockListEntity.setOutboundQuantity(0); //出库数量
 			distributionStockListEntity.setUnpackingQuantity(0); //库存拆包数量
 			distributionStockListEntity.setSku(warehousingDetail.getSku());
+			distributionStockListEntity.setSourceType("2");//导入
 
 			if(Func.isNotEmpty(queryData)){
 //				distributionStockListEntity.setQuantityStock( queryData.getQuantityStock()+num  ); //库存数量
@@ -345,6 +346,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 
 			DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
 			BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);
+			distributionStockListInfo.setSourceType("2");//导入
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}