Merge branch 'dev' into pre-production

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

@@ -5091,7 +5091,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (parcelListEntity.getConditions() != 2) {
 			return Resp.scanFail("当前包件不是库存品", "当前包件不是库存品");
 		}
-		if (OrderPackageGroundingStatusConstant.yishangjia.getValue().equals(parcelListEntity.getOrderPackageGroundingStatus())) {
+		if (!OrderPackageGroundingStatusConstant.yishangjia.getValue().equals(parcelListEntity.getOrderPackageGroundingStatus())) {
 			return Resp.scanFail("当前库存品未上架", "当前库存品未上架");
 		}
 		//查询计划是否正常
@@ -6360,7 +6360,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (parcelListEntity.getConditions() != 2) {
 			return Resp.scanFail("当前包件不是库存品", "当前包件不是库存品");
 		}
-		if (OrderPackageGroundingStatusConstant.yishangjia.getValue().equals(parcelListEntity.getOrderPackageFreezeStatus())) {
+		if (!OrderPackageGroundingStatusConstant.yishangjia.getValue().equals(parcelListEntity.getOrderPackageGroundingStatus())) {
 			return Resp.scanFail("当前库存品未上架", "当前库存品未上架");
 		}
 		//查询计划是否正常