Merge branch 'fix_bug11-20' into dev

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

@@ -761,7 +761,9 @@ public class DistributionStockupAppController extends BladeController {
 					if(ObjectUtils.isNull(list)){
 						return Resp.scanFail("没有查询到包件信息 ! ","没有查询到包件信息 ! ");
 					}
-					if(!list.get(0).getConditions().equals("2")){
+					log.info(">>>>> obj {}",list.get(0).getConditions());
+					DistributionParcelListEntity distributionParcelListEntity = list.get(0);
+					if(2!=distributionParcelListEntity.getConditions()){
 						return Resp.scanFail("当前包件不是库存品，无法备货！！","当前包件不是库存品，无法备货！！");
 
 					}