备货库位BUG修复

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

@@ -1438,7 +1438,6 @@ public class DistributionStockupAppController extends BladeController {
 						entity.setOutboundType(stockupEntity.getTypeService());
 //						entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 //						entity.setStockupArea(stockupDTO.getStockupAllocationName());
-						distributionStockService.save(entity);
 //						//修改备货时间
 						distributionAsyncService.updateStockupStockListDate(stockupDTO);
 //								dataSourceTransactionManager.commit(transactionStatus);//提交
@@ -1469,7 +1468,9 @@ public class DistributionStockupAppController extends BladeController {
 							jsonObject.put("type", 2);
 							jsonObject.put("num", 1);
 							warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+							entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 						}
+						distributionStockService.save(entity);
 
 						//扫码成功
 						return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);

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

@@ -362,9 +362,15 @@ public class DistrilbutionBillLadingController extends BladeController {
 		return  distrilbutionBillLadingService.batchSign(distrilbutionBillLading);
 	}
 
-
-
-
+	/**
+	 * 查询自提单的包件ID列表
+	 */
+	@GetMapping("/getBillLadingPackageIds")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "查询自提单的包件ID列表", notes = "传入ids")
+	public R getBillLadingPackageIds( @RequestParam Long id,@RequestParam Long orderId) {
+		return  distrilbutionBillLadingService.getBillLadingPackageIds(id,orderId);
+	}
 
 	/**
 	 * 导出数据

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

@@ -270,4 +270,11 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @return
 	 */
 	DistributionBillLadingExcelDTO exportDistributionBillLadingDetail(Long id);
+
+	/**
+	 * 查询自提单的包件ID列表
+	 * @param id
+	 * @return
+	 */
+	R getBillLadingPackageIds(Long id,Long orderId);
 }

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

@@ -2623,8 +2623,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		stockEntity.setGoodsName(stockArticleEntity.getDescriptionGoods());
 		stockEntity.setMarketId(stockArticleEntity.getMallId());
 		stockEntity.setReservationCode(reservationEntity.getReservationCode());
-		stockEntity.setStockupArea(stockupDTO.getStockupAllocationName());
-//		stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 		if (Func.isNotEmpty(stockupDTO.getAllocationId())) {
 			log.info(method + "库位备货");
 			//查询库位零担
@@ -2692,7 +2690,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 			log.info(method + "无库位无托盘备货");
 		}
-		distributionStockService.save(stockEntity);
 		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("warehouseId", myCurrentWarehouse.getId());
@@ -2702,7 +2699,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			jsonObject.put("num", stockupDTO.getNum());
 			//备货库位上架
 			warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+			stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 		}
+		distributionStockService.save(stockEntity);
 		return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
 	}
 

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

@@ -1362,6 +1362,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return distributionBillLadingExcelDTO;
 	}
 
+	@Override
+	public R getBillLadingPackageIds(Long id,Long orderId) {
+		List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
+			.eq(DistrilbutionBillPackageEntity::getBillLadingId, id)
+			.eq(DistrilbutionBillPackageEntity::getStockArticleId, orderId)
+			.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2")
+		);
+		if (list.isEmpty()) {
+			return null;
+		}
+		return R.data(list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()));
+	}
+
 	/**
 	 * 转换老系统的ID
 	 *