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

blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/NodeInfoVO.java

@@ -0,0 +1,60 @@
+package com.logpm.datasharing.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class NodeInfoVO implements Serializable {
+
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 操作节点   入库-干线发车-干线到达-目的仓配送装车-目的仓配送签收
+	 */
+	@ApiModelProperty(value = "操作节点")
+	private String operateName;
+
+	/**
+	 * 操作网点
+	 */
+	@ApiModelProperty(value = "操作网点")
+	private String operateWarehouseName;
+
+
+	/**
+	 * 操作网点电话
+	 */
+	@ApiModelProperty(value = "操作网点电话")
+	private String operateWarehousePhone;
+
+	/**
+	 * 操作时间
+	 */
+	@ApiModelProperty(value = "操作时间")
+	private Date operateTime;
+
+
+	/**
+	 * 操作件数
+	 */
+	@ApiModelProperty(value = "操作件数")
+	private String operateNumber;
+
+	/**
+	 * 操作车次号
+	 */
+	@ApiModelProperty(value = "操作车次号")
+	private String operateCarNumber;
+
+
+	/**
+	 * 操作计划时间
+	 */
+	@ApiModelProperty(value = "操作计划时间")
+	private Date operatePlanTime;
+
+}

blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/WaybillInfoVO.java

@@ -14,26 +14,29 @@ import java.util.List;
 public class WaybillInfoVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "联系电话")
+	private String contactNumber;
+
 
 	/**
 	 * 运单状态 10部分入库
-	 *
+	 * <p>
 	 * 20入库
-	 *
+	 * <p>
 	 * 30部分中转
-	 *
+	 * <p>
 	 * 40 中转
-	 *
+	 * <p>
 	 * 50 目的仓部分到达
-	 *
+	 * <p>
 	 * 60 目的仓到达
-	 *
+	 * <p>
 	 * 70 配送部分装车
-	 *
+	 * <p>
 	 * 80 配送装车
-	 *
+	 * <p>
 	 * 90 部分签收
-	 *
+	 * <p>
 	 * 100 已签收
 	 */
 	@ApiModelProperty(value = "运单状态")
@@ -46,6 +49,13 @@ public class WaybillInfoVO implements Serializable {
 	@ApiModelProperty(value = "运单号")
 	private String waybillNo;
 
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
 	/**
 	 * 目的仓
 	 */
@@ -53,7 +63,6 @@ public class WaybillInfoVO implements Serializable {
 	private String destinationWarehouseName;
 
 
-
 	/**
 	 * 发站仓
 	 */
@@ -76,15 +85,14 @@ public class WaybillInfoVO implements Serializable {
 	/**
 	 * 总数
 	 */
-	@ApiModelProperty(value = "总数")
+	@ApiModelProperty(value = "运单总数")
 	private Integer totalCount;
 
-
 	/**
-	 * 在途数量
+	 * 订单总数
 	 */
-	@ApiModelProperty(value = "总数")
-	private Integer onWayCount;
+	@ApiModelProperty(value = "订单总数")
+	private Integer orderCount;
 
 
 	/**
@@ -119,19 +127,9 @@ public class WaybillInfoVO implements Serializable {
 	@ApiModelProperty(value = "目的仓数量信息")
 	private WarehouseNumberVO endWarehouseNumber;
 
-	/**
-	 * 配送数量
-	 */
-	@ApiModelProperty(value = "配送数量")
-	private Integer deliveryNum ;
-
-	/**
-	 * 签收数量
-	 */
-	@ApiModelProperty(value = "签收数量")
-	private Integer signNum;
-
 
+	@ApiModelProperty(value = "节点信息")
+	private List<NodeInfoVO> nodeInfoVOList;
 
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -174,6 +174,8 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX + "/findByWaybillNumber")
 	List<DistributionParcelListEntity> findByWaybillNumber(@RequestParam String waybillNumber);
+	@GetMapping(API_PREFIX + "/findByWaybillNumberAndOrderCode")
+	List<DistributionParcelListEntity> findByWaybillNumberAndOrderCode(@RequestParam String waybillNumber, @RequestParam String orderCode);
 
 	@GetMapping(API_PREFIX + "/findEntityListByOrderCodeAndStatus")
 	List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam String packageStatus, @RequestParam String waybillNo);

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IQualityDeliverClient.java

@@ -50,6 +50,23 @@ public interface IQualityDeliverClient {
 	@GetMapping(API_PREFIX + "/findSignListByDate")
 	List<QualityDeliverEntity> findSignListByDate(@RequestParam("signTime") String signTime);
 
+
+	/**
+	 * 更具运单号查询配送信息
+	 *
+	 * @param waybillNumber
+	 * @return
+	 */
+	@GetMapping(API_PREFIX + "/findDeliverByWaybillNumber")
+	List<QualityDeliverEntity> findSignListByWaybillNumber(@RequestParam("waybillNumber") String waybillNumber);
+
+	@GetMapping(API_PREFIX + "/findSignListByWaybillNumberAndOrderCode")
+	List<QualityDeliverEntity> findSignListByWaybillNumberAndOrderCode(@RequestParam("waybillNumber") String waybillNumber,@RequestParam("orderCode") String orderCode);
+
+
+
+
+
 	@PostMapping(API_PREFIX + "/updateWarehouseCost")
 	void updateWarehouseCost(@RequestBody Map<Long, BigDecimal> packageCostMap);
 

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java

@@ -40,6 +40,18 @@ public interface ITrunklineCarsLoadScanClient {
 	void removeLoadScanByIds(@RequestBody List<Long> scanloadIdList);
 
 
+	/**
+	 * 根据运单号查询车辆的装车信息
+	 * @param waybillNo
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/findAllListByWaybillNo")
+	List<TrunklineCarsLoadScanEntity> findAllListByWaybillNo(@RequestParam String waybillNo);
+
+	@GetMapping(API_PREFIX+"/findAllListByWaybillNoAndOrderCode")
+	List<TrunklineCarsLoadScanEntity> findAllListByWaybillNoAndOrderCode(@RequestParam String waybillNo,@RequestParam String orderCode);
+
+
 //	@PostMapping(API_PREFIX+"/addAdvanceReturnId")
 //	Long addAdvanceReturnId(@RequestBody TrunklineAdvanceEntity trunklineAdvanceEntity);
 

blade-service/logpm-data-sharing/pom.xml

@@ -40,11 +40,21 @@
             <artifactId>logpm-warehouse-api</artifactId>
             <version>3.2.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-trunkline-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-data-sharing-api</artifactId>
             <version>3.2.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-system-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
 
     </dependencies>
 

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@@ -1,15 +1,27 @@
 package com.logpm.datasharing.service.impl;
 
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.datasharing.service.ILogpmDataSearchService;
+import com.logpm.datasharing.vo.NodeInfoVO;
 import com.logpm.datasharing.vo.WarehouseNumberVO;
 import com.logpm.datasharing.vo.WaybillInfoVO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.entity.QualityDeliverEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
+import com.logpm.distribution.feign.IQualityDeliverClient;
+import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
+import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import com.logpm.trunkline.feign.ITrunklineCarsLoadScanClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -22,6 +34,11 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 
 	private final IWarehouseWaybillClient warehouseWaybillClient;
 	private final IDistributionParcelListClient distributionParcelListClient;
+	private final ITrunklineCarsLoadScanClient traceCarsLoadScanClient;
+	private final IQualityDeliverClient questualityDeliverClient;
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final ISysClient systemClient;
+	private final ITrunklineWaybillOrderClient trunklineWaybillOrderClient;
 
 	@Override
 	public R data(String type, String order) {
@@ -32,10 +49,9 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 			case "order":
 				// 订单查询
 				return dataOrder(order);
-
 			case "waybill":
 				// 运单查询
-				return R.data(dataWEaybill(order)) ;
+				return R.data(dataWEaybill(order));
 			default:
 				// 需要没有参数的查询全部的情况
 				return R.fail("参数错误");
@@ -46,18 +62,176 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 
 	/**
 	 * 运单查询
+	 *
 	 * @param waybillNo
 	 * @return
 	 */
-	private WaybillInfoVO dataWEaybill(String waybillNo) {
+	private WaybillInfoVO dataWEaybillByOrderCode(String waybillNo,String orderCode) {
 
 		WaybillInfoVO result = new WaybillInfoVO();
-		int temp =0;
 		// todo 查询运单
 		WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(waybillNo);
-		if(Objects.isNull(byWaybillNo)){
+		if (Objects.isNull(byWaybillNo)) {
 			throw new CustomerException("运单信息不存在~");
 		}
+
+		// 获取租户信息
+		R<Tenant> tenant = systemClient.getTenant(AuthUtil.getTenantId());
+		if (tenant.isSuccess() && !Objects.isNull(tenant.getData())) {
+			Tenant data = tenant.getData();
+			result.setContactNumber(data.getContactNumber());
+
+		}
+		result.setOrderCode(orderCode);
+		// 获取到订单在这个运单的件数
+		TrunklineWaybillOrderEntity entityByWaybillNoAndOrderCode = trunklineWaybillOrderClient.findEntityByWaybillNoAndOrderCode(waybillNo, orderCode);
+		if(entityByWaybillNoAndOrderCode != null){
+			result.setOrderCount(entityByWaybillNoAndOrderCode.getTotalNumber());
+		}
+
+
+		result.setWaybillNo(byWaybillNo.getWaybillNo());
+		result.setDestinationWarehouseName(byWaybillNo.getDestinationWarehouseName());
+		result.setDepartureWarehouseName(byWaybillNo.getDepartureWarehouseName());
+		result.setShipper(byWaybillNo.getShipper());
+		result.setShipperName(byWaybillNo.getShipperName());
+		result.setConsignee(byWaybillNo.getConsignee());
+		result.setConsigneeName(byWaybillNo.getConsigneeName());
+		result.setTotalCount(byWaybillNo.getTotalCount());
+
+		List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListClient.findByWaybillNumberAndOrderCode(waybillNo,orderCode);
+		// 按照仓库ID进行分组
+		Map<String, List<DistributionParcelListEntity>> groupedByWarehouse = distributionParcelListEntities.stream()
+			.collect(Collectors.groupingBy(DistributionParcelListEntity::getWarehouse));
+
+		// 判断当前map 中的key长度
+		Set<String> keys = groupedByWarehouse.keySet();
+		List<WarehouseNumberVO> models = null;
+		for (String key : keys) {
+			if (models == null) {
+				models = new ArrayList<>();
+			}
+			WarehouseNumberVO middleWarehouseNumberVO = buildWarehouse(groupedByWarehouse, key);
+			if(middleWarehouseNumberVO!=null){
+				models.add(middleWarehouseNumberVO);
+			}
+		}
+		// 加入中转的数据
+		result.setMiddleWarehouseNumber(models);
+
+		// 运单状态
+		result.setStatusName(changeStatusName(byWaybillNo.getWaybillStatus()));
+
+
+		// 增加节点信息
+		List<NodeInfoVO> nodeInfoVOList = new ArrayList<>();
+
+		// 入库
+		NodeInfoVO nodeInfoVO = buildFristRuKu(groupedByWarehouse, result.getDepartureWarehouseName(), result.getTotalCount());
+		if(nodeInfoVO != null){
+			nodeInfoVOList.add(nodeInfoVO);
+		}
+
+
+		// 干线发车
+		List<TrunklineCarsLoadScanEntity> allListByWaybillNo = traceCarsLoadScanClient.findAllListByWaybillNoAndOrderCode(waybillNo,orderCode);
+
+		if (allListByWaybillNo != null && !allListByWaybillNo.isEmpty()) {
+			// 按照 车次号进行分组
+			Map<String, List<TrunklineCarsLoadScanEntity>> groupedByLoadId = allListByWaybillNo.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getLoadCode));
+			Set<String> strings = groupedByLoadId.keySet();
+			for (String key : strings) {
+
+				List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = groupedByLoadId.get(key);
+				//干线发车
+				nodeInfoVO = buildTrunklineByLoadCar(trunklineCarsLoadScanEntities, key);
+				if (nodeInfoVO != null) {
+					nodeInfoVOList.add(nodeInfoVO);
+				}
+				// 干线到达
+				nodeInfoVO = buildTrunklineByUnLoadCar(trunklineCarsLoadScanEntities, key);
+				if (nodeInfoVO != null) {
+					nodeInfoVOList.add(nodeInfoVO);
+				}
+
+			}
+		}
+
+
+		List<QualityDeliverEntity> signListByWaybillNumber = questualityDeliverClient.findSignListByWaybillNumberAndOrderCode(waybillNo,orderCode);
+
+		if (signListByWaybillNumber != null && !signListByWaybillNumber.isEmpty()) {
+
+			//统计装车数量load_num
+			int loadNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getLoadNum).sum();
+
+			// 计划配送数 plan_num
+			int planNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getPlanNum).sum();
+
+			// 计算签收数量sign_num
+			int signNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getSignNum).sum();
+
+			// 配送装车
+			QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.get(0);
+			if (loadNum != 0) {
+				nodeInfoVO = new NodeInfoVO();
+				nodeInfoVO.setOperateName("配送装车");
+				nodeInfoVO.setOperateNumber(loadNum + "");
+				nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
+				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+				// 增加网点电话
+				BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
+				if (entityWarehouseId != null) {
+					nodeInfoVO.setOperateWarehousePhone(entityWarehouseId.getContactNumber());
+				}
+
+				nodeInfoVOList.add(nodeInfoVO);
+			}
+
+			if (planNum != 0) {
+				nodeInfoVO = new NodeInfoVO();
+				nodeInfoVO.setOperateName("配送签收");
+				nodeInfoVO.setOperateNumber(signNum + "/" + loadNum);
+				nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
+				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+				// 增加网点电话
+				BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
+				if (entityWarehouseId != null) {
+					nodeInfoVO.setOperateWarehousePhone(entityWarehouseId.getContactNumber());
+				}
+				nodeInfoVOList.add(nodeInfoVO);
+			}
+			result.setNodeInfoVOList(nodeInfoVOList);
+
+		}
+		// 配送签收
+
+		return result;
+	}
+
+
+	/**
+	 * 运单查询
+	 *
+	 * @param waybillNo
+	 * @return
+	 */
+	private WaybillInfoVO dataWEaybill(String waybillNo) {
+
+		WaybillInfoVO result = new WaybillInfoVO();
+		WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(waybillNo);
+		if (Objects.isNull(byWaybillNo)) {
+			throw new CustomerException("运单信息不存在~");
+		}
+
+		// 获取租户信息
+		R<Tenant> tenant = systemClient.getTenant(AuthUtil.getTenantId());
+		if (tenant.isSuccess() && !Objects.isNull(tenant.getData())) {
+			Tenant data = tenant.getData();
+			result.setContactNumber(data.getContactNumber());
+
+		}
+
 		result.setWaybillNo(byWaybillNo.getWaybillNo());
 		result.setDestinationWarehouseName(byWaybillNo.getDestinationWarehouseName());
 		result.setDepartureWarehouseName(byWaybillNo.getDepartureWarehouseName());
@@ -69,66 +243,190 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListClient.findByWaybillNumber(waybillNo);
 		// 按照仓库ID进行分组
-		Map<String, List<DistributionParcelListEntity>> groupedByWarehouse= distributionParcelListEntities.stream()
+		Map<String, List<DistributionParcelListEntity>> groupedByWarehouse = distributionParcelListEntities.stream()
 			.collect(Collectors.groupingBy(DistributionParcelListEntity::getWarehouse));
 
 		// 获取始发仓的入库数据
-		WarehouseNumberVO startWarehouseNumber	 =buildWarehouse(groupedByWarehouse,result.getDepartureWarehouseName());
+//		WarehouseNumberVO startWarehouseNumber = buildWarehouse(groupedByWarehouse, result.getDepartureWarehouseName());
 		// 移除当前的仓库
-		groupedByWarehouse.remove(result.getDepartureWarehouseName());
-		result.setStartWarehouseNumber(startWarehouseNumber);
-		temp +=startWarehouseNumber!=null?startWarehouseNumber.getNumber():0;
+//		groupedByWarehouse.remove(result.getDepartureWarehouseName());
+//		result.setStartWarehouseNumber(startWarehouseNumber);
 		/*********************************m目的仓 start********************************/
-		String  destinationWarehouseName = result.getDestinationWarehouseName();
-		WarehouseNumberVO endWarehouseNumber=buildWarehouse(groupedByWarehouse,destinationWarehouseName);
-		temp +=endWarehouseNumber!=null?endWarehouseNumber.getNumber():0;
-		// 计算预约数量
-		List<DistributionParcelListEntity> end = groupedByWarehouse.get(destinationWarehouseName);
-
-		if(end!=null){
-			int resNum = end.stream().filter(t->"20".equals(t.getOrderPackageReservationStatus())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
-			result.setDeliveryNum(resNum);
-		}
+//		String destinationWarehouseName = result.getDestinationWarehouseName();
+//		WarehouseNumberVO endWarehouseNumber = buildWarehouse(groupedByWarehouse, destinationWarehouseName);
 
-		groupedByWarehouse.remove(result.getDestinationWarehouseName());
-		result.setEndWarehouseNumber(endWarehouseNumber);
+//		groupedByWarehouse.remove(result.getDestinationWarehouseName());
+//		result.setEndWarehouseNumber(endWarehouseNumber);
 		/*********************************m目的仓 end********************************/
 		// 判断当前map 中的key长度
 		Set<String> keys = groupedByWarehouse.keySet();
 		List<WarehouseNumberVO> models = null;
 		for (String key : keys) {
-			if(models==null){
+			if (models == null) {
 				models = new ArrayList<>();
 			}
-			WarehouseNumberVO middleWarehouseNumberVO = 	buildWarehouse(groupedByWarehouse,key);
+			WarehouseNumberVO middleWarehouseNumberVO = buildWarehouse(groupedByWarehouse, key);
+			if(middleWarehouseNumberVO != null){
 				models.add(middleWarehouseNumberVO);
-			temp +=middleWarehouseNumberVO!=null?middleWarehouseNumberVO.getNumber():0;
+			}
 		}
 		// 加入中转的数据
 		result.setMiddleWarehouseNumber(models);
 
-		// 查询运单的签收数量
-		result.setSignNum(byWaybillNo.getSignNum());
-
 		// 运单状态
-
 		result.setStatusName(changeStatusName(byWaybillNo.getWaybillStatus()));
 
-		// 计算在途数量
-		result.setOnWayCount(result.getTotalCount()-temp);
 
+		// 增加节点信息
+		List<NodeInfoVO> nodeInfoVOList = new ArrayList<>();
+
+		// 入库
+		NodeInfoVO nodeInfoVO = buildFristRuKu(groupedByWarehouse, result.getDepartureWarehouseName(), result.getTotalCount());
+		if(nodeInfoVO != null){
+			nodeInfoVOList.add(nodeInfoVO);
+		}
+
+
+		// 干线发车
+		List<TrunklineCarsLoadScanEntity> allListByWaybillNo = traceCarsLoadScanClient.findAllListByWaybillNo(waybillNo);
+
+		if (allListByWaybillNo != null && !allListByWaybillNo.isEmpty()) {
+			// 按照 车次号进行分组
+			Map<String, List<TrunklineCarsLoadScanEntity>> groupedByLoadId = allListByWaybillNo.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getLoadCode));
+			Set<String> strings = groupedByLoadId.keySet();
+			for (String key : strings) {
+
+				List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = groupedByLoadId.get(key);
+				//干线发车
+				nodeInfoVO = buildTrunklineByLoadCar(trunklineCarsLoadScanEntities, key);
+				if (nodeInfoVO != null) {
+					nodeInfoVOList.add(nodeInfoVO);
+				}
+				// 干线到达
+				nodeInfoVO = buildTrunklineByUnLoadCar(trunklineCarsLoadScanEntities, key);
+				if (nodeInfoVO != null) {
+					nodeInfoVOList.add(nodeInfoVO);
+				}
+
+			}
+		}
+
+
+		List<QualityDeliverEntity> signListByWaybillNumber = questualityDeliverClient.findSignListByWaybillNumber(waybillNo);
+
+		if (signListByWaybillNumber != null && !signListByWaybillNumber.isEmpty()) {
+
+			//统计装车数量load_num
+			int loadNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getLoadNum).sum();
 
+			// 计划配送数 plan_num
+			int planNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getPlanNum).sum();
+
+			// 计算签收数量sign_num
+			int signNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getSignNum).sum();
+
+			// 配送装车
+			QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.get(0);
+			if (loadNum != 0) {
+				nodeInfoVO = new NodeInfoVO();
+				nodeInfoVO.setOperateName("配送装车");
+				nodeInfoVO.setOperateNumber(loadNum + "");
+				nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
+				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+				// 增加网点电话
+				BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
+				if (entityWarehouseId != null) {
+					nodeInfoVO.setOperateWarehousePhone(entityWarehouseId.getContactNumber());
+				}
+
+				nodeInfoVOList.add(nodeInfoVO);
+			}
+
+			if (planNum != 0) {
+				nodeInfoVO = new NodeInfoVO();
+				nodeInfoVO.setOperateName("配送签收");
+				nodeInfoVO.setOperateNumber(signNum + "/" + loadNum);
+				nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
+				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+				// 增加网点电话
+				BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
+				if (entityWarehouseId != null) {
+					nodeInfoVO.setOperateWarehousePhone(entityWarehouseId.getContactNumber());
+				}
+				nodeInfoVOList.add(nodeInfoVO);
+			}
+
+			result.setNodeInfoVOList(nodeInfoVOList);
+
+
+		}
+
+
+		// 配送签收
 
 		return result;
 	}
 
