Merge branch 'pre-production'

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java

@@ -87,4 +87,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String otherFee;
 
 
+
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -48,6 +48,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -57,10 +58,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -88,6 +86,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
+	private final BladeRedis bladeRedis;
+
 
 	@Override
 	public IPage<BasicdataGoodsAllocationVO> selectBasicdataGoodsAllocationPage(IPage<BasicdataGoodsAllocationVO> page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) {
@@ -278,6 +278,12 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 		boolean update = this.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
 			.set(BasicdataGoodsAllocationEntity::getEnableStatus, 1)
 			.in(BasicdataGoodsAllocationEntity::getId, Func.toLongList(ids)));
+
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseService.getMyCurrentWarehouse();
+		if(Objects.isNull(myCurrentWarehouse)){
+			bladeRedis.del("warehouse:all:allocationIds:" + myCurrentWarehouse.getId());
+		}
+
 		return update ? R.success("成功") : R.fail("失败");
 	}
 
@@ -293,6 +299,13 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 		boolean update = this.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
 			.set(BasicdataGoodsAllocationEntity::getEnableStatus, 2)
 			.in(BasicdataGoodsAllocationEntity::getId, Func.toLongList(ids)));
+
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(!Objects.isNull(myCurrentWarehouse)){
+			bladeRedis.del("warehouse:all:allocationIds:" + myCurrentWarehouse.getId());
+		}
+
+
 		return update ? R.success("成功") : R.fail("失败");
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -28,10 +28,8 @@ import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.dto.BasicdataGoodsShelfDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
-import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
 import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
@@ -47,6 +45,7 @@ import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -93,6 +92,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 
 	private IBasicdataWarehouseService basicdataWarehouseService;
 
+	private BladeRedis bladeRedis;
+
 
 
 
@@ -137,6 +138,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			log.error("仓库货区信息不合法");
 			throw new RuntimeException("请完善货区信息!!!");
 		}
+
+		Long warehouseId = basicdataGoodsShelfDTO.getWarehouseId();
+
 //		BasicdataWarehouseEntity basicdataWarehouseVO = basicdataWarehouseClient.getMyCurrentWarehouse();
 //		if (Objects.isNull(basicdataWarehouseVO)){
 //			throw new RuntimeException("当前登录人没有选择仓库!!!");
@@ -194,6 +198,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 //			}
 //		}
 		//	basicdataGoodsAllocationService.saveBatch(arrayList);
+		bladeRedis.del("warehouse:all:allocationIds:" + warehouseId);
 		return result;
 	}
 
@@ -206,8 +211,12 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			return result;
 		}
 		BasicdataGoodsShelfEntity goodsShelfEntity = this.getById(basicdataGoodsShelfDTO.getId());
+		Long warehouseId = goodsShelfEntity.getWarehouseId();
 		BeanUtils.copyProperties(basicdataGoodsShelfDTO, goodsShelfEntity);
 		result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(goodsShelfEntity));
+
+		bladeRedis.del("warehouse:all:allocationIds:" + warehouseId);
+
 		return result;
 	}
 
@@ -242,6 +251,12 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			.in(BasicdataGoodsAllocationEntity::getGoodsShelfId, longs)
 		);
 		int i = basicdataGoodsShelfMapper.deleteBatchIds(longs);
+
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(!Objects.isNull(myCurrentWarehouse)){
+			bladeRedis.del("warehouse:all:allocationIds:" + myCurrentWarehouse.getId());
+		}
+
 		return i > 0 ? R.success("删除成功") : R.fail("删除失败");
 	}
 
@@ -662,6 +677,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 				}
 			}
 		}
