Merge remote-tracking branch 'origin/dev' 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("当前包件不是库存品，无法备货！！","当前包件不是库存品，无法备货！！");
 
 					}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -124,6 +124,7 @@
         ldpl.material_id materialId,
         ldpl.material_name materialName,
         ldpl.brand_name brandName,
+        ldpl.order_package_status orderPackageStatus,
         ldpl.order_package_freeze_status orderPackageFreezeStatus,
         ldpl.order_package_grounding_status orderPackageGroundingStatus,
         ldpl.order_package_stockup_status orderPackageStockupStatus,
@@ -195,6 +196,9 @@
             <if test="param.conditions !='' and param.conditions != null">
                 and ldpl.conditions = #{param.conditions}
             </if>
+            <if test="param.orderPackageStatus !='' and param.orderPackageStatus != null">
+                and ldpl.order_package_status = #{param.orderPackageStatus}
+            </if>
 
         </where>