Merge branch 'dev' into pre-production

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -450,7 +450,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		// 查询包件数据
 		List<StatisticsDistributionPackageEntity> distributionPackageEntities = distributionPackageService.list(new QueryWrapper<StatisticsDistributionPackageEntity>().lambda().eq(StatisticsDistributionPackageEntity::getOrderInfoId, id));
 		// 校验是否全部配送完成
-		if (CollUtil.isEmpty(distributionPackageEntities) || distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> NumberUtil.equals(0, distributionPackageEntity.getIsSign()))) {
+		if (CollUtil.isEmpty(distributionPackageEntities) || distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == null || NumberUtil.equals(0, distributionPackageEntity.getIsSign()))) {
 			log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。");
 			throw new CustomerException(405, "订单未全部配送完成，无法计算。");
 		}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml

@@ -68,19 +68,23 @@
         <where>
             lwup.is_deleted = 0
             <if test="param.warehouseName!=null and param.warehouseName!=''">
-                and ldpl.warehouse like concat('%',#{param.warehouseName},'%')
+                and ldpl.warehouse like concat(#{param.warehouseName},'%')
             </if>
             <if test="param.orderCode!=null and param.orderCode!=''">
-                and ldpl.order_code like concat('%',#{param.orderCode},'%')
+                and ldpl.order_code like concat(#{param.orderCode},'%')
             </if>
             <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
                 and lwup.warehouse_id in
                 <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
+                AND ldpl.warehouse_id IN
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="param.orderPackageCode!=null and param.orderPackageCode!=''">
-                and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
+                and ldpl.order_package_code like concat(#{param.orderPackageCode},'%')
             </if>
             <if test="param.bindingType!=null and param.bindingType!=''">
                 and lwup.binding_type = #{param.bindingType}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java

@@ -62,17 +62,23 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 
 	@Override
 	public IPage<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage<WarehouseUpdownGoodsLogVO> page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog) {
-		//获取当前登录人仓库
+
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isEmpty(myCurrentWarehouse)){
 			List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
 			List<Long> collect = myWatchWarehouse.stream()
 				.map(BasicdataWarehouseEntity::getId)
 				.collect(Collectors.toList());
 			warehouseUpdownGoodsLog.setWarehouseIdList(collect);
-		//查询操作员
-//		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
-//			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
-//			log.info("listR>>>>{}",listR);
-//		}
+		}else{
+			//获取当前登录人仓库
+			List<Long> collect = Arrays.asList(myCurrentWarehouse.getId());
+			warehouseUpdownGoodsLog.setWarehouseIdList(collect);
+		}
+
+
+
+
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}