+		bladeRedis.del("warehouse:all:allocationIds:" + ck);
 		return R.fail("无法新增");
 
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -158,7 +158,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 		String content = "";
 		if (Objects.isNull(basicdataStoreContact.getId())){
 			//新增
-			content = "新增品牌-->["+basicdataStoreContact.getLinkman()+"]";
+			content = "新增联系人-->["+basicdataStoreContact.getLinkman()+"]";
 		}else {
 			//修改
 			BasicdataStoreContactEntity contactEntity = this.getById(basicdataStoreContact.getId());

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -118,7 +118,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		basicdataClientLogEntity.setOperator(AuthUtil.getNickName());
 		String content = "";
 		if (Objects.isNull(basicdataTripartiteMall.getId())) {
-			String str = basicdataTripartiteMall.getTripartiteCoding().isEmpty() ? "空" : basicdataTripartiteMall.getTripartiteCoding();
+			String str = Func.isEmpty(basicdataTripartiteMall.getTripartiteCoding()) ? "空" : basicdataTripartiteMall.getTripartiteCoding();
 			//新增
 			content = "新增三方商场-->[名称:" + basicdataTripartiteMall.getTripartiteMall() + ",编码:" + str + ",品牌:" + basicdataTripartiteMall.getBrandName() + "]";
 			basicdataClientLogEntity.setContent(content);

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

@@ -138,20 +138,26 @@ public class DistrilbutionBillLadingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distrilbutionBillLading")
 	public R<IPage<DistrilbutionBillLadingVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
-		IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
+		try {
-		List<DistrilbutionBillLadingVO> records = pages.getRecords();
+			IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
-		records.forEach( i ->{
+			List<DistrilbutionBillLadingVO> records = pages.getRecords();
-			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
+			records.forEach( i ->{
-			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
+				i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
-			//查询图片数据
+				i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
-			// 遍历BillLadingStatusConstant的所有枚举值
+				//查询图片数据
-			Arrays.stream(BillLadingStatusConstant.values())
+				// 遍历BillLadingStatusConstant的所有枚举值
-				.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
+				Arrays.stream(BillLadingStatusConstant.values())
-				.findFirst() // 找到第一个匹配的枚举值
+					.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
-				.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
+					.findFirst() // 找到第一个匹配的枚举值
-
+					.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
-		});
+
-		return R.data(pages);
+			});
+			return R.data(pages);
+		}catch (Exception e){
+			log.error(e.getMessage(), e);
+		}
+		return R.data(null);
+
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java

@@ -179,6 +179,8 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	private String packageIds;
 	// 1 不是零担 2 是零担
 	private String zeroType;
+	private String pickUpTimeStart;
+	private String pickUpTimeEnd;
 
 	@Data
 	public static  class Print{

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

@@ -353,18 +353,22 @@
         FROM
         logpm_warehouse_updown_goods lwug
         LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = lwug.association_id
+        LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
         WHERE
         lwug.association_type != 4
         AND ldpl.conditions = 2
         AND ldpl.warehouse_id = #{warehouseId}
+        AND ldsa.mall_name = #{mallName}
         GROUP BY
         ldpl.material_code
         ) AS t1 ON t.cargo_number = t1.material_code
         LEFT JOIN ( SELECT association_value, GROUP_CONCAT( DISTINCT ( allocation_id )) AS allocation_ids FROM
-        logpm_warehouse_updown_goods WHERE warehouse_id = #{warehouseId} AND association_type = 4 GROUP BY
+        logpm_warehouse_updown_goods WHERE warehouse_id = #{warehouseId} AND association_type = 4 AND market_name = #{mallName}  GROUP BY
         association_value ) AS t2 ON t.cargo_number = t2.association_value
         where ldslNew.is_deleted = 0
         AND ldslNew.warehouse_id=#{warehouseId}
+        GROUP BY
+        ldslNew.cargo_number
     </select>
 
     <select id="selectOrderNumByReservationId" resultType="Integer">

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

@@ -180,6 +180,15 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 	 */
 	List<SignPushDataUnitDTO> selectPushOldInventorySigning(@Param("id")Long billId);
 
+	/**
+	 * 查询视图
+	 * @param page
+	 * @param distrilbutionBillLadingDTO
+	 * @param collect
+	 * @return
+	 */
+	IPage<DistrilbutionBillLadingVO> getAllBillLadingByView(IPage<Object> page,@Param("param") DistrilbutionBillLadingDTO distrilbutionBillLadingDTO, List<Long> collect);
+
 //	Page<DistrilbutionBillLadingAppVO> getInventoryPage(IPage<Object> page, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity);
 
 }

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

@@ -172,6 +172,12 @@
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>
+            <if test="param.pickUpTime != null ">and
+                DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
+            </if>
+            <if test="param.pickUpTimeStart != null">and
+                AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
+            </if>
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
                 and dbl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
@@ -181,9 +187,6 @@
             <if test="param.warehouseEntryTime != null ">and date(t.warehouseEntryTime) =
                 #{param.warehouseEntryTime}
             </if>
-            <if test="param.pickUpTime != null ">and date(dbl.pick_up_time) =
-                #{param.pickUpTime}
-            </if>
             <if test="param.startDate != null ">and t.warehouseEntryTime between #{param.startDate} and
                 #{param.entDate}
             </if>
@@ -982,6 +985,29 @@
         GROUP BY
         ldsld.id
     </select>
+    <select id="getAllBillLadingByView" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
+        SELECT 	id,
+        orderCode,
+        serviceNumber,
+        consigneeUnit,
+        customerName,
+        customerTelephone,
+        waybillNumber,
+        typeService,
+        warehouseEntryTime,
+        storageFee,
+        totalNumber,
+        certificateType,
+        pickUpTime,
+        consignee,
+        deliveryDocument,
+        conditions,
+        totalCost,
+        pickUpPlate,
+        pickupBatch,
+        stopNum,
+        productInformation  FROM bill_lading_view
+    </select>
 
 
 </mapper>

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

@@ -131,11 +131,12 @@
         END handQuantity,
         (select IFNULL(sum(quantity) ,0) from  logpm_distribution_bill_lading_scan
         where  stock_article_id = ldsa.id AND bill_lading_id =  #{param.billLadingId}  AND is_deleted = 0 ) pick_up_quantity,
-        CASE
+        CASE ldsa.is_zero
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) = 0 THEN '30'
+        WHEN 1 THEN
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) = 0 THEN '10'
+        IF(( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) <  0 THEN '20'
+        ELSE
-        END AS conditions,
+        IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT count( id ) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
+        END conditions,
         (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,

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

@@ -1854,7 +1854,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			List<Long> ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
 			//查询包件
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(ids);
-			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			if (Func.isNotEmpty(packageIds)) {
 				distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
 					.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())

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

@@ -2353,18 +2353,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		List<Long> collect = null;
 
-
+		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
 		if (Func.isNotEmpty(myCurrentWarehouse)) {
 			collect = new ArrayList<>();
 			collect.add(myCurrentWarehouse.getId());
+
 		} else {
+//			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
 			collect = warehouseList.stream()
 				.map(BasicdataWarehouseEntity::getId)
 				.collect(Collectors.toList());
 		}
+		distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 
 
-		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
 
 		// 获取所有的提货单ID
@@ -2403,8 +2405,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		records.forEach(i -> {
 			if (groupedEntities != null) {
 				List<DistributionDeliveryChargeEntity> list = groupedEntities.get(i.getId());
-				list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
+				if (!Func.isEmpty(groupedEntities.get(i.getId()))){
-				i.setList(list);
+					list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
+					i.setList(list);
+				}
+
 			}
 			if (groupDistributionPrintEntityEntities != null) {
 				List<DistributionPrintEntity> list1 = groupDistributionPrintEntityEntities.get(i.getId());

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

@@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -254,6 +255,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			.ne(DistrilbutionBillStockEntity::getOrderStatus, "2")
 		);
 		List<Long> ids = new ArrayList<>();
+		List<Long> completeIds = new ArrayList<>();
 		if (Func.isNotEmpty(entityList)){
 			for (DistrilbutionBillStockEntity distrilbutionBillStockEntity : entityList) {
 				List<DistrilbutionBillPackageEntity> packageEntities = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
@@ -266,9 +268,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 					ids.add(distrilbutionBillStockEntity.getId());
 				}else {
 					int sum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
+					int planNum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
 					if (sum == 0){
 						ids.add(distrilbutionBillStockEntity.getId());
 					}
+					if (Objects.equals(sum,planNum)){
+						completeIds.add(distrilbutionBillStockEntity.getId());
+					}
 				}
 			}
 		}
@@ -278,6 +284,12 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 				.in(DistrilbutionBillStockEntity::getId, ids)
 			);
 		}
+		if (Func.isNotEmpty(completeIds)){
+			this.update(new UpdateWrapper<DistrilbutionBillStockEntity>().lambda()
+				.set(DistrilbutionBillStockEntity::getConditions, "30")
+				.in(DistrilbutionBillStockEntity::getId, completeIds)
+			);
+		}
 	}
 
 	@Override

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -147,7 +147,7 @@ public class FactoryXxlJob {
 			//XxlJobLogger.log("日志对象 {}", orderLogEntity);
 			Map<String, List> map = orderService.dataRelative(orderLogEntity);
 			List<StationOrderEntity> dataList = map.get(StationOrderEntity.class.getName());
-			if (dataList.size() == 0) {
+			if (dataList.isEmpty()) {
 				//XxlJobLogger.log("本次解析操作没有数据");
 				//更新数据库请求日志状态
 				orderLogEntity.setStatus(0);
@@ -175,6 +175,11 @@ public class FactoryXxlJob {
 					}
 				}
 			});
