Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -350,4 +350,5 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
     List<String> findSignOrderPackageCodes(@Param("orderPackageCodeList") List<String> orderPackageCodeList);
 
+    List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("conditions") Integer conditions);
 }

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

@@ -2336,4 +2336,14 @@
         and is_deleted = 0
     </select>
 
+    <select id="findListByOrderCodeAndWarehouseIdAndConditions" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        /*FORCE_MASTER*/select *
+        from logpm_distribution_parcel_list
+        where order_code = #{orderCode}
+          and warehouse_id = #{warehouseId}
+          and conditions = #{conditions}
+          and is_deleted = 0
+    </select>
+
+
 </mapper>

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

@@ -324,4 +324,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	List<DistributionParcelListEntity> findListByOrderPackageCodesAndCode(List<String> orderPackageCodeGroup);
 
     List<String> findSignOrderPackageCodes(List<String> orderPackageCodeList);
+
+	List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(String orderCode, Long warehouseId, Integer iconditions);
 }

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

@@ -1676,4 +1676,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public List<String> findSignOrderPackageCodes(List<String> orderPackageCodeList) {
 		return baseMapper.findSignOrderPackageCodes(orderPackageCodeList);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(String orderCode, Long warehouseId, Integer conditions) {
+		return baseMapper.findListByOrderCodeAndWarehouseIdAndConditions(orderCode,warehouseId,conditions);
+	}
 }

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

@@ -1520,12 +1520,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		Integer totalNumber = stockArticleEntity.getTotalNumber();
 		//查询入库件数
-		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("order_code", stockArticleEntity.getOrderCode())
-			.eq("warehouse_id", stockArticleEntity.getWarehouseId())
-			.eq("conditions", 1)
-			.eq("is_deleted", 0);
-		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
+//		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.eq("order_code", stockArticleEntity.getOrderCode())
+//			.eq("warehouse_id", stockArticleEntity.getWarehouseId())
+//			.eq("conditions", 1)
+//			.eq("is_deleted", 0);
+//		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
+
+		List<DistributionParcelListEntity> list = distributionParcelListService.findListByOrderCodeAndWarehouseIdAndConditions(stockArticleEntity.getOrderCode(), stockArticleEntity.getWarehouseId(), 1);
+
+
 
 		if(CollUtil.isNotEmpty(list)){
 			log.info("##################updateOrderInfoByDistributionStockArticleEntity: 查询到的包件数据 {} 条",list.size());