Merge branch 'dev' into pre-production

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

@@ -756,13 +756,14 @@ public class DistributionStockupAppController extends BladeController {
 						.eq(DistributionParcelListEntity::getWarehouseId, byId.getWarehouseId())
 					);
 					if(ObjectUtils.isNotNull(list) && list.size() > 1){
-						throw new ServiceException("查询到重复包条信息！！");
+						return Resp.scanFail("查询到重复包条信息！！","查询到重复包条信息！！");
 					}
 					if(ObjectUtils.isNull(list)){
-						throw new ServiceException("没有查询到包件信息");
+						return Resp.scanFail("没有查询到包件信息 ! ","没有查询到包件信息 ! ");
 					}
 					if(!list.get(0).getConditions().equals("2")){
-						throw new ServiceException("当前包件不是库存品，无法备货！！");
+						return Resp.scanFail("当前包件不是库存品，无法备货！！","当前包件不是库存品，无法备货！！");
+
 					}
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 					warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());