Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListInfoController.java

@@ -77,7 +77,8 @@ public class DistributionStockListInfoController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockListInfo")
 	public R<IPage<DistributionStockListInfoVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockListInfo, Query query) {
-		IPage<DistributionStockListInfoEntity> pages = distributionStockListInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockListInfo, DistributionStockListInfoEntity.class));
+		IPage<DistributionStockListInfoEntity> pages =distributionStockListInfoService.getStockListInfo(distributionStockListInfo,Condition.getPage(query));
+//		IPage<DistributionStockListInfoEntity> pages = distributionStockListInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockListInfo, DistributionStockListInfoEntity.class));
 		return R.data(DistributionStockListInfoWrapper.build().pageVO(pages));
 	}
 

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

@@ -54,4 +54,7 @@ public interface DistributionStockListInfoMapper extends BaseMapper<Distribution
 	List<DistributionStockListInfoVO> exportDistributionStockListInfo(@Param("ew") Wrapper<DistributionStockListInfoEntity> queryWrapper);
 
 	Map<String, Object> selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(@Param("associationValue") String associationValue, @Param("warehouseId") Long warehouseId, @Param("cargoNumber") String cargoNumber);
+
+    IPage<DistributionStockListInfoEntity> getStockListInfo(@Param("par")IPage<Object> page, Map<String, Object> distributionStockListInfo);
+
 }

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

@@ -91,5 +91,17 @@
         );
 
     </select>
-
+    <select id="getStockListInfo" resultType="com.logpm.distribution.entity.DistributionStockListInfoEntity">
+        SELECT * FROM logpm_distribution_stock_list_info
+        WHERE
+       ( incoming_batch=#{par.incomingBatch}
+        AND
+        market_id =#{par.marketId}
+        AND
+        material_id=#{par.materialId}
+        AND
+        service_type=#{par.serviceType}
+        AND
+        warehouse_id=#{par.warehouseId} ) OR stock_list_id =#{par.stockListId}
+    </select>
 </mapper>

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

@@ -51,4 +51,11 @@ public interface IDistributionStockListInfoService extends BaseService<Distribut
 	 */
 	List<DistributionStockListInfoExcel> exportDistributionStockListInfo(Map<String, Object> distributionStockListInfo);
 
+	/**
+	 * 查询入库明细记录
+	 * @param distributionStockListInfo
+	 * @param page
+	 * @return
+	 */
+    IPage<DistributionStockListInfoEntity> getStockListInfo(Map<String, Object> distributionStockListInfo, IPage<Object> page);
 }

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

@@ -73,4 +73,15 @@ public class DistributionStockListInfoServiceImpl extends BaseServiceImpl<Distri
 		return list;
 	}
 
+	/**
+	 * @param distributionStockListInfo
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public IPage<DistributionStockListInfoEntity> getStockListInfo(Map<String, Object> distributionStockListInfo, IPage<Object> page) {
+
+		return baseMapper.getStockListInfo(page, distributionStockListInfo);
+	}
+
 }