+	private NodeInfoVO buildTrunklineByUnLoadCar(List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities, String key) {
+
+		// 获取卸车集合
+		List<TrunklineCarsLoadScanEntity> collect = trunklineCarsLoadScanEntities.stream().filter(t -> t.getScanStatus().equals("2")).collect(Collectors.toList());
+
+		if (collect.isEmpty()) {
+			return null;
+		}
+		TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = collect.get(0);
+		NodeInfoVO nodeInfoVO = new NodeInfoVO();
+		nodeInfoVO.setOperateName("干线到达");
+		nodeInfoVO.setOperateNumber(collect.size() + "");
+		nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getWarehouseName());
+		nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getCreateTime());
+		return nodeInfoVO;
+
+	}
+
+	private NodeInfoVO buildTrunklineByLoadCar(List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities, String key) {
+
+		// 判断trunklineCarsLoadScanEntities 中 warehouseId 不是null的集合
+		List<TrunklineCarsLoadScanEntity> collect = trunklineCarsLoadScanEntities.stream().filter(t -> t.getWarehouseId() != null).collect(Collectors.toList());
+		if (collect.isEmpty()) {
+			return null;
+		}
+		TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = collect.get(0);
+		NodeInfoVO nodeInfoVO = new NodeInfoVO();
+		nodeInfoVO.setOperateName("干线发车");
+		nodeInfoVO.setOperateNumber(collect.size() + "");
+		nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getWarehouseName());
+		nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getCreateTime());
+		return nodeInfoVO;
+	}
+
+	private NodeInfoVO buildFristRuKu(Map<String, List<DistributionParcelListEntity>> groupedByWarehouse, String departureWarehouseName, Integer totalCount) {
+
+
+		if(groupedByWarehouse.isEmpty()){
+			return null;
+		}
+
+		NodeInfoVO nodeInfoVO = new NodeInfoVO();
+		nodeInfoVO.setOperateName("入库");
+		nodeInfoVO.setOperateWarehouseName(departureWarehouseName);
+		List<DistributionParcelListEntity> distributionParcelListEntities = groupedByWarehouse.get(departureWarehouseName);
+		// 获取第一个时间
+		nodeInfoVO.setOperateTime(distributionParcelListEntities.get(0).getCreateTime());
+		nodeInfoVO.setOperateNumber(distributionParcelListEntities.size() + "/" + totalCount);
+
+		return nodeInfoVO;
+	}
+
+
 	private String changeStatusName(String waybillStatus) {
 
-		if(waybillStatus==null){
-			waybillStatus="";
+		if (waybillStatus == null) {
+			waybillStatus = "";
 		}
 
-		switch (waybillStatus){
+		switch (waybillStatus) {
 			case "20":
 				return "已入库";
 
@@ -159,22 +457,18 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		}
 
 
-
-
-
-
 	}
 
 
-	private WarehouseNumberVO buildWarehouse(Map<String, List<DistributionParcelListEntity>> groupedByWarehouse,String warehouseName){
+	private WarehouseNumberVO buildWarehouse(Map<String, List<DistributionParcelListEntity>> groupedByWarehouse, String warehouseName) {
 
 		List<DistributionParcelListEntity> end = groupedByWarehouse.get(warehouseName);
-		if(end==null){
+		if (end == null) {
 			return null;
 		}
 		// 获取始发仓的在库数量
-		int num = end.stream().filter(t->"20".equals(t.getOrderPackageStatus()) && t.getQuantity()!=0).mapToInt(DistributionParcelListEntity::getQuantity).sum();
-		if(num != 0) {
+		int num = end.stream().filter(t -> "20".equals(t.getOrderPackageStatus()) && t.getQuantity() != 0).mapToInt(DistributionParcelListEntity::getQuantity).sum();
+		if (num != 0) {
 			WarehouseNumberVO endWarehouseNumber = new WarehouseNumberVO();
 			endWarehouseNumber.setNumber(num);
 			endWarehouseNumber.setWarehouseName(warehouseName);
@@ -187,8 +481,6 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 	}
 
 
-
-
 	private R dataOrder(String order) {
 		// 通过订单查询运单号
 		List<WarehouseWaybillEntity> waybillVOByOrderCode = warehouseWaybillClient.findWaybillVOByOrderCode(order);
@@ -198,7 +490,7 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		Set<String> keys = groupedByWaybillNo.keySet();
 		List<WaybillInfoVO> data = new ArrayList<>();
 		for (String key : keys) {
-			WaybillInfoVO waybillInfoVO = dataWEaybill(key);
+			WaybillInfoVO waybillInfoVO = dataWEaybillByOrderCode(key,order);
 			data.add(waybillInfoVO);
 		}
 		return R.data(data);

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

@@ -944,9 +944,11 @@ public class DistributionStockupAppController extends BladeController {
 				List<DistributionReservationStocklistEntity> reservationStockList = reservationStocklistEntities.stream().filter(drs -> drs.getReservationNum() > 0 && drs.getRealityNum() < drs.getReservationNum()).collect(Collectors.toList());
 				if (Func.isNotEmpty(reservationStockList)) {
 					DistributionReservationStocklistEntity oldReservationStocklistEntity = reservationStockList.get(0);
+					DistributionReservationStocklistEntity t0 = new DistributionReservationStocklistEntity();
+					t0.setId(oldReservationStocklistEntity.getId());
 					//扣减计划数量
-					oldReservationStocklistEntity.setReservationNum(oldReservationStocklistEntity.getReservationNum() - 1);
-					distributionReservationStocklistService.updateById(oldReservationStocklistEntity);
+					t0.setReservationNum(oldReservationStocklistEntity.getReservationNum() - 1);
+					distributionReservationStocklistService.updateById(t0);
 
 					//维护对应的库存品包件
 					List<DisStockListDetailEntity> stockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
@@ -956,19 +958,26 @@ public class DistributionStockupAppController extends BladeController {
 					);
 
 					DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(oldReservationStocklistEntity.getStocklistId());
-					oldStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1);
-					distributionStockListService.updateById(oldStockListEntity);
+
+					DistributionStockListEntity t =new DistributionStockListEntity();
+					t.setId(oldStockListEntity.getId());
+					t.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1);
+					distributionStockListService.updateById(t);
 
 					//对指定库存品包件进行库存品ID修改
 					DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0);
 					if (Func.isNotEmpty(disStockListDetailEntity)) {
-						disStockListDetailEntity.setStockListId(stockupDTO.getStockListId());
-						disStockListDetailService.updateById(disStockListDetailEntity);
+						DisStockListDetailEntity t1 = new DisStockListDetailEntity();
+						t1.setId(disStockListDetailEntity.getId());
+						t1.setStockListId(stockupDTO.getStockListId());
+						disStockListDetailService.updateById(t1);
 					}
 					//维护对应库存品的冻结数量
 					DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId());
-					newStockListEntity.setQuantityOccupied(newStockListEntity.getQuantityOccupied() + 1);
-					distributionStockListService.updateById(newStockListEntity);
+					DistributionStockListEntity t2 = new DistributionStockListEntity();
+					t2.setId(newStockListEntity.getId());
+					t2.setQuantityOccupied(newStockListEntity.getQuantityOccupied() + 1);
+					distributionStockListService.updateById(t2);
 				}
 				// 增加实际扫描的包件对应的库存品信息 增加在预约库存品中间表上
 				DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity();

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -345,6 +345,11 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		return distributionParcelListService.findByWaybillNumber(waybillNumber);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findByWaybillNumberAndOrderCode(String waybillNumber,String orderCode) {
+		return distributionParcelListService.findByWaybillNumberAndOrderCode(waybillNumber,orderCode);
+	}
+
 	@Override
 	public List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus, @RequestParam String waybillNo) {
 		return distributionParcelListService.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, packageStatus, waybillNo);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -266,7 +266,12 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 			carsLoadNum = 0;
 		}
 		stockArticleEntity.setCarsLoadNum(carsLoadNum + planNum);
-		boolean b = distributionStockArticleService.updateById(stockArticleEntity);
+
+
+		DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+		t.setId(stockArticleEntity.getId());
+		t.setCarsLoadNum(stockArticleEntity.getCarsLoadNum());
+		boolean b = distributionStockArticleService.updateById(t);
 		if(!b){
 			log.warn("###############addCarsLoadNum: 更新配载数量失败 orderCode={} warehouseId={}",orderCode,warehouseId);
 			throw new CustomerException(405,"更新配载数量失败");

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/QualityDeliverClient.java

@@ -78,4 +78,21 @@ public class QualityDeliverClient implements IQualityDeliverClient {
 			qualityDeliverService.updateBatchById(list);
 		}
     }
+
+	@Override
+	public List<QualityDeliverEntity> findSignListByWaybillNumber(String waybillNumber) {
+
+		LambdaQueryWrapper<QualityDeliverEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(QualityDeliverEntity::getWaybillNumber,waybillNumber);
+		return qualityDeliverService.list(lambdaQueryWrapper);
+	}
+
+	@Override
+	public List<QualityDeliverEntity> findSignListByWaybillNumberAndOrderCode(String waybillNumber, String orderCode) {
+
+		LambdaQueryWrapper<QualityDeliverEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(QualityDeliverEntity::getWaybillNumber,waybillNumber);
+		lambdaQueryWrapper.eq(QualityDeliverEntity::getOrderCode,orderCode);
+		return qualityDeliverService.list(lambdaQueryWrapper);
+	}
 }

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

@@ -171,6 +171,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     List<Map<String, Integer>> selectAllErrorReservationOrder();
 
 	List<DistributionParcelListEntity> findByWaybillNumber(@Param("waybillNumber") String waybillNumber);
+	List<DistributionParcelListEntity> findByWaybillNumberAndOrderCode(@Param("waybillNumber") String waybillNumber,@Param("orderCode") String orderCode);
 
 	/**
 	 * 还原包件状态 -- 未出库

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

@@ -2303,6 +2303,18 @@
         limit 1
     </select>
 
+    <select id="findByWaybillNumberAndOrderCode"
+            resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+
+        SELECT ldpl.* FROM logpm_distribution_parcel_list ldpl
+        WHERE ldpl.waybill_number = #{waybillNumber}
+        <if test="orderCode!=null and orderCode!=''">
+            and ldpl.order_code = #{orderCode}
+        </if>
+
+        and is_deleted=0
+    </select>
+
     <select id="findListByOrderPackageCodesAndCode" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         select ldpl.id,
         ldpl.order_package_code
@@ -2313,7 +2325,6 @@
         </foreach>
         and ldpl.is_deleted = 0
     </select>
-
     <select id="findSignOrderPackageCodes" resultType="String">
         select order_package_code
         from logpm_distribution_parcel_list

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

@@ -35,18 +35,7 @@ public interface IDistributionAsyncService {
 	 */
 	Boolean getSelfPickup(Long id);
 
-	/**
-	 * 修改订单状态
-	 * @param id
-	 * @return
-	 */
-	Boolean updateOrderSelfPickup(Long id);
-	/**
-	 * 修改扫码状态
-	 * @param id
-	 * @return
-	 */
-	Boolean getInventorySelfPickup(Long id);
+
 	/**
 	 * 修改提货订单状态
 	 * @param id
@@ -94,27 +83,6 @@ public interface IDistributionAsyncService {
 	void changeOrderSignforStatus(DistributionParcelListEntity parcelListEntity);
 
 
-	/**
-	 * 修改配送任务的装车状态
-	 *
-	 * @param deliveryId
-	 * @return
-	 */
-	void changeDiscussDeliveryListStatus(String barcode,Long deliveryId);
-
-
-	/**
-	 * 改变订单的主状态
-	 * @param barcode
-	 */
-	void changeOrderStatus(String barcode, Long deliveryId);
-
-	/**
-	 * 配送任务签收情况状态控制
-	 * @param deliveryId
-	 * @param parcelListEntity
-	 */
-	void changeDeliverySignforListStatus(Long deliveryId, DistributionParcelListEntity parcelListEntity);
 
 	/**
 	 * 异步检查订单的预约状态
@@ -147,43 +115,19 @@ public interface IDistributionAsyncService {
 	void stockupSelfUpdateState(StockupDTO stockupDTO,int num);
 
 
-	/**
-	 * 市配装车扫描接口状态变更
-	 * @param barcode
-	 * @param deliveryId
-	 */
-	void changeMarketDeliveryListStatus(String barcode, Long deliveryId,Long reservationId);
 
 	/**
 	 * 自提签收判断是否完成
 	 */
 	void getStockUPstate(Long billLadingId);
 
-	/**
-	 * 根据保健维护订单的签收状态
-	 * @param parcelListEntity
-	 */
-	void checkStockArticleSignStatus(DistributionParcelListEntity parcelListEntity);
 
-	/**
-	 *
-	 * @param detailEntity
-	 */
-	void checkStockArticleListSigningStatus(DisStockListDetailEntity detailEntity);
 
 
-	/**
-	 * 维护签收的牵手状态
-	 * @param barcode
-	 * @param deliveryId
-	 */
-	void checkDeliverySignStatus(String barcode, Long deliveryId);
 
-	/**
-	 * 检查配送计划签收状态
-	 * @param deliveryId
-	 */
-	void checkDeliverySignStatusByReservation(Long deliveryId);
+
+
+
 
 	/**
 	 * 判断包件是否该下架
@@ -198,17 +142,6 @@ public interface IDistributionAsyncService {
 	 */
 	void checkLoadingByPackage(DistributionParcelListEntity parcelListEntity, Long deliveryId,Long reservationId);
 
-	/**
-	 * 托盘装车  维护装车状态
-	 * @param deliveryId
-	 */
-	void checkLoadingByDelivery(Long deliveryId);
-
-	/**
-	 * 维护包件、订单装车和出库状态
-	 * @param packageId
-	 */
-	void checkOrderLoadingStatus(Long packageId);
 
 	/**
 	 * 维护订单预约、装车状态
@@ -264,11 +197,6 @@ public interface IDistributionAsyncService {
 	 */
     void checkRetentionZeroPackageReservationAndDeliveryInfo(Long reservationId, Long deliveryId, Long orderPackageId, Long orderId);
 
-	/**
-	 * 批量修改包件装车状态
-	 * @param updatePackageList
-	 */
-	void updatepackageListLoadingStatus(List<DistributionParcelListEntity> updatePackageList,Long warehouseId);
 
 	/**
 	 * 处理包件一键签收状态
@@ -312,20 +240,18 @@ public interface IDistributionAsyncService {
 	 */
 	void releaseSource(Long reservationId,BasicdataWarehouseEntity warehouse,BladeUser user,String trainNumber);
 
+
 	/**
 	 * 进行干线日志保存
-	 * @param id
+	 * @param deliveryId
+	 * @param reservationId
+	 * @param user
+	 * @param warehouse
+	 * @param a
 	 */
     void sendTrunkineLog(Long deliveryId,Long reservationId, BladeUser user, BasicdataWarehouseEntity warehouse,Integer a);
 
-	/**
-	 * 自提单未扫描数据进行资源释放
-	 * @param l
-	 */
-	void releaseBillLadingResource(Long l,Long warehouseId);
-
 
-	DistributionStockArticleEntity findDistributionStockArticleEntityByIdForAsync(String tenantId, Long id);
 
 
 
@@ -349,7 +275,7 @@ public interface IDistributionAsyncService {
 
 	/**
 	 * 查询预约信息推送至安装平台
-	 * @param id
+	 * @param reservationEntity
 	 */
     void sendInstallToPlatform(DistributionReservationEntity reservationEntity);
 }

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

@@ -179,6 +179,8 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 */
 	List<DistributionParcelListEntity> findByWaybillNumber(String waybillId);
 
+	List<DistributionParcelListEntity> findByWaybillNumberAndOrderCode(String waybillNumber, String orderCode);
+
 	/**
 	 * 批量还原包件状态
 	 * @param packageIds

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

@@ -703,7 +703,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 //			distributionAddvalueDetailEntity.setNum(distributionAppAddvalueDTO.getNum());
 //		}
 //		上楼   超区   平移   搬运   分拣   专车
-		if (Func.isEmpty(packageEntityList) && packageEntityList.size() == 0) {
+		if (Func.isEmpty(packageEntityList) && packageEntityList.isEmpty()) {
 			//没有包件信息，对该增值服务进行清除
 			DistributionAddvalueEntity distributionAddvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda()
 				.eq(DistributionAddvalueEntity::getRefId, distributionAppAddvalueDTO.getReservationId())

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

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,61 +21,10 @@ import com.logpm.distribution.dto.PushInstallDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.dto.app.StockupZeroDTO;
-import com.logpm.distribution.entity.DisStockListDetailEntity;
-import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
-import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
-import com.logpm.distribution.entity.DistributionDeliveryListEntity;
-import com.logpm.distribution.entity.DistributionLoadscanEntity;
-import com.logpm.distribution.entity.DistributionLoadscaninvnEntity;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
-import com.logpm.distribution.entity.DistributionParcelNumberEntity;
-import com.logpm.distribution.entity.DistributionPrintEntity;
-import com.logpm.distribution.entity.DistributionReservationEntity;
-import com.logpm.distribution.entity.DistributionReservationPackageEntity;
-import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
-import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
-import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity;
-import com.logpm.distribution.entity.DistributionSignforEntity;
-import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.entity.DistributionStockEntity;
-import com.logpm.distribution.entity.DistributionStockListEntity;
-import com.logpm.distribution.entity.DistributionStockupEntity;
-import com.logpm.distribution.entity.DistributionStockupInfoEntity;
-import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
-import com.logpm.distribution.entity.DistrilbutionBillPackageEntity;
-import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
-import com.logpm.distribution.mapper.DistributionBillLadingScanMapper;
-import com.logpm.distribution.mapper.DistributionDeliveryDetailsMapper;
-import com.logpm.distribution.mapper.DistributionDeliveryListMapper;
-import com.logpm.distribution.mapper.DistributionLoadscanMapper;
-import com.logpm.distribution.mapper.DistributionLoadscaninvnMapper;
-import com.logpm.distribution.mapper.DistributionParcelListMapper;
-import com.logpm.distribution.mapper.DistributionReservationMapper;
-import com.logpm.distribution.mapper.DistributionReservationPackageMapper;
-import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper;
-import com.logpm.distribution.mapper.DistributionReservationStocklistMapper;
-import com.logpm.distribution.mapper.DistributionSignforMapper;
-import com.logpm.distribution.mapper.DistributionStockListMapper;
-import com.logpm.distribution.mapper.DistributionStockMapper;
-import com.logpm.distribution.mapper.DistributionStockupInfoMapper;
-import com.logpm.distribution.mapper.DistributionStockupMapper;
-import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper;
-import com.logpm.distribution.service.IDisStockListDetailService;
-import com.logpm.distribution.service.IDistributionAsyncService;
-import com.logpm.distribution.service.IDistributionDeliveryDetailsService;
-import com.logpm.distribution.service.IDistributionParcelNumberService;
-import com.logpm.distribution.service.IDistributionPrintService;
-import com.logpm.distribution.service.IDistributionReservationStockarticleService;
-import com.logpm.distribution.service.IDistributionReservationStocklistService;
-import com.logpm.distribution.service.IDistributionReservationZeroPackageService;
-import com.logpm.distribution.service.IDistributionStockArticleService;
-import com.logpm.distribution.service.IDistrilbutionBillPackageService;
-import com.logpm.distribution.service.IDistrilbutionBillStockService;
-import com.logpm.distribution.vo.DistributionParcelNumberVO;
-import com.logpm.distribution.vo.DistributionSignPrintVO;
-import com.logpm.distribution.vo.DistributionStockPackageVO;
-import com.logpm.distribution.vo.DistributionStockupSelfVO;
-import com.logpm.distribution.vo.DistrilbutionBillStockVO;
+import com.logpm.distribution.entity.*;
+import com.logpm.distribution.mapper.*;
+import com.logpm.distribution.service.*;
+import com.logpm.distribution.vo.*;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.mt.dto.MtReceiveContentDTO;
 import com.logpm.factory.mt.dto.MtReceiveDTO;
@@ -95,11 +43,9 @@ import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
-import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant;
 import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
@@ -114,19 +60,9 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
-import org.springblade.common.constant.reservation.ReservationInventoryLoadingStatusConstant;
-import org.springblade.common.constant.reservation.ReservationInventorySigningStatusConstant;
-import org.springblade.common.constant.reservation.ReservationInventoryStatusConstant;
-import org.springblade.common.constant.reservation.ReservationLoadingStatusConstant;
-import org.springblade.common.constant.reservation.ReservationOrderStatusConstant;
-import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
-import org.springblade.common.constant.reservation.ReservationSigningStatusConstant;
-import org.springblade.common.constant.reservation.ReservationStatusConstant;
-import org.springblade.common.constant.reservation.ReservationStockupStatusConstant;
-import org.springblade.common.constant.signing.SignforStatusConstant;
+import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
-import org.springblade.common.exception.CustomerException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -138,15 +74,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -191,20 +119,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	private final IDistrilbutionBillPackageService billPackageService;
 	private final IDistributionReservationZeroPackageService zeroPackageService;
 
-
 	private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
 	private final IWarehouseWaybillClient waybillClient;
 	private final FactoryDataMessageSender factoryDataMessageSender;
 	private final RabbitTemplate rabbitTemplate;
 
-
-	private final ISysClient sysClient;
 	private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
 	private final IDistributionPrintService distributionPrintService;
 	private final IBasicdataClientClient basicdataClientClient;
 
 
-//	private final
 
 	@Override
 	@LogpmAsync("asyncExecutor")
@@ -233,32 +157,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		return distributionParcelListService.updateById(entity);
 	}
 
-	/**
-	 * 修改订单状态
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-	@LogpmAsync("asyncExecutor")
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean updateOrderSelfPickup(Long id) {
-		DistributionStockArticleEntity entity = new DistributionStockArticleEntity();
-		entity.setId(id);
-		entity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-		return distributionStockArticleService.updateById(entity);
-	}
-
-	@Override
-	@LogpmAsync("asyncExecutor")
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean getInventorySelfPickup(Long id) {
-		DistributionStockEntity distributionStock = new DistributionStockEntity();
-		distributionStock.setId(id);
-		distributionStock.setOutboundType("3");
-		int i = distributionStockService.updateById(distributionStock);
-		return i > 0;
-	}
 
 	@Override
 	@LogpmAsync("asyncExecutor")
@@ -297,7 +195,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		if (byId.getStockupStatus().equals(OrderStockupStatusConstant.daibeihuo.getValue())) {
 			//
 			byId.setStockupStatus(OrderStockupStatusConstant.bufenbeihuo.getValue());
-			boolean b = distributionStockArticleService.updateById(byId);
+
+			DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+			t.setId(id);
+			t.setStockupStatus(byId.getStockupStatus());
+			boolean b = distributionStockArticleService.updateById(t);
 			log.debug("###执行结果={}", b);
 		} else if ("1".equals(byId.getStockupStatus())) {
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda()
@@ -306,7 +208,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			int sum = distributionParcelListEntities.stream().filter(i -> i.getOrderPackageStockupStatus().equals(OrderPackageStockupStatusConstant.daibeihuo.getValue())).collect(Collectors.toList()).stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 			if (sum == 0 && byId.getStockupStatus().equals(OrderStockupStatusConstant.bufenbeihuo.getValue())) {
 				byId.setStockupStatus(OrderStockupStatusConstant.yibeihu.getValue());
-				boolean b = distributionStockArticleService.updateById(byId);
+
+				DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+				t.setId(id);
+				t.setStockupStatus(byId.getStockupStatus());
+				boolean b = distributionStockArticleService.updateById(t);
 				log.debug("###执行结果={}", b);
 			}
 		}
@@ -323,18 +229,19 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		log.debug("####修改包件预约状态");
 		ids.forEach(i -> {
 			DistributionParcelListEntity distributionParcelListEntity = new DistributionParcelListEntity();
-			if ("1".equals(distributionParcelListEntity.getConditions())) {
 			distributionParcelListEntity.setId(i);
+			if (1==distributionParcelListEntity.getConditions()) {
 				distributionParcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 				int i1 = distributionParcelListMapper.updateById(distributionParcelListEntity);
 				log.debug("####修改包件预约数量===={}", i1);
-			} else if ("3".equals(distributionParcelListEntity.getConditions())) {
+			} else if (3==distributionParcelListEntity.getConditions()) {
 				DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda()
 					.eq(DistributionParcelNumberEntity::getParcelListId, i)
 				);
 				if (distributionParcelNumberEntity.getQuantity() == (distributionParcelNumberEntity.getDeliveryQuantity() + distributionParcelNumberEntity.getOutboundQuantity())) {
 					log.debug("####修改包件预约数量===={}", i);
-					distributionParcelListEntity.setId(i);
+					distributionParcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+
 					int i1 = distributionParcelListMapper.updateById(distributionParcelListEntity);
 				}
 			}
@@ -386,336 +293,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void changeDiscussDeliveryListStatus(String barcode, Long deliveryId) {
-		//这里需要查询出该包件
-		DistributionParcelListEntity parcelListEntity = distributionDeliveryListMapper.getLoadingPackageDetails(barcode, deliveryId);
-		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-		parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
-		//修改包件状态
-		distributionParcelListService.updateById(parcelListEntity);
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
-		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		//维护包件、订单扫描装车状态
-		if (flag) {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-		} else {
-			flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-			if (flag) {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
-			} else {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-			}
-		}
-		distributionStockArticleService.updateById(stockArticleEntity);
-		//维护包件、预约的扫描状态
-		//查询出配送任务下的所有包件
-		List<DistributionParcelListEntity> deliveryParcelListEntityList = distributionDeliveryListMapper.selectPackageListByDeliveryListId(deliveryId);
-		boolean deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-		if (deliveryLoadingFlag) {
-			deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
-		} else {
-			deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-			if (deliveryLoadingFlag) {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
-			} else {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
-			}
-		}
-		distributionDeliveryListMapper.updateById(deliveryListEntity);
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		reservationEntityList.forEach(r -> {
-			//查询预约下的所有包件信息
-			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(r.getId());
-			boolean reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-			if (reservationLoadingFlag) {
-				r.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-			} else {
-				reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-				if (reservationLoadingFlag) {
-					r.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
-				} else {
-					r.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
-				}
-			}
-			distributionReservationMapper.updateById(r);
-		});
-	}
-
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void changeMarketDeliveryListStatus(String barcode, Long deliveryId, Long reservationId) {
-
-		//查询库存品
-		DisStockListDetailEntity loadingInventoryDetail = distributionDeliveryListMapper.getLoadingInventoryDetail(barcode, deliveryId);
-		loadingInventoryDetail.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
-		disStockListDetailService.updateById(loadingInventoryDetail);
-//					DistributionStockListEntity stockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, loadingInventoryDetail.getStockListId()));
-//					stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - loadingInventoryDetail.getNum());
-//					stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - loadingInventoryDetail.getNum());
-//					stockListEntity.setOutboundQuantity(stockListEntity.getOutboundQuantity() + loadingInventoryDetail.getNum());
-//					distributionStockListMapper.updateById(stockListEntity);
-		//查询出这个库存品的所有需要装车的包件维度库存品
-		List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
-			.eq(DisStockListDetailEntity::getReservationId, loadingInventoryDetail.getReservationId())
-			.eq(DisStockListDetailEntity::getStockListId, loadingInventoryDetail.getStockListId())
-			.ne(DisStockListDetailEntity::getStockPackageStatus, InventoryPackageStatusConstant.quxiao.getValue()));
-		boolean inventoryFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-		List<DistributionReservationStocklistEntity> reservationStockarticleEntityList = distributionReservationStocklistMapper.selectList(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
-			.eq(DistributionReservationStocklistEntity::getReservationId, loadingInventoryDetail.getReservationId())
-			.eq(DistributionReservationStocklistEntity::getStocklistId, loadingInventoryDetail.getStockListId())
-			.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-		if (reservationStockarticleEntityList.size() == 1) {
-			//修改状态
-			DistributionReservationStocklistEntity reservationStockarticleEntity = reservationStockarticleEntityList.get(0);
-			if (inventoryFlag) {
-				//查询出库存品进行全部状态的变更
-				reservationStockarticleEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue());
-			} else {
-				inventoryFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue()));
-				if (inventoryFlag) {
-					reservationStockarticleEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue());
-				} else {
-					reservationStockarticleEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.bufenzhuangche.getValue());
-				}
-			}
-			distributionReservationStocklistMapper.updateById(reservationStockarticleEntity);
-		} else {
-			log.error("####库存品记录错误+{" + reservationStockarticleEntityList + "}");
-			return;
-		}
-		checkReservationAndDeliveryLoadingStatus(deliveryId, reservationId);
-	}
-
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void checkDeliverySignStatus(String barcode, Long deliveryId) {
-		//这里需要查询出该包件
-		DistributionParcelListEntity parcelListEntity = distributionDeliveryListMapper.getLoadingPackageDetails(barcode, deliveryId);
-
-		if (Func.isNotEmpty(parcelListEntity)) {
-			parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-			//修改包件状态
-			distributionParcelListService.updateById(parcelListEntity);
-//			DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
-			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-			boolean packageLoadingFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-			boolean packageSigningFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-			//维护包件、订单扫描装车状态
-			if (packageLoadingFlag) {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-			} else {
-				packageLoadingFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-				if (packageLoadingFlag) {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
-				} else {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-				}
-			}
-			if (packageSigningFlag) {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-			} else {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
-			}
-			distributionStockArticleService.updateById(stockArticleEntity);
-		} else {
-			//查询库存品
-			DisStockListDetailEntity loadingInventoryDetail = distributionDeliveryListMapper.getLoadingInventoryDetail(barcode, deliveryId);
-			loadingInventoryDetail.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
-			loadingInventoryDetail.setStockSignfoStatus(InventorySigningStatusConstant.yiqianshou.getValue());
-			disStockListDetailService.updateById(loadingInventoryDetail);
-//					DistributionStockListEntity stockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, loadingInventoryDetail.getStockListId()));
-//					stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - loadingInventoryDetail.getNum());
-//					stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - loadingInventoryDetail.getNum());
-//					stockListEntity.setOutboundQuantity(stockListEntity.getOutboundQuantity() + loadingInventoryDetail.getNum());
-//					distributionStockListMapper.updateById(stockListEntity);
-			//查询出这个库存品的所有需要装车的包件维度库存品
-			List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
-				.eq(DisStockListDetailEntity::getReservationId, loadingInventoryDetail.getReservationId())
-				.eq(DisStockListDetailEntity::getStockListId, loadingInventoryDetail.getStockListId())
-				.ne(DisStockListDetailEntity::getStockPackageStatus, InventoryPackageStatusConstant.quxiao.getValue()));
-			boolean inventoryLoadingFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-			boolean inventorySigningFlag = list.stream().allMatch(l -> l.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue()));
-			List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistMapper.selectList(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
-				.eq(DistributionReservationStocklistEntity::getReservationId, loadingInventoryDetail.getReservationId())
-				.eq(DistributionReservationStocklistEntity::getStocklistId, loadingInventoryDetail.getStockListId())
-				.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-			if (reservationStocklistEntityList.size() == 1) {
-				//修改状态
-				DistributionReservationStocklistEntity reservationStocklistEntity = reservationStocklistEntityList.get(0);
-				if (inventoryLoadingFlag) {
-					//查询出库存品进行全部状态的变更
-					reservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue());
-				} else {
-					inventoryLoadingFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue()));
-					if (inventoryLoadingFlag) {
-						reservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue());
-					} else {
-						reservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.bufenzhuangche.getValue());
-					}
-				}
-				if (inventorySigningFlag) {
-					//查询出库存品进行全部状态的变更
-					reservationStocklistEntity.setSigningStatus(ReservationInventorySigningStatusConstant.yiqianshou.getValue());
-				} else {
-					inventorySigningFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue()));
-					if (inventorySigningFlag) {
-						reservationStocklistEntity.setSigningStatus(ReservationInventorySigningStatusConstant.weiqianshou.getValue());
-					} else {
-						reservationStocklistEntity.setSigningStatus(ReservationInventorySigningStatusConstant.bufenqianshou.getValue());
-					}
-				}
-				distributionReservationStocklistMapper.updateById(reservationStocklistEntity);
-			} else {
-				log.error("####库存品记录错误+{" + reservationStocklistEntityList + "}");
-				return;
-			}
-		}
-		//查询出这个预约下的包件信息和库存品信息分别进行判断是否都完成装车
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		reservationEntityList.forEach(r -> {
-			int reservationTotal = r.getReservationNum() + r.getReservationStockListNum();
-			//查询此预约的包件装车数和库存品装车数
-			Integer loadingNum = 0;
-			Integer signNum = 0;
-			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
-				.eq(DistributionLoadscanEntity::getReservationId, r.getId())
-				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
-			);
-			if (Func.isNotEmpty(loadscanEntityList)) {
-				loadingNum += loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
-				signNum += loadscanEntityList.stream().filter(l -> l.getSignforState().equals(Integer.parseInt(SignforStatusConstant.yiqianshou.getValue()))).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
-
-			}
-			List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnMapper.selectList(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
-				.eq(DistributionLoadscaninvnEntity::getReservationId, r.getId())
-				.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
-			);
-			if (Func.isNotEmpty(loadscanEntityList)) {
-				loadingNum += loadscaninvnEntityList.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum();
-				signNum += loadscaninvnEntityList.stream().filter(l -> l.getSignforState().equals(Integer.parseInt(SignforStatusConstant.yiqianshou.getValue()))).mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum();
-			}
-
-			if (loadingNum == reservationTotal) {
-				r.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-			} else if (reservationTotal > loadingNum && loadingNum > 0) {
-				r.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
-			} else {
-				r.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
-			}
-
-			if (signNum == reservationTotal) {
-				r.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			} else if (reservationTotal > signNum && signNum > 0) {
-				r.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
-			} else {
-				r.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
-			}
-//			//查询预约下的所有包件信息
-//			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(r.getId());
-//			boolean reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-//			List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationStocklistMapper.selectList(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
-//				.eq(DistributionReservationStocklistEntity::getReservationId, r.getId())
-//				.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-//			boolean inventoryLoadingFlag = distributionReservationStocklistEntities.stream().allMatch(i -> i.getLoadingStatus().equals(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue()));
-//			if (reservationLoadingFlag && inventoryLoadingFlag) {
-//				r.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-//			} else {
-//				reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-//				inventoryLoadingFlag = distributionReservationStocklistEntities.stream().allMatch(i -> i.getLoadingStatus().equals(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue()));
-//				if (reservationLoadingFlag && inventoryLoadingFlag) {
-//					r.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
-//				} else {
-//					r.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
-//				}
-//			}
-//			boolean inventorySigningFlag = distributionReservationStocklistEntities.stream().allMatch(i -> i.getSigningStatus().equals(ReservationInventorySigningStatusConstant.yiqianshou.getValue()));
-//			boolean reservationSigningFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-//			if (inventorySigningFlag && reservationSigningFlag) {
-//				r.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-//			} else {
-//				inventorySigningFlag = distributionReservationStocklistEntities.stream().allMatch(i -> !i.getSigningStatus().equals(ReservationInventorySigningStatusConstant.yiqianshou.getValue()));
-//				reservationSigningFlag = parcelListEntities.stream().allMatch(p -> !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-//				if (inventorySigningFlag && reservationSigningFlag) {
-//					r.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
-//
-//				} else {
-//					r.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
-//				}
-//			}
-
-			distributionReservationMapper.updateById(r);
-		});
-
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
-		Integer delivertTotal = deliveryListEntity.getDeliveryNumber();
-		Integer deliverySigningNum = 0;
-		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
-			.eq(DistributionLoadscanEntity::getDeliveryId, deliveryListEntity.getId())
-			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
-		);
-		if (Func.isNotEmpty(loadscanEntityList)) {
-			deliverySigningNum += loadscanEntityList.stream().filter(l -> l.getSignforState().equals(Integer.parseInt(SignforStatusConstant.yiqianshou.getValue()))).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
-
-		}
-		List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnMapper.selectList(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
-			.eq(DistributionLoadscaninvnEntity::getDeliveryId, deliveryListEntity.getId())
-			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
-		);
-		if (Func.isNotEmpty(loadscanEntityList)) {
-			deliverySigningNum += loadscaninvnEntityList.stream().filter(l -> l.getSignforState().equals(Integer.parseInt(SignforStatusConstant.yiqianshou.getValue()))).mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum();
-		}
-
-		if (deliverySigningNum.equals(delivertTotal)) {
-			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-		} else {
-			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
-		}
-
-		distributionDeliveryListMapper.updateById(deliveryListEntity);
-	}
-
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void checkDeliverySignStatusByReservation(Long deliveryId) {
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
-		//查询一个配送任务下的所有客户
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		boolean loadingStatusFlag = reservationEntityList.stream().allMatch(r -> r.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue()));
-		if (loadingStatusFlag) {
-			deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
-		} else {
-			loadingStatusFlag = reservationEntityList.stream().allMatch(r -> r.getLoadingStatus().equals(ReservationLoadingStatusConstant.daizhuangche.getValue()));
-			if (loadingStatusFlag) {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
-			} else {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
-			}
-		}
-		boolean signingStatusFlag = reservationEntityList.stream().allMatch(r -> r.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue()));
-		if (signingStatusFlag) {
-			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-		} else {
-			loadingStatusFlag = reservationEntityList.stream().allMatch(r -> r.getLoadingStatus().equals(ReservationSigningStatusConstant.daiqianshou.getValue()));
-			if (loadingStatusFlag) {
-				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
-			} else {
-				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
-			}
-		}
-		distributionDeliveryListMapper.updateById(deliveryListEntity);
-
-	}
-
 	/**
 	 * 判断包件是否该下架
 	 *
@@ -912,83 +489,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 //	}
 
 
-	@Override
-	public void checkLoadingByDelivery(Long deliveryId) {
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
-		if (Func.isNotEmpty(deliveryListEntity)) {
-			List<DistributionParcelListEntity> deliveryParcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(deliveryId);
-			boolean deliveryLoadingFlag = deliveryParcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-			if (deliveryLoadingFlag) {
-				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
-			} else {
-				deliveryLoadingFlag = deliveryParcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-				if (deliveryLoadingFlag) {
-					deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
-				} else {
-					deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
-				}
-			}
-			distributionDeliveryListMapper.updateById(deliveryListEntity);
-		}
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		if (Func.isNotEmpty(reservationEntityList) && !reservationEntityList.isEmpty()) {
-			for (DistributionReservationEntity reservationEntity : reservationEntityList) {
-				List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationEntity.getId());
-				Map<Long, List<DistributionParcelListEntity>> order = parcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getStockArticleId));
-				order.forEach((k, v) -> {
-					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(k);
-					List<DistributionParcelListEntity> stockArticlePackageList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, k));
-					if (stockArticlePackageList.size() == v.size()) {
-						boolean orderLoadingFlag = v.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-						if (orderLoadingFlag) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-						} else {
-							orderLoadingFlag = v.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-							if (!orderLoadingFlag) {
-								stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-							}
-						}
-					} else {
-						boolean orderbufenLoadingFlag = v.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-						if (orderbufenLoadingFlag) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-						}
-					}
-					distributionStockArticleService.updateById(stockArticleEntity);
-				});
-				boolean reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-				if (reservationLoadingFlag) {
-					reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-				} else {
-					reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()));
-					if (reservationLoadingFlag) {
-						reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
-					} else {
-						reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
-					}
-				}
-				distributionReservationMapper.updateById(reservationEntity);
-			}
-
-		}
-	}
-
-	@Override
-	public void checkOrderLoadingStatus(Long orderId) {
-		if (Func.isNotEmpty(orderId)) {
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(orderId);
-			Integer orderLoadingNum = distributionLoadscanMapper.selectOrderLoadingNum(stockArticleEntity.getId());
-			if (Func.isNotEmpty(orderLoadingNum) && orderLoadingNum > 0) {
-				if (stockArticleEntity.getTotalNumber().equals(orderLoadingNum)) {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-				} else {
-					stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-				}
-				distributionStockArticleService.updateById(stockArticleEntity);
-			}
-		}
-	}
-
 	@Override
 	@Transactional
 	public void checkReservationStatusAndLoadingStatusByPackage(Long packageId) {
@@ -1447,21 +947,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		maintenanceDeliveryPackageNum(deliveryId);
 	}
 
-	@Override
-	public void updatepackageListLoadingStatus(List<DistributionParcelListEntity> updatePackageList, Long warehouseId) {
-		List<Long> packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
-
-		if (Func.isNotEmpty(packageIds)) {
-			Integer i = distributionParcelListMapper.updatePackageListByIds(packageIds);
-		}
-		String collect = updatePackageList.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
-
-		if(StringUtils.isNotBlank(collect)){
-			warehouseUpdownTypeClient.downPackageOrDelTray(collect, warehouseId, "装车下架解托");
-		}
-
-//		进行批量下架
-	}
 
 	@Override
 	@Transactional
@@ -1966,47 +1451,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	}
 
-	/**
-	 * @param l
-	 */
-	@Override
-	@Transactional
-	public void releaseBillLadingResource(Long l, Long warehouseId) {
-		List<DistrilbutionBillPackageEntity> list = billPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
-			.eq(DistrilbutionBillPackageEntity::getBillLadingId, l)
-			.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, 2)
-		);
-		if (Func.isNotEmpty(list)) {
-			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());
-			if (Func.isNotEmpty(packageIds)) {
-				distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
-					.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
-					.set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue())
-					.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue())
-					.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue())
-					.in(DistributionParcelListEntity::getId, packageIds)
-				);
-				billPackageService.update(new UpdateWrapper<DistrilbutionBillPackageEntity>().lambda()
-					.set(DistrilbutionBillPackageEntity::getPacketBarStatus, 2)
-					.eq(DistrilbutionBillPackageEntity::getBillLadingId, l)
-					.in(DistrilbutionBillPackageEntity::getParceListId, packageIds)
-				);
-				//增加释放日志
-
-
-
-			}
-			String collect = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(","));
-			distributionStockArticleService.maintenanceOrderInfo(collect, warehouseId);
-			//维护自提单订单信息
-			distrilbutionBillStockService.maintenanceOrderInfo(l);
-		}
-
-	}
-
 
 	/**
 	 * 定制品 修改备货时间
@@ -2461,141 +1905,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	}
 
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void checkStockArticleSignStatus(DistributionParcelListEntity parcelListEntity) {
-//		parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-//		distributionParcelListService.updateById(parcelListEntity);
-		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		//通过包件的装车状态来维护订单的出库状态
-		if (flag) {
-			//订单状态为已签收
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-		} else {
-			//订单状态为部分签收
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
-		}
-		distributionStockArticleService.updateById(stockArticleEntity);
-	}
-
-	@Override
-	public void checkStockArticleListSigningStatus(DisStockListDetailEntity detailEntity) {
-		List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
-			.eq(DisStockListDetailEntity::getReservationId, detailEntity.getReservationId())
-			.eq(DisStockListDetailEntity::getStockListId, detailEntity.getStockListId())
-			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-		DistributionReservationStocklistEntity distributionReservationStocklistEntity = distributionReservationStocklistMapper.selectOne(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
-			.eq(DistributionReservationStocklistEntity::getReservationId, detailEntity.getReservationId())
-			.eq(DistributionReservationStocklistEntity::getStocklistId, detailEntity.getStockListId())
-			.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationInventoryStatusConstant.quxiao.getValue()));
-		boolean loadingStatusFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-		if (loadingStatusFlag) {
-			distributionReservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue());
-		} else {
-			loadingStatusFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue()));
-			if (loadingStatusFlag) {
-				distributionReservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue());
-			} else {
-				distributionReservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.yizhuangche.getValue());
-			}
-		}
-		boolean signingStatusFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue()));
-		if (signingStatusFlag) {
-			distributionReservationStocklistEntity.setLoadingStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-		} else {
-			signingStatusFlag = list.stream().allMatch(l -> l.getStockLockingStatus().equals(ReservationSigningStatusConstant.daiqianshou.getValue()));
-			if (signingStatusFlag) {
-				distributionReservationStocklistEntity.setLoadingStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
-			} else {
-				distributionReservationStocklistEntity.setLoadingStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			}
-		}
-		distributionReservationStocklistMapper.updateById(distributionReservationStocklistEntity);
-
-	}
 
 
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void changeOrderStatus(String barcode, Long deliveryId) {
-		//这里需要查询出该包件
-		DistributionParcelListEntity parcelListEntity = distributionDeliveryListMapper.getLoadingPackageDetails(barcode, deliveryId);
-		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-		distributionParcelListService.updateById(parcelListEntity);
-		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		if (flag) {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-		} else {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-		}
-		distributionStockArticleService.updateById(stockArticleEntity);
-	}
-
-	@LogpmAsync("asyncExecutor")
-	@Override
-	@Transactional(isolation = Isolation.READ_UNCOMMITTED, rollbackFor = Exception.class)
-	public void changeDeliverySignforListStatus(Long deliveryId, DistributionParcelListEntity parcelListEntity) {
-		//这里需要查询出该包件
-		parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-		//修改包件状态
-		distributionParcelListService.updateById(parcelListEntity);
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
-		//订单签收状态
-		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
-		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		//维护包件、订单扫描装车状态
-		if (flag) {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-		} else {
-			flag = parcelListEntityList.stream().allMatch(p -> !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-			if (flag) {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-			} else {
-				stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
-			}
-		}
-		distributionStockArticleService.updateById(stockArticleEntity);
-		//维护包件、预约的扫描状态
-		//查询出配送任务下的所有包件
-		List<DistributionParcelListEntity> deliveryParcelListEntityList = distributionDeliveryListMapper.selectPackageListByDeliveryListId(deliveryId);
-		boolean deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-		if (deliveryLoadingFlag) {
-			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-		} else {
-			deliveryLoadingFlag = deliveryParcelListEntityList.stream().allMatch(p -> !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-			if (deliveryLoadingFlag) {
-				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
-			} else {
-				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-			}
-		}
-		distributionDeliveryListMapper.updateById(deliveryListEntity);
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(deliveryId);
-		reservationEntityList.forEach(r -> {
-			//查询预约下的所有包件信息
-			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(r.getId());
-			boolean reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-			if (reservationLoadingFlag) {
-				r.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			} else {
-				reservationLoadingFlag = parcelListEntities.stream().allMatch(p -> !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
-				if (reservationLoadingFlag) {
-					r.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
-				} else {
-					r.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
-				}
-			}
-			distributionReservationMapper.updateById(r);
-		});
-	}
-
 	@Override
 	@Transactional
 	public void changeOrderReservationStatus(DistributionStockArticleDTO stockArticleDTO) {
@@ -2982,14 +2293,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	}
 
-	@ChangeAsync()
-	@Override
-	public DistributionStockArticleEntity findDistributionStockArticleEntityByIdForAsync(String tenantId, Long id) {
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(id);
-
-		return stockArticleEntity;
-	}
-
 
 	@Override
 	@LogpmAsync("asyncExecutor")

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

@@ -592,7 +592,13 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
 					stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - list1.size());
-					distributionStockArticleMapper.updateById(stockArticleEntity);
+
+
+					DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+					t.setId(stockArticleEntity.getId());
+					t.setHandQuantity(stockArticleEntity.getHandQuantity());
+					t.setGenre(stockArticleEntity.getGenre());
+					distributionStockArticleMapper.updateById(t);
 				}
 				//查询库存品的订单
 				List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda()
@@ -606,11 +612,20 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
 					stockArticleEntity.setHandQuantity(0);
-					distributionStockArticleMapper.updateById(stockArticleEntity);
+					DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+					t.setId(stockArticleEntity.getId());
+					t.setHandQuantity(stockArticleEntity.getHandQuantity());
+					t.setGenre(stockArticleEntity.getGenre());
+					distributionStockArticleMapper.updateById(t);
 				} else {
 					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
 					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
-					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
+
+
+					DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+					t.setId(distributionStockArticleEntity.getId());
+					t.setHandQuantity(distributionStockArticleEntity.getHandQuantity());
+					distributionStockArticleMapper.updateById(t);
 				}
 			});
 			if (!aaa.isEmpty()) {
@@ -1048,6 +1063,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.findByWaybillNumber(waybillNumber);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findByWaybillNumberAndOrderCode(String waybillNumber,String orderCode) {
+		return baseMapper.findByWaybillNumberAndOrderCode(waybillNumber,orderCode);
+	}
+
 	@Override
 	public Integer restorePakcageByIds(List<Long> packageIds) {
 		return baseMapper.restorePakcageByIds(packageIds);

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

@@ -176,7 +176,14 @@ public class DistributionUnpackingDetailsServiceImpl extends BaseServiceImpl<Dis
 				stockListEntity.setUnpackingQuantity(stockListEntity.getUnpackingQuantity() - Quantity.get());
 				stockListEntity.setOutboundQuantity(stockListEntity.getOutboundQuantity() - Quantity.get());
 				stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() + Quantity.get());
-				distributionStockListService.updateById(stockListEntity);
+
+				DistributionStockListEntity t = new DistributionStockListEntity();
+				t.setId(stockListEntity.getId());
+				t.setUnpackingQuantity(stockListEntity.getUnpackingQuantity());
+				t.setOutboundQuantity(stockListEntity.getOutboundQuantity());
+				t.setQuantityStock(stockListEntity.getQuantityStock());
+				t.setUnpack(stockListEntity.getUnpack());
+				distributionStockListService.updateById(t);
 			}else {
 				log.error(method+"取消拆包失败，存在多个父级库存品ID");
 				throw new CustomerException("操作失败");

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

@@ -350,7 +350,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//修改库存品数据
 				if (!stockEntityList.isEmpty()) {
 					stockEntityList.forEach(i -> {
-						DistributionStockListEntity byId = distributionStockListService.getById(i.getId());
 						DistributionStockListEntity updateWrapper = new DistributionStockListEntity();
 						updateWrapper.setId(i.getId());
 						updateWrapper.setQuantityStock(i.getQuantityStock());

blade-service/logpm-report/src/main/java/com/logpm/report/ReportApplication.java

@@ -13,4 +13,4 @@ public class ReportApplication {
 	public static void main(String[] args) {
 		BladeApplication.run(ModuleNameConstant.APPLICATION_REPORT_NAME, ReportApplication.class, args);
 	}
-	}
+}

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BusinessRatioMapper.xml

@@ -14,7 +14,9 @@
             brand as name,
             SUM(total_count) as value
         from logpm_platform.logpm_warehouse_waybill
-        where create_time between #{startTime} and #{endTime}
+        where create_time between #{startTime} and #{endTime} and brand is not null and brand != ''
         group by brand
+        order by SUM(total_count) desc
+        limit 5
     </select>
 </mapper>

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

@@ -30,18 +30,18 @@ public class BillingDataServiceImpl implements IBillingDataService {
 	public BillingDataVO getBillingData() {
 		// 今天的数据
 		BillingDataInfoVO today = billingDataMapper.getBillingData(
-			DateUtil.format(new Date(), "yyyy-MM-dd 00:00:00"),
-			DateUtil.format(new Date(), "yyyy-MM-dd 23:59:59")
+			DateUtil.format(new Date(), "2024-MM-dd 00:00:00"),
+			DateUtil.format(new Date(), "2024-MM-dd 23:59:59")
 		);
 		// 当月的数据
 		BillingDataInfoVO month = billingDataMapper.getBillingData(
-			DateUtil.format(new Date(), "yyyy-MM-01 00:00:00"),
-			DateUtil.format(new Date(), "yyyy-MM-31 23:59:59")
+			DateUtil.format(new Date(), "2024-MM-01 00:00:00"),
+			DateUtil.format(new Date(), "2024-MM-31 23:59:59")
 		);
 		// 年的数据
 		BillingDataInfoVO year = billingDataMapper.getBillingData(
-			DateUtil.format(new Date(), "yyyy-01-01 00:00:00"),
-			DateUtil.format(new Date(), "yyyy-12-31 23:59:59")
+			DateUtil.format(new Date(), "2024-01-01 00:00:00"),
+			DateUtil.format(new Date(), "2024-12-31 23:59:59")
 		);
 
 		BillingDataVO billingDataVO = new BillingDataVO();
@@ -55,9 +55,14 @@ public class BillingDataServiceImpl implements IBillingDataService {
 	@Override
 	public List<WarehouseBillingDataVO> getWarehouseBillingData() {
 		List<WarehouseInfoVO> warehouselist = mapWarehouseMapper.warehouselist();
+//		List<WarehouseBillingDataVO> warehouseBillingData = billingDataMapper.getWarehouseBillingData(
+//			DateUtil.format(new Date(), "yyyy-01-01 00:00:00"),
+//			DateUtil.format(new Date(), "yyyy-12-31 23:59:59")
+//		);
+
 		List<WarehouseBillingDataVO> warehouseBillingData = billingDataMapper.getWarehouseBillingData(
-			DateUtil.format(new Date(), "yyyy-01-01 00:00:00"),
-			DateUtil.format(new Date(), "yyyy-12-31 23:59:59")
+			DateUtil.format(new Date(), "2024-01-01 00:00:00"),
+			DateUtil.format(new Date(), "2024-12-31 23:59:59")
 		);
 
 		Map<Long, WarehouseInfoVO> warehouseBillingDataMap = warehouselist.stream().collect(Collectors.toMap(WarehouseInfoVO::getWarehouseId, v -> v));
@@ -80,9 +85,14 @@ public class BillingDataServiceImpl implements IBillingDataService {
 
 	@Override
 	public List<MonthBillingDataVO> getMonthBillingData() {
+//		return billingDataMapper.getMonthBillingData(
+//			DateUtil.format(new Date(), "yyyy-01-01 00:00:00"),
+//			DateUtil.format(new Date(), "yyyy-12-31 23:59:59")
+//		);
+
 				return billingDataMapper.getMonthBillingData(
-			DateUtil.format(new Date(), "yyyy-01-01 00:00:00"),
-			DateUtil.format(new Date(), "yyyy-12-31 23:59:59")
+			DateUtil.format(new Date(), "2024-01-01 00:00:00"),
+			DateUtil.format(new Date(), "2024-12-31 23:59:59")
 		);
 	}
 }

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

@@ -19,10 +19,14 @@ public class BusinessRationServiceImpl implements IBusinessRationService {
 
 	private final BusinessRatioMapper businessRatioMapper;
 
+
 	@Override
 	public BusinessRatioDataVO getBusinessRatioData() {
-		String startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00"));
-		String endTime   = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59"));
+//		String startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00"));
+//		String endTime   = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59"));
+
+		String startTime = "2024-01-01 00:00:00";
+		String endTime   = "2024-12-31 23:59:59";
 
 		BusinessRatioDataVO businessRatioDataVO = new BusinessRatioDataVO();
 		businessRatioDataVO.setType(businessRatioMapper.getTypeData(startTime, endTime));

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java

@@ -210,7 +210,7 @@ public class MerchantStatisticsController {
 				return R.fail(405, "请选择正确的对账单");
 			}
 
-			List<StatisticsOrderInfoVO> statisticsOrderInfoVO = statisticsOrderInfoService.findOrderDetail(reconciliationOrderId);
+			List<StatisticsOrderInfoVO> statisticsOrderInfoVO = statisticsOrderInfoService.getStatisticsOrderInfoVOListByReconciliationOrderId(reconciliationOrderId);
 
 			return R.data(statisticsOrderInfoVO);
 		} catch (CustomerException e) {

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java

@@ -53,4 +53,6 @@ public interface StatisticsOrderInfoMapper extends BaseMapper<StatisticsOrderInf
 
 	IPage<StatisticsOrderInfoVO> pageList2B(IPage<Object> page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
 	List<StatisticsOrderInfoVO> pageList2BNoPage( @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
+
+	List<StatisticsOrderInfoVO> findStatisticsOrderInfoVOByReconciliationOrderId(@Param("reconciliationOrderId")  Long reconciliationOrderId);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.logpm.statistics.mapper.StatisticsOrderInfoMapper">
 
-    <select id="pageList" resultType="com.logpm.statistics.vo.StatisticsOrderInfoVO">
+    <sql id="selectStatisticsOrderInfoVO">
         select lsoi.id orderInfoId,
         lsoi.brand_id brandId,
         lsoi.brand brand,
@@ -42,6 +42,10 @@
         from logpm_statistics_order_info lsoi
         left join logpm_basicdata_client lbc on lbc.id = lsoi.consignee_id
         left join logpm_warehouse_waybill lww on lww.id = lsoi.waybill_id
+    </sql>
+
+    <select id="pageList" resultType="com.logpm.statistics.vo.StatisticsOrderInfoVO">
+        <include refid="selectStatisticsOrderInfoVO"/>
         where 1=1
         and lsoi.create_reconciliation_order_status = 0
         <if test="param.listType == 1">
@@ -1048,6 +1052,17 @@
         </foreach>
         group by lsoi.id
     </select>
+    <select id="findStatisticsOrderInfoVOByReconciliationOrderId"
+            resultType="com.logpm.statistics.vo.StatisticsOrderInfoVO">
+        <include refid="selectStatisticsOrderInfoVO"/>
+        <where>
+            <if test="reconciliationOrderId != null">
+                and lsoi.reconciliation_order_id = #{reconciliationOrderId}
+            </if>
+        </where>
+
+
+    </select>
 
 
     <delete id="deleteDataByWaybillId" >

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

@@ -18,6 +18,8 @@ public interface IStatisticsOrderInfoService extends BaseService<StatisticsOrder
 
 	IPage<StatisticsOrderInfoVO> pageList(MerchantStatisticsDTO merchantStatisticsDTO);
 
+	List<StatisticsOrderInfoVO> getStatisticsOrderInfoVOListByReconciliationOrderId(Long reconciliationOrderId);
+
 	StatisticsReconciliationOrderInfoVO findChangesRecordList(MerchantStatisticsDTO merchantStatisticsDTO);
 
 	R addChangesRecord(ChangesRecordDTO changesRecordDTO);

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

@@ -33,7 +33,6 @@ import com.logpm.statistics.service.*;
 import com.logpm.statistics.vo.*;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.DictBizConstant;
@@ -268,24 +267,26 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		return statisticsOrderInfoVOIPage;
 	}
 
-	@NotNull
-	private IPage<StatisticsOrderInfoVO> getStatisticsOrderInfoVOIPage2C(MerchantStatisticsDTO merchantStatisticsDTO, IPage<Object> page) {
-		IPage<StatisticsOrderInfoVO> statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO);
-		List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
-		if (CollUtil.isEmpty(records)) {
-			return statisticsOrderInfoVOIPage;
+
+
+	@Override
+	public List<StatisticsOrderInfoVO> getStatisticsOrderInfoVOListByReconciliationOrderId(Long reconciliationOrderId){
+		List<StatisticsOrderInfoVO> statisticsOrderInfoVOList = baseMapper.findStatisticsOrderInfoVOByReconciliationOrderId(reconciliationOrderId);
+		buildListForStatisOrderInfoVO(statisticsOrderInfoVOList);
+		return statisticsOrderInfoVOList;
 	}
 
+	private void buildListForStatisOrderInfoVO(List<StatisticsOrderInfoVO> statisticsOrderInfoVOList) {
 		//把records中所有的orderInfoId放入一个集合
-		List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
+		List<Long> orderInfoIdList = statisticsOrderInfoVOList.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
 		// 得到运单ID集合
-		Set<Long> waybillIds = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet());
+		Set<Long> waybillIds = statisticsOrderInfoVOList.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet());
 
 		// 查询运单明细集合
 		List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds);
 
 		//得到运单号
-		Set<String> orderCodeSet = records.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet());
+		Set<String> orderCodeSet = statisticsOrderInfoVOList.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet());
 
 
 		// 通过运单号进行分组
@@ -307,7 +308,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 		List<AdvanceDetailDTO> advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet);
 
-		records.forEach(statisticsOrderInfoVO -> {
+		statisticsOrderInfoVOList.forEach(statisticsOrderInfoVO -> {
 //			Long waybillId = statisticsOrderInfoVO.getWaybillId();
 
 
@@ -405,6 +406,18 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 			}
 
 		});
+	}
+
+	@NotNull
+	private IPage<StatisticsOrderInfoVO> getStatisticsOrderInfoVOIPage2C(MerchantStatisticsDTO merchantStatisticsDTO, IPage<Object> page) {
+		IPage<StatisticsOrderInfoVO> statisticsOrderInfoVOIPage = baseMapper.pageList(page, merchantStatisticsDTO);
+		List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
+		if (CollUtil.isEmpty(records)) {
+			return statisticsOrderInfoVOIPage;
+		}
+
+		//把records中所有的orderInfoId放入一个集合
+		buildListForStatisOrderInfoVO(records);
 		statisticsOrderInfoVOIPage.setRecords(records);
 		return statisticsOrderInfoVOIPage;
 	}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java

@@ -1,5 +1,6 @@
 package com.logpm.trunkline.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
 import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
 import com.logpm.trunkline.service.ITrunklineCarsLoadService;
@@ -55,4 +56,20 @@ public class TrunklineCarsLoadScanClient implements ITrunklineCarsLoadScanClient
 	public void removeLoadScanByIds(List<Long> scanloadIdList) {
 		trunklineCarsLoadScanService.deleteListByCarsLoadScanIds(scanloadIdList);
 	}
+
+	@Override
+	public List<TrunklineCarsLoadScanEntity> findAllListByWaybillNo(String waybillNo) {
+		LambdaQueryWrapper<TrunklineCarsLoadScanEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(TrunklineCarsLoadScanEntity::getWaybillNo,waybillNo);
+		return trunklineCarsLoadScanService.list(lambdaQueryWrapper);
+
+	}
+
+	@Override
+	public List<TrunklineCarsLoadScanEntity> findAllListByWaybillNoAndOrderCode(String waybillNo, String orderCode) {
+		LambdaQueryWrapper<TrunklineCarsLoadScanEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(TrunklineCarsLoadScanEntity::getWaybillNo,waybillNo);
+		lambdaQueryWrapper.eq(TrunklineCarsLoadScanEntity::getOrderCode,orderCode);
+		return trunklineCarsLoadScanService.list(lambdaQueryWrapper);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java

@@ -119,7 +119,12 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<Trunk
 			}
 			Integer realNum = billladingWaybillEntity.getRealNum();
 			billladingWaybillEntity.setRealNum(realNum+1);
-			trunklineBillladingWaybillService.updateById(billladingWaybillEntity);
+
+			TrunklineBillladingWaybillEntity t = new TrunklineBillladingWaybillEntity();
+			t.setId(billladingWaybillEntity.getId());
+			t.setRealNum(billladingWaybillEntity.getRealNum());
+
+			trunklineBillladingWaybillService.updateById(t);
 			waybillEntity.setStockCount(finishNum+1);
 
 			if(allTotalNum.equals(waybillEntity.getStockCount())){
@@ -171,15 +176,27 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<Trunk
 				noWaybillData.setRealVolume(BigDecimal.ZERO);
 				trunklineBillladingWaybillService.save(noWaybillData);
 			}else{
+
+
 				Integer realNum = noWaybillData.getRealNum();
 				noWaybillData.setRealNum(realNum+1);
-				trunklineBillladingWaybillService.updateById(noWaybillData);
+
+				TrunklineBillladingWaybillEntity t =new TrunklineBillladingWaybillEntity();
+				t.setRealNum(noWaybillData.getRealNum());
+				t.setId(noWaybillData.getId());
+				trunklineBillladingWaybillService.updateById(t);
 			}
 		}
 
 		int rn = trunklineBillladingEntity.getRealNum();
 		trunklineBillladingEntity.setRealNum(rn+1);
-		trunklineBillladingService.updateById(trunklineBillladingEntity);
+
+
+		TrunklineBillladingEntity t= new TrunklineBillladingEntity();
+		t.setRealNum(trunklineBillladingEntity.getRealNum());
+		t.setId(trunklineBillladingEntity.getId());
+
+		trunklineBillladingService.updateById(t);
 
 		//根据提货单id重新计算每个运单的费用
 		trunklineBillladingWaybillService.updateBillladingFeeByBillladingId(trunklineBillladingEntity);
@@ -387,7 +404,12 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<Trunk
 			int all = advanceDetailList.size();
 
 			billladingEntity.setRealNum(realNum+all);
-			trunklineBillladingService.updateById(billladingEntity);
+
+			TrunklineBillladingEntity t =new TrunklineBillladingEntity();
+			t.setId(billladingEntity.getId());
+			t.setRealNum(billladingEntity.getRealNum());
+
+			trunklineBillladingService.updateById(t);
 		}
 
 		List<WarehouseWaybillEntity> warehouseWaybillEntities = new ArrayList<>();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -392,6 +392,9 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		log.info("#############updateBillladingStatus: 更新提货单状态 type={}",type);
 
 		TrunklineBillladingEntity billladingEntity = baseMapper.selectById(billladingId);
+		TrunklineBillladingEntity updateEntity = new TrunklineBillladingEntity();
+		updateEntity.setId(billladingEntity.getId());
+
 		if (!Objects.isNull(billladingEntity)) {
 			String billladingCode = billladingEntity.getBillladingCode();
 
@@ -414,6 +417,10 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					if ("1".equals(billladingStatus)) {
 						billladingEntity.setBillladingStatus("2");
 						billladingEntity.setStartTime(CommonUtil.StringToDate(completeTime));
+						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
+						updateEntity.setStartTime(billladingEntity.getStartTime());
+
+
 						stringBuffer.append(",未开始变更为提货中");
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为提货中 billladingStatus={}", billladingStatus);
@@ -425,6 +432,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					if ("2".equals(billladingStatus)) {
 						billladingEntity.setBillladingStatus("3");
 						billladingEntity.setEndTime(CommonUtil.StringToDate(completeTime));
+						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
+						updateEntity.setEndTime(billladingEntity.getEndTime());
 						stringBuffer.append(",提货中变更为提货完成");
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为已完成 billladingStatus={}", billladingStatus);
@@ -436,6 +445,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					if ("3".equals(billladingStatus)) {
 						billladingEntity.setBillladingStatus("2");
 						billladingEntity.setEndTime(null);
+						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
+						updateEntity.setEndTime(billladingEntity.getEndTime());
 						stringBuffer.append(",提货完成变更为提货中");
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为提货中 billladingStatus={}", billladingStatus);
@@ -450,6 +461,14 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 						billladingEntity.setSettlementTime(date);
 						billladingEntity.setSettlementId(AuthUtil.getUserId());
 						billladingEntity.setSettlementName(AuthUtil.getNickName());
+
+
+						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
+						updateEntity.setSettlementTime(billladingEntity.getSettlementTime());
+						updateEntity.setSettlementId(billladingEntity.getSettlementId());
+						updateEntity.setSettlementName(billladingEntity.getSettlementName());
+
+
 						stringBuffer.append(",提货完成变更为已结算,时间").append(CommonUtil.dateToString(date)).append(",变更人").append(AuthUtil.getNickName());
 
 						List<TrunklineBillladingWaybillEntity> billladingWaybillEntities = billladingWaybillService.findNoFinishWaybillByBillladingId(billladingId);
@@ -460,6 +479,9 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 
 						Set<Long> waybillIdSet = map.keySet();
 						List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet));
+
+						List<WarehouseWaybillEntity> list =new ArrayList<>();
+
 						waybillEntityList.forEach(waybillEntity -> {
 							Integer integer = map.get(waybillEntity.getId());
 							if(Objects.isNull(integer)){
@@ -470,8 +492,13 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 								billladingNum = 0;
 							}
 							waybillEntity.setBillladingNum(Math.max(billladingNum - integer, 0));
+							WarehouseWaybillEntity updateWaybill= new WarehouseWaybillEntity();
+							updateWaybill.setId(waybillEntity.getId());
+							updateWaybill.setBillladingNum(waybillEntity.getBillladingNum());
+
+							list.add(updateWaybill);
 						});
-						warehouseWaybillClient.updateList(waybillEntityList);
+						warehouseWaybillClient.updateList(list);
 
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为已结算 billladingStatus={}", billladingStatus);
@@ -494,6 +521,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 				case 6:
 					//取消提货
 					billladingEntity.setBillladingStatus("5");
+					updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
 					stringBuffer.append(",变更为取消提货,时间").append(CommonUtil.dateToString(new Date())).append(",变更人").append(AuthUtil.getNickName());
 					break;
 				default:
@@ -501,7 +529,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					throw new CustomerException(405, "未知的更新操作");
 			}
 			//更新状态
-			updateById(billladingEntity);
+			updateById(updateEntity);
 			logEntity.setContent(stringBuffer.toString());
 			logEntity.setAfterOpreation(JSON.toJSONString(billladingEntity));
 			trunklineBillladingLogService.save(logEntity);
@@ -666,7 +694,13 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		billladingEntity.setRealNum(numVO.getNum());
 		billladingEntity.setRealWeight(numVO.getWeight());
 		billladingEntity.setRealVolume(numVO.getVolume());
-		updateById(billladingEntity);
+
+		TrunklineBillladingEntity t = new TrunklineBillladingEntity();
+		t.setId(billladingEntity.getId());
+		t.setRealNum(billladingEntity.getRealNum());
+		t.setRealWeight(billladingEntity.getRealWeight());
+		t.setRealVolume(billladingEntity.getRealVolume());
+		updateById(t);
 
 		billladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
 
@@ -764,7 +798,11 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 				int size = billladingPackageEntities.size();
 				noWaybillNoBillladingWaybill.setRealNum(realNum-size);
 			}
-			billladingWaybillService.updateById(noWaybillNoBillladingWaybill);
+
+			TrunklineBillladingWaybillEntity t = new TrunklineBillladingWaybillEntity();
+			t.setId(noWaybillNoBillladingWaybill.getId());
+			t.setRealNum(noWaybillNoBillladingWaybill.getRealNum());
+			billladingWaybillService.updateById(t);
 		}
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java

@@ -109,7 +109,10 @@ public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<Trunk
 				fee = price.multiply(rv);
 			}
 			billladingWaybillEntity.setBillladingFee(fee);
-			updateById(billladingWaybillEntity);
+			TrunklineBillladingWaybillEntity t =new TrunklineBillladingWaybillEntity();
+			t.setId(billladingWaybillEntity.getId());
+			t.setBillladingFee(fee);
+			updateById(t);
 		}
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLogServiceImpl.java

@@ -173,7 +173,10 @@ public class TrunklineCarsLoadLogServiceImpl extends BaseServiceImpl<TrunklineCa
 				return;
 			}else{
 				carsLoadLogEntity1.setContent(content);
-				updateById(carsLoadLogEntity1);
+				TrunklineCarsLoadLogEntity t = new TrunklineCarsLoadLogEntity();
+				t.setContent(content);
+				t.setId(carsLoadLogEntity1.getId());
+				updateById(t);
 				return;
 			}
 		}
@@ -189,8 +192,11 @@ public class TrunklineCarsLoadLogServiceImpl extends BaseServiceImpl<TrunklineCa
 				save(carsLoadLogEntity);
 				return;
 			}else{
+				TrunklineCarsLoadLogEntity t = new TrunklineCarsLoadLogEntity();
+				t.setContent(content);
+				t.setId(carsLoadLogEntity1.getId());
 				carsLoadLogEntity1.setContent(content);
-				updateById(carsLoadLogEntity1);
+				updateById(t);
 				return;
 			}
 		}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -598,7 +598,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadEntity.setCustomerNum(CollUtil.isEmpty(list) ? 0 : list.size());
 		carsLoadEntity.setIsCustomer(CollUtil.isEmpty(list) ? "2" : "1");
 
-		updateById(carsLoadEntity);
+
+		TrunklineCarsLoadEntity t = new TrunklineCarsLoadEntity();
+		t.setId(carsLoadEntity.getId());
+		t.setCustomerNum(carsLoadEntity.getCustomerNum());
+		t.setIsCustomer(carsLoadEntity.getIsCustomer());
+		updateById(t);
 
 //		for (TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity : list) {
 //			Long signOrderId = trunklineLoadSignOrderEntity.getId();

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

@@ -118,14 +118,18 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 			.eq(WarehouseTrayGoodsEntity::getAssociationType,"1")
 			.eq(WarehouseTrayGoodsEntity::getWarehouseId,warehouseId)
 		);
-		Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 		int i = trayGoodsEntity.getNum() - num;
 		log.info("零担解托>>>>>>>>>>>当前托上数量:{},计划解托数量:{}",trayGoodsEntity.getNum(),num);
 		if (i == 0){
 			baseMapper.deleteEntityByTrayGoodsId(trayGoodsEntity.getId());
 		}else {
 			trayGoodsEntity.setNum(i);
-			baseMapper.updateById(trayGoodsEntity);
+
+			WarehouseTrayGoodsEntity t = new WarehouseTrayGoodsEntity();;
+			t.setNum(i);
+			t.setId(trayGoodsEntity.getId());
+
+			baseMapper.updateById(t);
 			WarehouseTrayGoodsLogEntity copy = Func.copy(trayGoodsEntity, WarehouseTrayGoodsLogEntity.class);
 			copy.setNum(num);
 			copy.setId(null);