+
+			/*************** SNM 存在  相同的车次  多次推送 重复的包件的操作**************/
+			// 需要移除 当前合同号下的已经存在的包件
+
+
 			dataList.forEach(v -> {
 				for (int i = 0; i < staorderPackagesEntityList.size(); i++) {
 					if (staorderPackagesEntityList.get(i).getTcPoa014().equals(v.getTcWlb008())) {
@@ -184,7 +189,7 @@ public class FactoryXxlJob {
 			});
 
 			// 插入数据库
-			if (staorderPackagesEntityList != null && staorderPackagesEntityList.size() != 0) {
+			if (staorderPackagesEntityList != null && !staorderPackagesEntityList.isEmpty()) {
 				//XxlJobLogger.log("保存对象StaorderPackagesEntity {}", staorderPackagesEntityList);
 				staorderPackagesService.saveBatch(staorderPackagesEntityList);
 			}

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java

@@ -157,6 +157,9 @@ public class OrderServiceImpl implements IOrderService {
 				StaorderPackagesEntity staorderPackagesEntity = new StaorderPackagesEntity();
 				try {
 					buildStationOrderPackageByRelative(orderPackageInfoT,staorderPackagesEntity);
+
+
+
 					staorderPackagesEntityList.add(staorderPackagesEntity);
 				} catch (NoSuchFieldException e) {
 					e.printStackTrace();

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		trainCustomQuery(query, queryWrapper);
 		// 仓库权限
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);
-		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表");
+		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",20L, ReportExcelUtil.SHEETDATANUM);
 	}
 
 	@Override