Merge branch 'dev' into 商家2.0

# Conflicts:
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java

@@ -42,6 +42,9 @@ public interface RabbitConstant {
 	String UNLOAD_CAR_COM_INFO_QUEUE = "unload_car_com_info_quere";
 	String UNLOAD_CAR_COM_INFO_EXCHANGE = "unload_car_com_info_exchange" + ModuleNameConstant.DEVAUTH;
 	String UNLOAD_CAR_COM_INFO_ROUTING = "unload_car_com_info_routing ";
+	String HWY_UNLOAD_CAR_COM_INFO_QUEUE = "hwy_unload_car_com_info_quere";
+	String HWY_UNLOAD_CAR_COM_INFO_EXCHANGE = "hwy_unload_car_com_info_exchange" + ModuleNameConstant.DEVAUTH;
+	String HWY_UNLOAD_CAR_COM_INFO_ROUTING = "hwy_unload_car_com_info_routing ";
 
 
 	String WAYBILL_DATA_QUEUE = "waybill_data_queue" + ModuleNameConstant.DEVAUTH;

blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java

@@ -38,6 +38,19 @@ public abstract class FanoutConstants {
 
 		}
 
+		//包件日志
+		interface PACKAGNODE{
+
+			//交换机
+			String EXCHANGE = "fanout.trunkline.packagenode" + ModuleNameConstant.DEVAUTH;
+
+			interface QUEUE {
+
+				String PACKAGE_SIGN = "fanout.trunkline.packagenode.statisticsdata.packagesign" + ModuleNameConstant.DEVAUTH;
+
+			}
+
+		}
 
 	}
 

blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java

@@ -38,6 +38,10 @@ public abstract class FactoryDataConstants {
 			 * 工厂数据转暂存单
 			 */
 			String ADVANCE_ORDER = "factory.data.exchange.topic.advanceOrder" + DEVAUTH;
+			/**
+			 * 工厂数据转暂存单-欧派
+			 */
+			String ADVANCE_ORDER_OUPAI = "factory.data.exchange.topic.advanceOrder.oupai" + DEVAUTH;
 
 
 		}
@@ -51,6 +55,10 @@ public abstract class FactoryDataConstants {
 			 * 工厂数据转暂存单
 			 */
 			String ADVANCE_ORDER = "factory.data.queue.advanceOrder" + DEVAUTH;
+			/**
+			 * 工厂数据转暂存单
+			 */
+			String ADVANCE_ORDER_OUPAI = "factory.data.queue.advanceOrder.oupai" + DEVAUTH;
 
 			/**
 			 * 志邦作业节点数据推送
@@ -68,6 +76,7 @@ public abstract class FactoryDataConstants {
 			/**
 			 * 林氏工厂订单
 			 */
+			String LINSY_NODE_DATA_PUSH = "factory.data.queue.linsy.nodeDataPush" + DEVAUTH;
 			String LINSY_FACTORY_ORDER = "factory.data.queue.linsy.factoryOrder" + DEVAUTH;
 			/**
 			 * 金牌工厂订单
@@ -111,6 +120,7 @@ public abstract class FactoryDataConstants {
 			/**
 			 * 林氏工厂订单
 			 */
+			String LINSY_NODE_DATA_PUSH = "linsy.nodeDataPush" + DEVAUTH;
 			String LINSY_FACTORY_ORDER = "linsy.factoryOrder" + DEVAUTH;
 			/**
 			 * 金牌工厂订单

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

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 在库订单包件清单 Feign接口类
@@ -94,6 +95,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX + "/getListByOrderCodeAndgroundingStatus")
 	List<DistributionParcelListEntity> getListByOrderCodeAndgroundingStatus(@RequestParam String orderCode, @RequestParam String groundingStatus, @RequestParam Long warehouseId);
+
 	@PostMapping(API_PREFIX + "/update")
 	void update(@RequestBody DistributionParcelListEntity distributionParcelListEntity);
 
@@ -104,6 +106,7 @@ public interface IDistributionParcelListClient {
 
 	/**
 	 * 查询订单下所有包件信息
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -127,6 +130,7 @@ public interface IDistributionParcelListClient {
 
 	/**
 	 * 根据包条码和仓库ID查询订单相关信息
+	 *
 	 * @param orderPackCode 包条码
 	 * @param warehouseId   仓库ID
 	 * @return
@@ -136,6 +140,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX + "/queryOrderByOrderPackageCode")
 	R<DistributionParcelListEntity> queryOrderByOrderPackageCode(@RequestParam String orderPackageCode);
+
 	@GetMapping(API_PREFIX + "/updateTransferStatus")
 	void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer);
 
@@ -178,4 +183,10 @@ public interface IDistributionParcelListClient {
 	@PostMapping(API_PREFIX + "/findAllOrderCodesByAdvanceIds")
 	List<String> findAllOrderCodesAndDeleteByAdvanceIds(@RequestParam List<Long> advanceIds, @RequestParam Long warehouseId);
 
+	@GetMapping(API_PREFIX + "/findPackageCodeByCodes")
+	Map<String, Set<String>> findPackageCodeByCodes(@RequestBody Set<String> keySet);
+
+	@PostMapping(API_PREFIX + "/saveorUpdateBatchByOP")
+	void saveorUpdateBatchByOP(@RequestBody List<DistributionParcelListEntity> parcelListEntityList);
+
 }

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

@@ -24,6 +24,7 @@ import com.logpm.distribution.vo.UpDownStockupAreaVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -86,14 +87,19 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/findEntityByStockArticleId")
 	DistributionStockArticleEntity findEntityByStockArticleId(@RequestParam Long stockArticleId);
+
 	@GetMapping(API_PREFIX + "/fingListByServiceNumber")
 	List<Map> fingListByServiceNumber(@RequestParam String serviceNumber, @RequestParam Long warehouseId);
+
 	@GetMapping(API_PREFIX + "/findListByWaybillNumber")
 	List<DistributionStockArticleEntity> findListByWaybillNumber(@RequestParam String waybillNumber);
+
 	@GetMapping(API_PREFIX + "/findStockArticleByOrderCodeAndWarehouseId")
 	DistributionStockArticleEntity findStockArticleByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId);
+
 	@GetMapping(API_PREFIX + "/findListByWaybillNumberAndWarehouseId")
 	List<DistributionStockArticleEntity> findListByWaybillNumberAndWarehouseId(@RequestParam String waybillNumber, @RequestParam Long warehouseId);
+
 	@GetMapping(API_PREFIX + "/updateGroundingStatus")
 	void updateGroundingStatus(@RequestParam String orderCode, @RequestParam String groundingStatus, @RequestParam Long warehouseId);
 
@@ -115,6 +121,7 @@ public interface IDistributionStockArticleClient {
 
 	/**
 	 * 查询订单信息数据
+	 *
 	 * @return
 	 */
 	@PostMapping(GETSTOCKARTICLEINFO)
@@ -134,6 +141,7 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/updateOrderInfo")
 	void updateOrderInfo(@RequestParam String orderCode, @RequestParam Long warehouseId);
+
 	@PostMapping(API_PREFIX + "/updateOrdersInfo")
 	void updateOrdersInfo(@RequestBody OrderPackageDTO orderPackageDTO);
 
@@ -158,4 +166,13 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/maintenanceOrderMall")
 	Boolean maintenanceOrderMall(@RequestParam String orderIds);
+
+	/**
+	 * 全仓更新未预约的在库定单的客户信息
+	 *
+	 * @param data 更新信息
+	 * @return
+	 */
+	@PostMapping(value = API_PREFIX + "/updateCustomerAllByOrderCode",consumes = MediaType.APPLICATION_JSON_VALUE)
+	void updateCustomerAllByOrderCode(@RequestBody String data);
 }

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java

@@ -16,11 +16,14 @@ import java.util.concurrent.ConcurrentHashMap;
 public class FactoryDataUtil {
 
 	static Map<String, String> factorys = new ConcurrentHashMap();
+
 	private FactoryDataUtil() {
 
 	}
+
 	static {
 		factorys.put(BrandEnums.ZB.getValue(), FactoryDataConstants.Mq.RoutingKeys.ZBOM_NODE_DATA_PUSH);
+		factorys.put(BrandEnums.LINSY.getValue(), FactoryDataConstants.Mq.RoutingKeys.LINSY_NODE_DATA_PUSH);
 	}
 
 

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java

@@ -0,0 +1,33 @@
+package com.logpm.factorydata.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.logpm.factorydata.enums.BrandEnums;
+import com.logpm.factorydata.enums.SignForStatusEnums;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springblade.common.constant.WorkNodeEnums;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 提送数据
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-18 0:45
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PushData implements Serializable {
+
+	/**
+	 * 包件
+	 */
+	private String packageCode;
+
+}

blade-service-api/logpm-factory-data-zbom-api/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"><parent><artifactId>blade-service-api</artifactId><groupId>org.springblade</groupId><version>3.2.0.RELEASE</version></parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.logpm</groupId>
+    <artifactId>logpm-factory-data-zbom-api</artifactId>
+    <version>${bladex.project.version}</version>
+    <packaging>jar</packaging>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

blade-service-api/logpm-factory-data-zbom-api/src/main/java/com/logpm/factorydata/zbom/feign/IFactoryDataZbomClient.java

@@ -0,0 +1,30 @@
+package com.logpm.factorydata.zbom.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author zhaoqiaobo
+ * @create 2024-03-16 15:04
+ */
+@FeignClient(value = ModuleNameConstant.LOGPM_FACTORY_DATA_ZBOM_NAME)
+public interface IFactoryDataZbomClient {
+
+	String API_PREFIX = "/client/factoryDataZbom";
+	String ORDER = API_PREFIX + "/order";
+
+
+	/**
+	 * 保存志邦的订单数据
+	 *
+	 * @param data
+	 * @return org.springblade.core.tool.api.R<java.lang.String>
+	 * @author zqb 2024/5/25
+	 **/
+	@PostMapping(ORDER)
+	R<String> order(@RequestBody String data);
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java

@@ -0,0 +1,17 @@
+package com.logpm.statistics.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MerchantStatisticsDTO implements Serializable {
+
+	private Integer pageSize;
+	private Integer pageNum;
+
+	private Long waybillInfoId;
+
+	private Long orderInfoId;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java

@@ -0,0 +1,132 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("logpm_statistics_distribution_package")
+@ApiModel(value = "StatisticsDistributionPackage对象", description = "结算配送包件明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsDistributionPackageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 运单id
+	 */
+	@ApiModelProperty(value = "运单id")
+	private Long waybillId;
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类名称")
+	private String productName;
+
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	private Integer totalNum;
+
+	/**
+	 * 重量
+	 */
+	@ApiModelProperty(value = "重量")
+	private BigDecimal totalWeight;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal totalVolume;
+
+	private BigDecimal openPrice;
+	private BigDecimal totalPrice;
+	private BigDecimal deliveryServiceFee;
+	private BigDecimal deliveryFee;
+	private BigDecimal deliveryLoadingFee;
+	private BigDecimal deliverySortingFee;
+	private BigDecimal deliveryUpfloorFee;
+	private BigDecimal deliveryMoveFee;
+	private BigDecimal deliveryDistance;
+	private BigDecimal deliveryCrossingFee;
+	private Integer isAftersales;
+	private BigDecimal aftersalesPrice;
+	private Integer hasStatement;
+	private Long statementCreateTime;
+	private String statementCreateUser;
+	private Integer isZero;
+	private BigDecimal realDeliveryServiceFee;
+	private BigDecimal realDeliveryFee;
+	private BigDecimal realDeliveryLoadingFee;
+	private BigDecimal realDeliverySortingFee;
+	private BigDecimal realDeliveryUpfloorFee;
+	private BigDecimal realDeliveryMoveFee;
+	private BigDecimal realDeliveryDistance;
+	private BigDecimal realDeliveryCrossingFee;
+	private Integer goodsType; //1 订制品  2零担  3库存品
+	private String typeService; //1 商配  2市配  3自提  4三方中转
+
+	private Long orderInfoId;
+
+	private Integer isSign;//是否签收 0否 1是
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsOrderInfoEntity.java

@@ -43,6 +43,12 @@ public class StatisticsOrderInfoEntity extends TenantEntity {
 	private String orderCode;
 	private Long waybillId;
 	private String waybillNo;
+	private String typeService;
+	private Integer signStatus;// 签收状态 0未签收 1部分签收 2已签收
 
+	private Integer confirmStatisticsOrder;//0未确认 1已确认
+
+	private Long waybillInfoId;//运单维度id
+	private Long statisticsOrderId;//结算单id
 
 }

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java

@@ -8,13 +8,12 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
-@TableName("logpm_statistics_package_info")
-@ApiModel(value = "StatisticsPackageInfo对象", description = "结算包件明细表")
+@TableName("logpm_statistics_trunkline_package")
+@ApiModel(value = "StatisticsTrunklinePackage对象", description = "结算干线包件明细表")
 @EqualsAndHashCode(callSuper = true)
-public class StatisticsPackageInfoEntity extends TenantEntity {
+public class StatisticsTrunklinePackageEntity extends TenantEntity {
 
 	/**
 	 * 预留1
@@ -103,22 +102,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private BigDecimal totalPrice;
 	private BigDecimal pickupFee;
 	private BigDecimal freightFee;
-	private Date incomingTime;
-	private Date outingTime;
-	private String warehouseFeeInterval;
-	private BigDecimal warehouseServiceFee;
-	private BigDecimal warehouseFee;
-	private BigDecimal warehouseManageFee;
-	private BigDecimal warehouseSortingFee;
-	private BigDecimal warehouseOperatingFee;
-	private BigDecimal deliveryServiceFee;
-	private BigDecimal deliveryFee;
-	private BigDecimal deliveryLoadingFee;
-	private BigDecimal deliverySortingFee;
-	private BigDecimal deliveryUpfloorFee;
-	private BigDecimal deliveryMoveFee;
-	private BigDecimal deliveryDistance;
-	private BigDecimal deliveryCrossingFee;
 	private BigDecimal installFee;
 	private BigDecimal quotationFee;
 	private BigDecimal claimingValue;
@@ -137,20 +120,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private Integer isZero;
 	private BigDecimal realPickupFee;
 	private BigDecimal realFreightFee;
-	private String realWarehouseFeeInterval;
-	private BigDecimal realWarehouseServiceFee;
-	private BigDecimal realWarehouseFee;
-	private BigDecimal realWarehouseManageFee;
-	private BigDecimal realWarehouseSortingFee;
-	private BigDecimal realWarehouseOperatingFee;
-	private BigDecimal realDeliveryServiceFee;
-	private BigDecimal realDeliveryFee;
-	private BigDecimal realDeliveryLoadingFee;
-	private BigDecimal realDeliverySortingFee;
-	private BigDecimal realDeliveryUpfloorFee;
-	private BigDecimal realDeliveryMoveFee;
-	private BigDecimal realDeliveryDistance;
-	private BigDecimal realDeliveryCrossingFee;
 	private BigDecimal realInstallFee;
 	private BigDecimal realQuotationFee;
 	private BigDecimal realClaimingValue;
@@ -165,4 +134,6 @@ public class StatisticsPackageInfoEntity extends TenantEntity {
 	private Integer goodsType; //1 订制品  2零担  3库存品
 	private String typeService; //1 商配  2市配  3自提  4三方中转
 
+	private Long orderInfoId;
+
 }

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java

@@ -0,0 +1,130 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("logpm_statistics_warehouse_package")
+@ApiModel(value = "StatisticsWarehousePackage对象", description = "结算仓库包件明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsWarehousePackageEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 运单id
+	 */
+	@ApiModelProperty(value = "运单id")
+	private Long waybillId;
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
+
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类名称")
+	private String productName;
+
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	private Integer totalNum;
+
+	/**
+	 * 重量
+	 */
+	@ApiModelProperty(value = "重量")
+	private BigDecimal totalWeight;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal totalVolume;
+
+	private BigDecimal openPrice;
+	private BigDecimal totalPrice;
+	private Date incomingTime;
+	private Date outingTime;
+	private String warehouseFeeInterval;
+	private BigDecimal warehouseServiceFee;
+	private BigDecimal warehouseFee;
+	private BigDecimal warehouseManageFee;
+	private BigDecimal warehouseSortingFee;
+	private BigDecimal warehouseOperatingFee;
+	private Integer isAftersales;
+	private BigDecimal aftersalesPrice;
+	private Integer hasStatement;
+	private Long statementCreateTime;
+	private String statementCreateUser;
+	private Integer isZero;
+	private String realWarehouseFeeInterval;
+	private BigDecimal realWarehouseServiceFee;
+	private BigDecimal realWarehouseFee;
+	private BigDecimal realWarehouseManageFee;
+	private BigDecimal realWarehouseSortingFee;
+	private BigDecimal realWarehouseOperatingFee;
+
+	private Integer goodsType; //1 订制品  2零担  3库存品
+	private String typeService; //1 商配  2市配  3自提  4三方中转
+
+	private Long orderInfoId;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWaybillInfoEntity.java

@@ -0,0 +1,48 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_statistics_waybill_info")
+@ApiModel(value = "StatisticsWaybillInfo对象", description = "结算运单明细表")
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsWaybillInfoEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	private Long waybillId;
+	private String waybillNo;
+	private String typeService;
+
+	private Integer confirmStatisticsOrder;//0未确认 1部分确认 2已确认
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsWaybillInfoVO.java

@@ -0,0 +1,117 @@
+package com.logpm.statistics.vo;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class StatisticsWaybillInfoVO extends StatisticsWaybillInfoEntity {
+
+	private String brand;
+	private String orderNo;
+	private String shipper;
+	private String shipperPerson;
+	private String shipperMobile;
+	private String shipperAddress;
+	private String consignee;
+	private String consigneePerson;
+	private String consigneeMobile;
+	private String consigneeAddress;
+	private String departure;
+	private String destination;
+	private String departureWarehouseName;
+	private String destinationWarehouseName;
+	private String deliveryMethod;
+	private String customerTrain;
+	private String receiptStatus;
+	private String waybillRemark;
+	private String statisticsFang;
+	private String payType;
+	private String payWay;
+	private String isAftersales;
+	private BigDecimal aftersalesFee;
+	private BigDecimal totalStatementFee;
+	private String statementStatus;
+	private BigDecimal hasStatementFee;
+	private String statementCreateUser;
+	private Integer isChanges;
+	private BigDecimal changesFee;
+	private String changesItems;
+	private String changesRemark;
+	private String changesTime;//最晚一条
+	private Integer signNum;
+	private Date signTime;//最晚一条
+	private String statisticsStatus;//结算状态
+//	private String statisticsStatus;//结算状态
+
+	private String storeBusiness;
+	private String waybillStatus;
+	private Integer isEdit;
+	private Integer isCheck;
+	private Date openTime;
+	private String goodsName;
+	private String goodsTypeNum;
+	private Integer productTypeNum;
+	private Integer totalcount;
+	private BigDecimal totalWeight;
+	private BigDecimal totalVolume;
+	private BigDecimal totalFee;
+	private BigDecimal openFee;
+	private BigDecimal pickupFee;
+	private BigDecimal realPickupFee;
+	private BigDecimal freightFee;
+	private BigDecimal realFreightFee;
+	private BigDecimal installFee;
+	private BigDecimal realInstallFee;
+	private BigDecimal quotationFee;
+	private BigDecimal realQuotationFee;
+	private BigDecimal claimingValue;
+	private BigDecimal realClaimingValue;
+	private BigDecimal otherFee;
+	private BigDecimal realOtherFee;
+	private BigDecimal returnFee;
+	private BigDecimal realReturnFee;
+	private BigDecimal thirdOprationFee;
+	private BigDecimal realThirdOprationFee;
+	private BigDecimal xPay;
+	private BigDecimal realXPay;
+	private BigDecimal dPay;
+	private BigDecimal realDPay;
+	private BigDecimal hPay;
+	private BigDecimal realHPay;
+	private BigDecimal yPay;
+	private BigDecimal realYPay;
+	private Date incomingTime;
+	private Date outingTime;
+	private String warehouseFeeInterval;
+	private BigDecimal warehouseServiceFee;
+	private BigDecimal realWarehouseServiceFee;
+	private BigDecimal warehouseFee;
+	private BigDecimal realWarehouseFee;
+	private BigDecimal warehouseManageFee;
+	private BigDecimal realWarehouseManageFee;
+	private BigDecimal warehouseSortingFee;
+	private BigDecimal realWarehouseSortingFee;
+	private BigDecimal warehouseOperatingFee;
+	private BigDecimal realWarehouseOperatingFee;
+	private BigDecimal deliveryServiceFee;
+	private BigDecimal realDeliveryServiceFee;
+	private BigDecimal deliveryFee;
+	private BigDecimal realDeliveryFee;
+	private BigDecimal deliveryLoadingFee;
+	private BigDecimal realDeliveryLoadingFee;
+	private BigDecimal deliverySortingFee;
+	private BigDecimal realDeliverySortingFee;
+	private BigDecimal deliveryUpfloorFee;
+	private BigDecimal realDeliveryUpfloorFee;
+	private BigDecimal deliveryMoveFee;
+	private BigDecimal realDeliveryMoveFee;
+	private BigDecimal deliveryDistance;
+	private BigDecimal realDeliveryDistance;
+	private BigDecimal deliveryCrossingFee;
+	private BigDecimal realDeliveryCrossingFee;
+
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceDetailVO.java

@@ -12,5 +12,6 @@ public class TrunklineAdvanceDetailVO extends TrunklineAdvanceDetailEntity {
 	private String trayName;
 
 	private String goodsName;
+	private Long goodsId;
 
 }

blade-service-api/pom.xml

@@ -44,6 +44,7 @@
         <module>logpm-factory-data-base-api</module>
         <!-- 商家转化模块 -->
         <module>logpm-business-conversion-api</module>
+        <module>logpm-factory-data-zbom-api</module>
     </modules>
 
     <dependencies>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -179,16 +179,16 @@
         ldsl.cargo_norms cargoNorms,
         ldsl.market_name marketName,
         ldsl.warehouse_name warehouseName,
-            lwug.position_code positionCode,
-            lwga.column_num columnNum,
-            lwga.layer_num layerNum,
+        lwga.qr_code positionCode,
         lwtg.create_time operateTime,
         lwtg.num num,
         lwtg.create_user operateUser
         FROM
         logpm_warehouse_tray_goods lwtg
-                JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id
-                left join (logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id =lwga.id) on lwug.association_id = ldsl.material_id
+        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch
+        LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id
+        LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id
         <where>
             ldsl.is_deleted = 0 and lwtg.is_deleted = 0 and  lwtg.association_type = 4 and  lwtg.tray_id = #{param.id}
             <if test="param.cargoNumber !=null and param.cargoNumber != ''">
@@ -197,12 +197,12 @@
             <if test="param.descriptionGoods !=null and param.descriptionGoods != ''">
                 and ldsl.description_goods   like concat('%',#{param.descriptionGoods},'%')
             </if>
-            <if test="param.columnNum !=null and param.columnNum != ''">
-                and ldsl.column_num  like concat('%',#{param.columnNum},'%')
-            </if>
-            <if test="param.layerNum !=null and param.layerNum != ''">
-                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')
-            </if>
+<!--            <if test="param.columnNum !=null and param.columnNum != ''">-->
+<!--                and ldsl.column_num  like concat('%',#{param.columnNum},'%')-->
+<!--            </if>-->
+<!--            <if test="param.layerNum !=null and param.layerNum != ''">-->
+<!--                and ldsl.layer_num  like concat('%',#{param.layerNum},'%')-->
+<!--            </if>-->
              <if test="param.cargoNorms !=null and param.cargoNorms != ''">
                 and ldsl.cargo_norms  like concat('%',#{param.cargoNorms},'%')
             </if>

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

@@ -1346,6 +1346,9 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				String trunkLinePrice = excel.getTrunkLinePrice();
 				String dispatchPrice = excel.getDispatchPrice();
 				if (StrUtil.isNotEmpty(pickupPrice) && Convert.toDouble(pickupPrice) > 0) {
+					String pickupPricingType = templateEntity.getPickupPricingType();
+					// 提货费的计价方式是否包含整车
+					if (StrUtil.isNotEmpty(pickupPricingType) && StrUtil.contains(pickupPricingType, PickupPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) {
 						boolean b = ObjectUtil.isNotEmpty(pickupIsUnifyAreaBill) && ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
 						BasicdataPriceFullVehicleEntity entity = null;
 						if (b) {
@@ -1392,7 +1395,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 						}
 					}
 
+				}
+
 				if (StrUtil.isNotEmpty(trunkLinePrice) && Convert.toDouble(trunkLinePrice) > 0) {
+					String pricingType = templateEntity.getTrunklinePricingType();
+					// 提货费的计价方式是否包含整车
+					if (StrUtil.isNotEmpty(pricingType) && StrUtil.contains(pricingType, TrunkLinePricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) {
 						boolean b = ObjectUtil.isNotEmpty(trunklineIsUnifyAreaBill) && ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
 						BasicdataPriceFullVehicleEntity entity = null;
 						if (b) {
@@ -1438,8 +1446,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 							entities.add(entity);
 						}
 					}
+				}
 
 				if (StrUtil.isNotEmpty(dispatchPrice) && Convert.toDouble(dispatchPrice) > 0) {
+					String pricingType = templateEntity.getDispatchPricingType();
+					// 提货费的计价方式是否包含整车
+					if (StrUtil.isNotEmpty(pricingType) && StrUtil.contains(pricingType, DispatchPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) {
 						BasicdataPriceFullVehicleEntity entity = null;
 						if (dispatchEntityMap.containsKey(excel.getClient() + excel.getBrand() + excel.getVehicleType())) {
 							entity = dispatchEntityMap.get(excel.getClient() + excel.getBrand() + excel.getVehicleType());
@@ -1462,6 +1474,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 						// 价格
 						entity.setPrice(Convert.toDouble(dispatchPrice));
 					}
+				}
 
 			}
 			if (CollUtil.isNotEmpty(pickupEntityMap)) {
@@ -1556,6 +1569,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				String dispatchMinCost = basicExcel.getDispatchMinCost();
 				String dispatchLeaveBehindMinCost = basicExcel.getDispatchLeaveBehindMinCost();
 				if (StrUtil.isNotEmpty(pickupMinCost) && Convert.toDouble(pickupMinCost) > 0) {
+					Integer isMinCost = templateEntity.getPickupIsMinCost();
+					if (ObjectUtil.isNotEmpty(isMinCost) && ObjectUtil.equal(isMinCost, BooleanZeroOneEnums.YES.getCode())) {
 						boolean b = ObjectUtil.isNotEmpty(pickupIsUnifyAreaBill) && ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
 						// 服务类型
 						BasicdataPriceGeneralEntity basicEntity = null;
@@ -1601,7 +1616,11 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 						}
 					}
 
+				}
+
 				if (StrUtil.isNotEmpty(trunkLineMinCost) && Convert.toDouble(trunkLineMinCost) > 0) {
+					Integer isMinCost = templateEntity.getTrunklineIsMinCost();
+					if (ObjectUtil.isNotEmpty(isMinCost) && ObjectUtil.equal(isMinCost, BooleanZeroOneEnums.YES.getCode())) {
 						boolean b = ObjectUtil.isNotEmpty(trunklineIsUnifyAreaBill) && ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
 						// 服务类型
 						BasicdataPriceGeneralEntity basicEntity = null;
@@ -1645,9 +1664,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 							entities.add(basicEntity);
 						}
 					}
+				}
 
 				if (StrUtil.isNotEmpty(dispatchMinCost) && Convert.toDouble(dispatchMinCost) > 0) {
 					// 服务类型
+					Integer isMinCost = templateEntity.getDispatchIsMinCost();
+					if (ObjectUtil.isNotEmpty(isMinCost) && ObjectUtil.equal(isMinCost, BooleanZeroOneEnums.YES.getCode())) {
 						BasicdataPriceGeneralEntity basicEntity = null;
 						if (dispatchEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
 							basicEntity = dispatchEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
@@ -1666,9 +1688,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 							basicEntity.setAdditionalCost(Convert.toDouble(basicExcel.getDispatchAddCost()));
 						}
 					}
+				}
 
 				if (StrUtil.isNotEmpty(dispatchLeaveBehindMinCost) && Convert.toDouble(dispatchLeaveBehindMinCost) > 0) {
 					// 服务类型
+					Integer isMinCost = templateEntity.getDispatchIsMinCost();
+					if (ObjectUtil.isNotEmpty(isMinCost) && ObjectUtil.equal(isMinCost, BooleanZeroOneEnums.YES.getCode())) {
 						BasicdataPriceGeneralEntity basicEntity = null;
 						if (dispatchLeaveBehindEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
 							basicEntity = dispatchLeaveBehindEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
@@ -1687,6 +1712,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 							basicEntity.setAdditionalCost(Convert.toDouble(basicExcel.getDispatchLeaveBehindAddCost()));
 						}
 					}
+				}
 
 				String dispatchUpwardJudgment = basicExcel.getDispatchUpwardJudgment();
 				if (StrUtil.isNotEmpty(dispatchUpwardJudgment)) {
@@ -1800,241 +1826,218 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				String pickupPrice = basicExcel.getPickupPrice();
 				String trunkLinePrice = basicExcel.getTrunkLinePrice();
 				if (StrUtil.isNotEmpty(pickupPrice) && Convert.toDouble(pickupPrice) > 0) {
-					Long routeId = null;
-					Integer pickupIsByCategory = templateEntity.getPickupIsByCategory();
-					// 按品类计费
-					boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
-					// 按区域计费 有路径的
-					boolean b = ObjectUtil.isNotEmpty(pickupIsUnifyAreaBill) && ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
-					BasicdataPriceCategoryBasicEntity basicEntity = null;
-					if (b) {
-						if (!ObjectUtil.isAllEmpty(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getSendOrg())) {
-							String key = buildRoutKeyV2(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getStartProvince(),
-								basicExcel.getStartCity(), basicExcel.getStartArea(), basicExcel.getEndProvince(),
-								basicExcel.getEndCity(), basicExcel.getEndArea(), basicExcel.getSendOrg(), "1");
-							BasicdataPriceRouteEntity routeEntity = routeEntityMap.get(key);
-							if (ObjectUtil.isNotEmpty(routeEntity)) {
-								routeId = routeEntity.getId();
+					buildSaveBasicExcel(categoryEntityMap, routeEntityMap, pickupEntityMap, basicExcel, priceEntity, templateEntity, pickupIsUnifyAreaBill, pickupPrice);
 				}
-						} else {
-							log.error("价格体系导入CategoryBasic数据无法处理,模板配置的按区域计费，数据不满足路径条件：{}", JSONUtil.toJsonStr(basicExcel));
-							continue;
+				if (StrUtil.isNotEmpty(trunkLinePrice) && Convert.toDouble(trunkLinePrice) > 0) {
+					buildSaveTrunkLineExcel(categoryEntityMap, routeEntityMap, trunkLineEntityMap, basicExcel, priceEntity, templateEntity, trunklineIsUnifyAreaBill, trunkLinePrice);
 				}
+				String withinThirtyPrice = basicExcel.getWithinThirtyPrice();
+				String betweenThirtySixtyPrice = basicExcel.getBetweenThirtySixtyPrice();
+				String beyondSixtyPrice = basicExcel.getBeyondSixtyPrice();
+				String beyondNinetyPrice = basicExcel.getBeyondNinetyPrice();
+				// 4个仓储费只要有一个不为空则创建
+				if ((ObjectUtil.isNotEmpty(withinThirtyPrice) && Convert.toDouble(withinThirtyPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(betweenThirtySixtyPrice) && Convert.toDouble(betweenThirtySixtyPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(beyondSixtyPrice) && Convert.toDouble(beyondSixtyPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(beyondNinetyPrice) && Convert.toDouble(beyondNinetyPrice) > 0)) {
+					buildSaveWarehouseExcel(categoryEntityMap, warehouseEntityMap, basicExcel, priceEntity, templateEntity);
 				}
-					if (b && categoryFlag) {
-						// 有路径按品类计费 一个客户一条路径一个品类一个价格
-						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory())) {
-							basicEntity = pickupEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory());
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							pickupEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory(), basicEntity);
+				String warehouseOperatePrice = basicExcel.getWarehouseOperatePrice();
+				String warehouseManagementPrice = basicExcel.getWarehouseManagementPrice();
+				String warehouseSortPrice = basicExcel.getWarehouseSortPrice();
+				if ((ObjectUtil.isNotEmpty(warehouseOperatePrice) && Convert.toDouble(warehouseOperatePrice) > 0)
+					|| (ObjectUtil.isNotEmpty(warehouseManagementPrice) && Convert.toDouble(warehouseManagementPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(warehouseSortPrice) && Convert.toDouble(warehouseSortPrice) > 0)) {
+					buildSaveWarehouseAddExcel(categoryEntityMap, warehouseAddEntityMap, basicExcel, priceEntity, templateEntity);
 				}
-					} else if (b && !categoryFlag) {
-						// 有路径不按品类计费,一个客户一条路径一个价格
-						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId)) {
-							basicEntity = pickupEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId);
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							pickupEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId, basicEntity);
+				String dispatchPrice = basicExcel.getDispatchPrice();
+				if (StrUtil.isNotEmpty(dispatchPrice) && Convert.toDouble(dispatchPrice) > 0) {
+					buildSaveDispatchExcel(categoryEntityMap, dispatchEntityMap, basicExcel, priceEntity, templateEntity);
 				}
-					} else if (!b && categoryFlag) {
-						// 没路径 按品类计费 一个客户一个品类一个价格
-						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							basicEntity = pickupEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							pickupEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), basicEntity);
+				String dispatchSortPrice = basicExcel.getDispatchSortPrice();
+				String dispatchHandlingPrice = basicExcel.getDispatchHandlingPrice();
+				String dispatchRelocationPrice = basicExcel.getDispatchRelocationPrice();
+				String dispatchDeliveryPrice = basicExcel.getDispatchDeliveryPrice();
+				if ((ObjectUtil.isNotEmpty(dispatchSortPrice) && Convert.toDouble(dispatchSortPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(dispatchHandlingPrice) && Convert.toDouble(dispatchHandlingPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(dispatchRelocationPrice) && Convert.toDouble(dispatchRelocationPrice) > 0)
+					|| (ObjectUtil.isNotEmpty(dispatchDeliveryPrice) && Convert.toDouble(dispatchDeliveryPrice) > 0)) {
+					buildSaveDispatchAddExcel(categoryEntityMap, dispatchAddEntityMap, basicExcel, priceEntity, templateEntity);
 				}
-					} else {
-						// 没路径 不按品类计费 一个客户一个价格
-						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							basicEntity = pickupEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							pickupEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), basicEntity);
+				String dispatchStairsCarryingCharge = basicExcel.getDispatchStairsCarryingCharge();
+				if (StrUtil.isNotEmpty(dispatchStairsCarryingCharge)) {
+					priceEntity.setDispatchStairsCarryingCharge(Convert.toInt(dispatchStairsCarryingCharge));
 				}
 			}
-					// 按区域计费
-					if (b) {
-						basicEntity.setBoId(routeId);
-					} else {
-						basicEntity.setBoId(priceEntity.getId());
+			if (CollUtil.isNotEmpty(pickupEntityMap)) {
+				basicEntities.addAll(pickupEntityMap.values());
 			}
-					basicEntity.setServiceType(ServiceTypeEnums.PICK_UP.getCode());
-					// 计费类型
-					if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
-						basicEntity.setType(IDict.getCodeByText(PickupPricingTypeEnums.class, basicExcel.getPickupUnit()));
+			if (CollUtil.isNotEmpty(trunkLineEntityMap)) {
+				basicEntities.addAll(trunkLineEntityMap.values());
 			}
-					basicEntity.setPriceId(priceEntity.getId());
-					// 品类
-					if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
-						if (ObjectUtil.isNotEmpty(categoryEntityMap.get(basicExcel.getCategory()))) {
-							if (categoryFlag) {
-								basicEntity.setCategoryId(categoryEntityMap.get(basicExcel.getCategory()).getId());
+			if (CollUtil.isNotEmpty(warehouseEntityMap)) {
+				warehouseEntities.addAll(warehouseEntityMap.values());
 			}
+			if (CollUtil.isNotEmpty(warehouseAddEntityMap)) {
+				warehouseEntities.addAll(warehouseAddEntityMap.values());
 			}
+			if (CollUtil.isNotEmpty(dispatchEntityMap)) {
+				dispatchEntities.addAll(dispatchEntityMap.values());
 			}
-					// 价格
-					basicEntity.setPrice(Convert.toDouble(pickupPrice));
+			if (CollUtil.isNotEmpty(dispatchAddEntityMap)) {
+				dispatchEntities.addAll(dispatchAddEntityMap.values());
 			}
-				if (StrUtil.isNotEmpty(trunkLinePrice) && Convert.toDouble(trunkLinePrice) > 0) {
-					Long routeId = null;
-					Integer pickupIsByCategory = templateEntity.getTrunklineIsByCategory();
-					// 按品类计费
-					boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
-					// 按区域计费 有路径的
-					boolean b = ObjectUtil.isNotEmpty(trunklineIsUnifyAreaBill) && ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
-					BasicdataPriceCategoryBasicEntity basicEntity = null;
-					if (b) {
-						if (!ObjectUtil.isAllEmpty(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getSendOrg())) {
-							String key = buildRoutKeyV2(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getStartProvince(),
-								basicExcel.getStartCity(), basicExcel.getStartArea(), basicExcel.getEndProvince(),
-								basicExcel.getEndCity(), basicExcel.getEndArea(), basicExcel.getSendOrg(), "2");
-							BasicdataPriceRouteEntity routeEntity = routeEntityMap.get(key);
-							if (ObjectUtil.isNotEmpty(routeEntity)) {
-								routeId = routeEntity.getId();
 		}
-						} else {
-							log.error("价格体系导入CategoryBasic数据无法处理,模板配置的按区域计费，数据不满足路径条件：{}", JSONUtil.toJsonStr(basicExcel));
-							continue;
 	}
+
+	private void buildSaveDispatchAddExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceCategoryDispatchEntity> dispatchAddEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) {
+		// 配送是否附加费
+		Integer dispatchIsAddFee = templateEntity.getDispatchIsAddFee();
+		if (ObjectUtil.isEmpty(dispatchIsAddFee) || ObjectUtil.equal(dispatchIsAddFee, BooleanZeroOneEnums.NO.getCode())) {
+			return;
 		}
-					if (b && categoryFlag) {
-						// 有路径按品类计费
-						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory())) {
-							basicEntity = trunkLineEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory());
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							trunkLineEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory(), basicEntity);
+		Integer pickupIsByCategory = templateEntity.getDispatchIsByCategory();
+		// 按品类计费
+		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
+		BasicdataPriceCategoryDispatchEntity entity = null;
+		if (categoryFlag) {
+			String key = basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
 			}
-					} else if (b && !categoryFlag) {
-						// 有路径不按品类计费,一个客户一条路径一个价格
-						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId)) {
-							basicEntity = trunkLineEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId);
+			if (dispatchAddEntityMap.containsKey(key)) {
+				entity = dispatchAddEntityMap.get(key);
 			} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							trunkLineEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId, basicEntity);
+				entity = new BasicdataPriceCategoryDispatchEntity();
+				dispatchAddEntityMap.put(key, entity);
 			}
-					} else if (!b && categoryFlag) {
-						// 没路径 按品类计费 一个客户一个品类一个价格
-						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							basicEntity = trunkLineEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
 		} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							trunkLineEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), basicEntity);
+			String key = basicExcel.getClient() + basicExcel.getBrand();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
 			}
+			if (dispatchAddEntityMap.containsKey(key)) {
+				entity = dispatchAddEntityMap.get(key);
 			} else {
-						// 没路径 不按品类计费 一个客户一个价格
-						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							basicEntity = trunkLineEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
-						} else {
-							basicEntity = new BasicdataPriceCategoryBasicEntity();
-							trunkLineEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), basicEntity);
+				entity = new BasicdataPriceCategoryDispatchEntity();
+				dispatchAddEntityMap.put(key, entity);
 			}
 		}
-					// 按区域计费
-					if (b) {
-						basicEntity.setBoId(routeId);
-					} else {
-						basicEntity.setBoId(priceEntity.getId());
-					}
-					basicEntity.setServiceType(ServiceTypeEnums.TRUNK_LINE.getCode());
-					// 计费类型
-					if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
-						basicEntity.setType(IDict.getCodeByText(TrunkLinePricingTypeEnums.class, basicExcel.getTrunkLineUnit()));
+		if (ObjectUtil.isNotEmpty(priceEntity)) {
+			entity.setPriceId(priceEntity.getId());
+			entity.setBoId(priceEntity.getId());
 		}
-					basicEntity.setPriceId(priceEntity.getId());
-					// 品类
 		if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
-						if (ObjectUtil.isNotEmpty(categoryEntityMap.get(basicExcel.getCategory()))) {
+			BasicdataCategoryEntity basicdataCategoryEntity = categoryEntityMap.get(basicExcel.getCategory());
+			if (ObjectUtil.isNotEmpty(basicdataCategoryEntity)) {
 				if (categoryFlag) {
-								basicEntity.setCategoryId(categoryEntityMap.get(basicExcel.getCategory()).getId());
+					entity.setCategoryId(basicdataCategoryEntity.getId());
 				}
 			}
 		}
-					// 价格
-					basicEntity.setPrice(Convert.toDouble(trunkLinePrice));
+		entity.setCostType(CostTypeEnums.ADD.getCode());
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+			entity.setType(IDict.getCodeByText(DispatchPricingTypeEnums.class, basicExcel.getDispatchUnit()));
 		}
-				String withinThirtyPrice = basicExcel.getWithinThirtyPrice();
-				String betweenThirtySixtyPrice = basicExcel.getBetweenThirtySixtyPrice();
-				String beyondSixtyPrice = basicExcel.getBeyondSixtyPrice();
-				String beyondNinetyPrice = basicExcel.getBeyondNinetyPrice();
-				// 4个仓储费只要有一个不为空则创建
-				if ((ObjectUtil.isNotEmpty(withinThirtyPrice) && Convert.toDouble(withinThirtyPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(betweenThirtySixtyPrice) && Convert.toDouble(betweenThirtySixtyPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(beyondSixtyPrice) && Convert.toDouble(beyondSixtyPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(beyondNinetyPrice) && Convert.toDouble(beyondNinetyPrice) > 0)) {
-					Integer pickupIsByCategory = templateEntity.getWarehouseIsByCategory();
+		entity.setServiceType(1);
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchSortPrice())) {
+			entity.setSortPrice(Convert.toDouble(basicExcel.getDispatchSortPrice()));
+		}
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchHandlingPrice())) {
+			entity.setHandlingPrice(Convert.toDouble(basicExcel.getDispatchHandlingPrice()));
+		}
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchRelocationPrice())) {
+			entity.setRelocationPrice(Convert.toDouble(basicExcel.getDispatchRelocationPrice()));
+		}
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchDeliveryPrice())) {
+			entity.setUpstairsDeliveryPrice(Convert.toDouble(basicExcel.getDispatchDeliveryPrice()));
+		}
+	}
+
+	private void buildSaveDispatchExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceCategoryDispatchEntity> dispatchEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) {
+		Integer pickupIsByCategory = templateEntity.getDispatchIsByCategory();
 		// 按品类计费
 		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
-					BasicdataPriceCategoryWarehouseEntity warehouseEntity = null;
+		BasicdataPriceCategoryDispatchEntity entity = null;
 		if (categoryFlag) {
-						if (warehouseEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							warehouseEntity = warehouseEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
+			String key = basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
+			}
+			if (dispatchEntityMap.containsKey(key)) {
+				entity = dispatchEntityMap.get(key);
 			} else {
-							warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
-							warehouseEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), warehouseEntity);
+				entity = new BasicdataPriceCategoryDispatchEntity();
+				dispatchEntityMap.put(key, entity);
 			}
 		} else {
-						if (warehouseEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							warehouseEntity = warehouseEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
+			String key = basicExcel.getClient() + basicExcel.getBrand();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
+			}
+			if (dispatchEntityMap.containsKey(key)) {
+				entity = dispatchEntityMap.get(key);
 			} else {
-							warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
-							warehouseEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), warehouseEntity);
+				entity = new BasicdataPriceCategoryDispatchEntity();
+				dispatchEntityMap.put(key, entity);
 			}
 		}
-
 		if (ObjectUtil.isNotEmpty(priceEntity)) {
-						warehouseEntity.setPriceId(priceEntity.getId());
-						warehouseEntity.setBoId(priceEntity.getId());
+			entity.setPriceId(priceEntity.getId());
+			entity.setBoId(priceEntity.getId());
 		}
 		if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
 			BasicdataCategoryEntity basicdataCategoryEntity = categoryEntityMap.get(basicExcel.getCategory());
 			if (ObjectUtil.isNotEmpty(basicdataCategoryEntity)) {
 				if (categoryFlag) {
-								warehouseEntity.setCategoryId(basicdataCategoryEntity.getId());
+					entity.setCategoryId(basicdataCategoryEntity.getId());
 				}
 			}
 		}
-					warehouseEntity.setCostType(CostTypeEnums.NOMAL.getCode());
-					warehouseEntity.setType(Convert.toInt(templateEntity.getWarehousePricingType()));
-					warehouseEntity.setServiceType(1);
-					if (StrUtil.isNotEmpty(basicExcel.getWithinThirtyPrice())) {
-						warehouseEntity.setWithinThirtyPrice(Convert.toDouble(basicExcel.getWithinThirtyPrice()));
+		entity.setCostType(CostTypeEnums.NOMAL.getCode());
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+			entity.setType(IDict.getCodeByText(DispatchPricingTypeEnums.class, basicExcel.getDispatchUnit()));
 		}
-					if (StrUtil.isNotEmpty(basicExcel.getBetweenThirtySixtyPrice())) {
-						warehouseEntity.setBetweenThirtySixtyPrice(Convert.toDouble(basicExcel.getBetweenThirtySixtyPrice()));
+		entity.setServiceType(1);
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchPrice())) {
+			entity.setPrice(Convert.toDouble(basicExcel.getDispatchPrice()));
 		}
-					if (StrUtil.isNotEmpty(basicExcel.getBeyondSixtyPrice())) {
-						warehouseEntity.setBeyondSixtyPrice(Convert.toDouble(basicExcel.getBeyondSixtyPrice()));
+		if (StrUtil.isNotEmpty(basicExcel.getDispatchLeaveBehindPrice())) {
+			entity.setLeaveBehindPrice(Convert.toDouble(basicExcel.getDispatchLeaveBehindPrice()));
 		}
-					if (StrUtil.isNotEmpty(basicExcel.getBeyondNinetyPrice())) {
-						warehouseEntity.setBeyondNinetyPrice(Convert.toDouble(basicExcel.getBeyondNinetyPrice()));
 	}
+
+	private void buildSaveWarehouseAddExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceCategoryWarehouseEntity> warehouseAddEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) {
+		// 仓储是否附加费
+		Integer warehouseIsAddFee = templateEntity.getWarehouseIsAddFee();
+		if (ObjectUtil.isEmpty(warehouseIsAddFee) || ObjectUtil.equal(warehouseIsAddFee, BooleanZeroOneEnums.NO.getCode())) {
+			return;
 		}
-				String warehouseOperatePrice = basicExcel.getWarehouseOperatePrice();
-				String warehouseManagementPrice = basicExcel.getWarehouseManagementPrice();
-				String warehouseSortPrice = basicExcel.getWarehouseSortPrice();
-				if ((ObjectUtil.isNotEmpty(warehouseOperatePrice) && Convert.toDouble(warehouseOperatePrice) > 0)
-					|| (ObjectUtil.isNotEmpty(warehouseManagementPrice) && Convert.toDouble(warehouseManagementPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(warehouseSortPrice) && Convert.toDouble(warehouseSortPrice) > 0)) {
 		Integer pickupIsByCategory = templateEntity.getWarehouseIsCategorySubjoin();
 		// 按品类计费
 		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
 		BasicdataPriceCategoryWarehouseEntity warehouseEntity = null;
 		if (categoryFlag) {
-						if (warehouseAddEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							warehouseEntity = warehouseAddEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
+			String key = basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
+			}
+			if (warehouseAddEntityMap.containsKey(key)) {
+				warehouseEntity = warehouseAddEntityMap.get(key);
 			} else {
 				warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
-							warehouseAddEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), warehouseEntity);
+				warehouseAddEntityMap.put(key, warehouseEntity);
 			}
 		} else {
-						if (warehouseAddEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							warehouseEntity = warehouseAddEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
+			String key = basicExcel.getClient() + basicExcel.getBrand();
+			if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
+				key = key + basicExcel.getDispatchUnit();
+			}
+			if (warehouseAddEntityMap.containsKey(key)) {
+				warehouseEntity = warehouseAddEntityMap.get(key);
 			} else {
 				warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
-							warehouseAddEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), warehouseEntity);
+				warehouseAddEntityMap.put(key, warehouseEntity);
 			}
 		}
 		if (ObjectUtil.isNotEmpty(priceEntity)) {
@@ -2062,133 +2065,240 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			warehouseEntity.setWarehouseSortPrice(Convert.toDouble(basicExcel.getWarehouseSortPrice()));
 		}
 	}
-				String dispatchPrice = basicExcel.getDispatchPrice();
-				if (StrUtil.isNotEmpty(dispatchPrice) && Convert.toDouble(dispatchPrice) > 0) {
-					Integer pickupIsByCategory = templateEntity.getDispatchIsByCategory();
+
+	private void buildSaveWarehouseExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceCategoryWarehouseEntity> warehouseEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) {
+		Integer pickupIsByCategory = templateEntity.getWarehouseIsByCategory();
 		// 按品类计费
 		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
-					BasicdataPriceCategoryDispatchEntity entity = null;
+		BasicdataPriceCategoryWarehouseEntity warehouseEntity = null;
 		if (categoryFlag) {
-						if (dispatchEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							entity = dispatchEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
+			if (warehouseEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
+				warehouseEntity = warehouseEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
 			} else {
-							entity = new BasicdataPriceCategoryDispatchEntity();
-							dispatchEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), entity);
+				warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
+				warehouseEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), warehouseEntity);
 			}
 		} else {
-						if (dispatchEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							entity = dispatchEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
+			if (warehouseEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
+				warehouseEntity = warehouseEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
 			} else {
-							entity = new BasicdataPriceCategoryDispatchEntity();
-							dispatchEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), entity);
+				warehouseEntity = new BasicdataPriceCategoryWarehouseEntity();
+				warehouseEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), warehouseEntity);
 			}
 		}
+
 		if (ObjectUtil.isNotEmpty(priceEntity)) {
-						entity.setPriceId(priceEntity.getId());
-						entity.setBoId(priceEntity.getId());
+			warehouseEntity.setPriceId(priceEntity.getId());
+			warehouseEntity.setBoId(priceEntity.getId());
 		}
 		if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
 			BasicdataCategoryEntity basicdataCategoryEntity = categoryEntityMap.get(basicExcel.getCategory());
 			if (ObjectUtil.isNotEmpty(basicdataCategoryEntity)) {
 				if (categoryFlag) {
-								entity.setCategoryId(basicdataCategoryEntity.getId());
+					warehouseEntity.setCategoryId(basicdataCategoryEntity.getId());
 				}
 			}
 		}
-					entity.setCostType(CostTypeEnums.NOMAL.getCode());
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
-						entity.setType(IDict.getCodeByText(DispatchPricingTypeEnums.class, basicExcel.getDispatchUnit()));
+		warehouseEntity.setCostType(CostTypeEnums.NOMAL.getCode());
+		warehouseEntity.setType(Convert.toInt(templateEntity.getWarehousePricingType()));
+		warehouseEntity.setServiceType(1);
+		if (StrUtil.isNotEmpty(basicExcel.getWithinThirtyPrice())) {
+			warehouseEntity.setWithinThirtyPrice(Convert.toDouble(basicExcel.getWithinThirtyPrice()));
 		}
-					entity.setServiceType(1);
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchPrice())) {
-						entity.setPrice(Convert.toDouble(basicExcel.getDispatchPrice()));
+		if (StrUtil.isNotEmpty(basicExcel.getBetweenThirtySixtyPrice())) {
+			warehouseEntity.setBetweenThirtySixtyPrice(Convert.toDouble(basicExcel.getBetweenThirtySixtyPrice()));
 		}
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchLeaveBehindPrice())) {
-						entity.setLeaveBehindPrice(Convert.toDouble(basicExcel.getDispatchLeaveBehindPrice()));
+		if (StrUtil.isNotEmpty(basicExcel.getBeyondSixtyPrice())) {
+			warehouseEntity.setBeyondSixtyPrice(Convert.toDouble(basicExcel.getBeyondSixtyPrice()));
 		}
+		if (StrUtil.isNotEmpty(basicExcel.getBeyondNinetyPrice())) {
+			warehouseEntity.setBeyondNinetyPrice(Convert.toDouble(basicExcel.getBeyondNinetyPrice()));
 		}
-				String dispatchSortPrice = basicExcel.getDispatchSortPrice();
-				String dispatchHandlingPrice = basicExcel.getDispatchHandlingPrice();
-				String dispatchRelocationPrice = basicExcel.getDispatchRelocationPrice();
-				String dispatchDeliveryPrice = basicExcel.getDispatchDeliveryPrice();
-				if ((ObjectUtil.isNotEmpty(dispatchSortPrice) && Convert.toDouble(dispatchSortPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(dispatchHandlingPrice) && Convert.toDouble(dispatchHandlingPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(dispatchRelocationPrice) && Convert.toDouble(dispatchRelocationPrice) > 0)
-					|| (ObjectUtil.isNotEmpty(dispatchDeliveryPrice) && Convert.toDouble(dispatchDeliveryPrice) > 0)) {
-					Integer pickupIsByCategory = templateEntity.getDispatchIsByCategory();
+	}
+
+	private void buildSaveTrunkLineExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceRouteEntity> routeEntityMap, Map<String, BasicdataPriceCategoryBasicEntity> trunkLineEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, Integer trunklineIsUnifyAreaBill, String trunkLinePrice) {
+		Long routeId = null;
+		Integer pickupIsByCategory = templateEntity.getTrunklineIsByCategory();
 		// 按品类计费
 		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
-					BasicdataPriceCategoryDispatchEntity entity = null;
-					if(categoryFlag){
-						if (dispatchAddEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory())) {
-							entity = dispatchAddEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory());
+		// 按区域计费 有路径的
+		boolean b = ObjectUtil.isNotEmpty(trunklineIsUnifyAreaBill) && ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
+		BasicdataPriceCategoryBasicEntity basicEntity = null;
+		if (b) {
+			if (!ObjectUtil.isAllEmpty(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getSendOrg())) {
+				String key = buildRoutKeyV2(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getStartProvince(),
+					basicExcel.getStartCity(), basicExcel.getStartArea(), basicExcel.getEndProvince(),
+					basicExcel.getEndCity(), basicExcel.getEndArea(), basicExcel.getSendOrg(), "2");
+				BasicdataPriceRouteEntity routeEntity = routeEntityMap.get(key);
+				if (ObjectUtil.isNotEmpty(routeEntity)) {
+					routeId = routeEntity.getId();
+				}
+			}
+		}
+		if (b && categoryFlag) {
+			// 有路径按品类计费
+			String key = basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
+				key = key + basicExcel.getTrunkLineUnit();
+			}
+			if (trunkLineEntityMap.containsKey(key)) {
+				basicEntity = trunkLineEntityMap.get(key);
 			} else {
-							entity = new BasicdataPriceCategoryDispatchEntity();
-							dispatchAddEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory(), entity);
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				trunkLineEntityMap.put(key, basicEntity);
 			}
+		} else if (b && !categoryFlag) {
+			// 有路径不按品类计费,一个客户一条路径一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand() + routeId;
+			if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
+				key = key + basicExcel.getTrunkLineUnit();
+			}
+			if (trunkLineEntityMap.containsKey(key)) {
+				basicEntity = trunkLineEntityMap.get(key);
 			} else {
-						if (dispatchAddEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand())) {
-							entity = dispatchAddEntityMap.get(basicExcel.getClient() + basicExcel.getBrand());
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				trunkLineEntityMap.put(key, basicEntity);
+			}
+		} else if (!b && categoryFlag) {
+			// 没路径 按品类计费 一个客户一个品类一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
+				key = key + basicExcel.getTrunkLineUnit();
+			}
+			if (trunkLineEntityMap.containsKey(key)) {
+				basicEntity = trunkLineEntityMap.get(key);
 			} else {
-							entity = new BasicdataPriceCategoryDispatchEntity();
-							dispatchAddEntityMap.put(basicExcel.getClient() + basicExcel.getBrand(), entity);
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				trunkLineEntityMap.put(key, basicEntity);
 			}
+		} else {
+			// 没路径 不按品类计费 一个客户一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand();
+			if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
+				key = key + basicExcel.getTrunkLineUnit();
 			}
-					if (ObjectUtil.isNotEmpty(priceEntity)) {
-						entity.setPriceId(priceEntity.getId());
-						entity.setBoId(priceEntity.getId());
+			if (trunkLineEntityMap.containsKey(key)) {
+				basicEntity = trunkLineEntityMap.get(key);
+			} else {
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				trunkLineEntityMap.put(key, basicEntity);
 			}
+		}
+		// 按区域计费
+		if (b) {
+			basicEntity.setBoId(routeId);
+		} else {
+			basicEntity.setBoId(priceEntity.getId());
+		}
+		basicEntity.setServiceType(ServiceTypeEnums.TRUNK_LINE.getCode());
+		// 计费类型
+		if (StrUtil.isNotEmpty(basicExcel.getTrunkLineUnit())) {
+			basicEntity.setType(IDict.getCodeByText(TrunkLinePricingTypeEnums.class, basicExcel.getTrunkLineUnit()));
+		}
+		basicEntity.setPriceId(priceEntity.getId());
+		// 品类
 		if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
-						BasicdataCategoryEntity basicdataCategoryEntity = categoryEntityMap.get(basicExcel.getCategory());
-						if (ObjectUtil.isNotEmpty(basicdataCategoryEntity)) {
+			if (ObjectUtil.isNotEmpty(categoryEntityMap.get(basicExcel.getCategory()))) {
 				if (categoryFlag) {
-								entity.setCategoryId(basicdataCategoryEntity.getId());
+					basicEntity.setCategoryId(categoryEntityMap.get(basicExcel.getCategory()).getId());
 				}
 			}
 		}
-					entity.setCostType(CostTypeEnums.ADD.getCode());
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchUnit())) {
-						entity.setType(IDict.getCodeByText(DispatchPricingTypeEnums.class, basicExcel.getDispatchUnit()));
+		// 价格
+		basicEntity.setPrice(Convert.toDouble(trunkLinePrice));
 	}
-					entity.setServiceType(1);
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchSortPrice())) {
-						entity.setSortPrice(Convert.toDouble(basicExcel.getDispatchSortPrice()));
+
+	private void buildSaveBasicExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, Map<String, BasicdataPriceRouteEntity> routeEntityMap, Map<String, BasicdataPriceCategoryBasicEntity> pickupEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, Integer pickupIsUnifyAreaBill, String pickupPrice) {
+		Long routeId = null;
+		Integer pickupIsByCategory = templateEntity.getPickupIsByCategory();
+		// 按品类计费
+		boolean categoryFlag = ObjectUtil.isNotEmpty(pickupIsByCategory) && ObjectUtil.equal(pickupIsByCategory, BooleanZeroOneEnums.YES.getCode());
+		// 按区域计费 有路径的
+		boolean b = ObjectUtil.isNotEmpty(pickupIsUnifyAreaBill) && ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode());
+		BasicdataPriceCategoryBasicEntity basicEntity = null;
+		if (b) {
+			if (!ObjectUtil.isAllEmpty(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getSendOrg())) {
+				String key = buildRoutKeyV2(basicExcel.getClient(), basicExcel.getBrand(), basicExcel.getStartProvince(),
+					basicExcel.getStartCity(), basicExcel.getStartArea(), basicExcel.getEndProvince(),
+					basicExcel.getEndCity(), basicExcel.getEndArea(), basicExcel.getSendOrg(), "1");
+				BasicdataPriceRouteEntity routeEntity = routeEntityMap.get(key);
+				if (ObjectUtil.isNotEmpty(routeEntity)) {
+					routeId = routeEntity.getId();
 				}
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchHandlingPrice())) {
-						entity.setHandlingPrice(Convert.toDouble(basicExcel.getDispatchHandlingPrice()));
 			}
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchRelocationPrice())) {
-						entity.setRelocationPrice(Convert.toDouble(basicExcel.getDispatchRelocationPrice()));
 		}
-					if (StrUtil.isNotEmpty(basicExcel.getDispatchDeliveryPrice())) {
-						entity.setUpstairsDeliveryPrice(Convert.toDouble(basicExcel.getDispatchDeliveryPrice()));
+		if (b && categoryFlag) {
+			// 有路径按品类计费 一个客户一条路径一个品类一种计价方式一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
+				key = key + basicExcel.getPickupUnit();
 			}
+			if (pickupEntityMap.containsKey(key)) {
+				basicEntity = pickupEntityMap.get(key);
+			} else {
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				pickupEntityMap.put(key, basicEntity);
 			}
-				String dispatchStairsCarryingCharge = basicExcel.getDispatchStairsCarryingCharge();
-				if (StrUtil.isNotEmpty(dispatchStairsCarryingCharge)) {
-					priceEntity.setDispatchStairsCarryingCharge(Convert.toInt(dispatchStairsCarryingCharge));
+		} else if (b && !categoryFlag) {
+			// 有路径不按品类计费,一个客户一条路径一种计价方式一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand() + routeId;
+			if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
+				key = key + basicExcel.getPickupUnit();
 			}
+			if (pickupEntityMap.containsKey(key)) {
+				basicEntity = pickupEntityMap.get(key);
+			} else {
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				pickupEntityMap.put(key, basicEntity);
 			}
-			if (CollUtil.isNotEmpty(pickupEntityMap)) {
-				basicEntities.addAll(pickupEntityMap.values());
+		} else if (!b && categoryFlag) {
+			// 没路径 按品类计费 一个客户一个品类一种计价方式一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand() + basicExcel.getCategory();
+			if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
+				key = key + basicExcel.getPickupUnit();
 			}
-			if (CollUtil.isNotEmpty(trunkLineEntityMap)) {
-				basicEntities.addAll(trunkLineEntityMap.values());
+			if (pickupEntityMap.containsKey(key)) {
+				basicEntity = pickupEntityMap.get(key);
+			} else {
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				pickupEntityMap.put(key, basicEntity);
 			}
-			if (CollUtil.isNotEmpty(warehouseEntityMap)) {
-				warehouseEntities.addAll(warehouseEntityMap.values());
+		} else {
+			// 没路径 不按品类计费 一个客户一个计价方式一个价格
+			String key = basicExcel.getClient() + basicExcel.getBrand();
+			if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
+				key = key + basicExcel.getPickupUnit();
 			}
-			if (CollUtil.isNotEmpty(warehouseAddEntityMap)) {
-				warehouseEntities.addAll(warehouseAddEntityMap.values());
+			if (pickupEntityMap.containsKey(key)) {
+				basicEntity = pickupEntityMap.get(key);
+			} else {
+				basicEntity = new BasicdataPriceCategoryBasicEntity();
+				pickupEntityMap.put(key, basicEntity);
 			}
-			if (CollUtil.isNotEmpty(dispatchEntityMap)) {
-				dispatchEntities.addAll(dispatchEntityMap.values());
 		}
-			if (CollUtil.isNotEmpty(dispatchAddEntityMap)) {
-				dispatchEntities.addAll(dispatchAddEntityMap.values());
+		// 按区域计费
+		if (b) {
+			basicEntity.setBoId(routeId);
+		} else {
+			basicEntity.setBoId(priceEntity.getId());
+		}
+		basicEntity.setServiceType(ServiceTypeEnums.PICK_UP.getCode());
+		// 计费类型
+		if (StrUtil.isNotEmpty(basicExcel.getPickupUnit())) {
+			basicEntity.setType(IDict.getCodeByText(PickupPricingTypeEnums.class, basicExcel.getPickupUnit()));
+		}
+		basicEntity.setPriceId(priceEntity.getId());
+		// 品类
+		if (StrUtil.isNotEmpty(basicExcel.getCategory())) {
+			if (ObjectUtil.isNotEmpty(categoryEntityMap.get(basicExcel.getCategory()))) {
+				if (categoryFlag) {
+					basicEntity.setCategoryId(categoryEntityMap.get(basicExcel.getCategory()).getId());
 				}
 			}
 		}
+		// 价格
+		basicEntity.setPrice(Convert.toDouble(pickupPrice));
+	}
 
 	private void setStarProvinceExcel(Map<String, String> provinceMap, BasicdataPriceRouteEntity routeEntity, String province) {
 		if (StrUtil.isNotEmpty(provinceMap.get(province))) {
@@ -2712,7 +2822,13 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				}
 				// 校验价格，不能为空,只能是数字
 				checkPrice(rowMessage, "【提货-单价】只能为数字", basicExcel.getPickupPrice());
+				if (StrUtil.isNotEmpty(basicExcel.getPickupPrice())) {
+					checkDataNotEmpty(rowMessage, "提货-单位", basicExcel.getPickupUnit());
+				}
 				checkPrice(rowMessage, "【干线-单价】只能为数字", basicExcel.getTrunkLinePrice());
+				if (StrUtil.isNotEmpty(basicExcel.getPickupPrice())) {
+					checkDataNotEmpty(rowMessage, "干线-单位", basicExcel.getTrunkLineUnit());
+				}
 				checkPrice(rowMessage, "【仓储-30天内】只能为数字", basicExcel.getWithinThirtyPrice());
 				checkPrice(rowMessage, "【仓储-30-60天】只能为数字", basicExcel.getBetweenThirtySixtyPrice());
 				checkPrice(rowMessage, "【仓储-60-90天】只能为数字", basicExcel.getBeyondSixtyPrice());
@@ -2721,6 +2837,9 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				checkPrice(rowMessage, "【仓储附加费-仓储管理费】只能为数字", basicExcel.getWarehouseManagementPrice());
 				checkPrice(rowMessage, "【仓储附加费-仓储分货费】只能为数字", basicExcel.getWarehouseSortPrice());
 				checkPrice(rowMessage, "【配送-一般单价】只能为数字", basicExcel.getDispatchPrice());
+				if (StrUtil.isNotEmpty(basicExcel.getDispatchPrice())) {
+					checkDataNotEmpty(rowMessage, "配送-单位", basicExcel.getDispatchUnit());
+				}
 				checkPrice(rowMessage, "【配送-遗留单价】只能为数字", basicExcel.getDispatchLeaveBehindPrice());
 				checkPrice(rowMessage, "【配送附加费-分货费】只能为数字", basicExcel.getDispatchSortPrice());
 				checkPrice(rowMessage, "【配送附加费-操作/装卸费价格】只能为数字", basicExcel.getDispatchHandlingPrice());
@@ -2781,6 +2900,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		}
 	}
 
+	private void checkDataNotEmpty(StringBuilder rowMessage, String columnName, String data) {
+		if (StrUtil.isEmpty(data)) {
+			rowMessage.append(columnName).append("不能为空;");
+		}
+	}
+
 	private void checkCategoryExcel(Map<String, BasicdataCategoryEntity> categoryEntityMap, StringBuilder rowMessage, String category) {
 		if (StrUtil.isNotEmpty(category)) {
 			if (!categoryEntityMap.containsKey(category)) {
@@ -3745,7 +3870,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			if (pickupPricingType.contains(PickupPricingTypeEnums.PIECE.getCode().toString())) {
 				List<BasicdataPriceCategoryBasicEntity> categoryBasicEntityList = categoryBasicMap.get(PickupPricingTypeEnums.PIECE.getCode());
 				if (CollUtil.isNotEmpty(categoryBasicEntityList)) {
-					List<PriceBasicVO> basicVOS = categoryBasicEntities.stream().map(item -> {
+					List<PriceBasicVO> basicVOS = categoryBasicEntityList.stream().map(item -> {
 						PriceBasicVO basicVO = new PriceBasicVO();
 						BeanUtil.copyProperties(item, basicVO);
 						return basicVO;

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

@@ -200,4 +200,17 @@ public class DistrilbutionBillStockController extends BladeController {
 		ExcelUtil.export(response, "提货单订单信息关联数据" + DateUtil.time(), "提货单订单信息关联数据表", list, DistrilbutionBillStockExcel.class);
 	}
 
+
+
+	/**
+	 * 查询订单是否可以进行移除
+	 */
+	@GetMapping("/judgmentRemove")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distrilbutionBillStock")
+	public R judgmentRemove(@RequestParam Long billLadingId,@RequestParam Long orderId) {
+		boolean flag = distrilbutionBillStockService.judgmentRemove(billLadingId,orderId);
+		return R.data(flag);
+	}
+
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -76,6 +77,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 
 	/**
 	 * 根据包件id查询数据
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -408,4 +410,15 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 
 		return orderCodes;
 	}
+
+	@Override
+	public Map<String, Set<String>> findPackageCodeByCodes(Set<String> keySet) {
+		return distributionParcelListService.findPackageCodeByCodes(keySet);
+	}
+
+	@Override
+	public void saveorUpdateBatchByOP(List<DistributionParcelListEntity> parcelListEntityList) {
+		distributionParcelListService.updateBatchById(parcelListEntityList);
+		log.info("欧派系统数据修改包件信息：{}", JSONUtil.toJsonStr(parcelListEntityList));
+	}
 }

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

@@ -330,4 +330,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionStockArticleService.maintenanceOrderMall(orderIds);
 	}
 
+	@Override
+	public void updateCustomerAllByOrderCode(String data) {
+		distributionStockArticleService.updateCustomerAllByOrderCode(data);
+	}
+
 }

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

@@ -275,4 +275,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	List<String> findAllOrderCodesByAdvanceIds(@Param("advanceIds") List<Long> advanceIds, @Param("warehouseId") Long warehouseId);
 
 	void removePakcageByAdvanceIds(@Param("advanceIds") List<Long> advanceIds, @Param("warehouseId") Long warehouseId);
+
+    List<Map<String, String>> findPackageCodeByCodes(@Param("keySet") Set<String> keySet);
 }

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

@@ -129,10 +129,10 @@
                 and ldr.reservation_code like concat(#{param.reservationCode},'%')
             </if>
             <if test="param.scanTime !='' and param.scanTime != null">
-                and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
+                and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format((#{param.scanTime}),'%Y-%m-%d')
             </if>
             <if test="param.signingTime !='' and param.signingTime != null">
-                and date_format(from_unixtime(ldl.signing_time),'%Y-%m-%d') = date_format(#{param.signingTime}),'%Y-%m-%d')
+                and date_format(from_unixtime(ldl.signing_time),'%Y-%m-%d') = date_format((#{param.signingTime}),'%Y-%m-%d')
             </if>
             <if test="param.dvehicleName !='' and param.dvehicleName != null">
                 and lddl.train_number = #{param.dvehicleName}
@@ -638,7 +638,6 @@
         ldpl.dealer_name, ldpl.dealer_code, ldpl.send_warehouse_id,
         ldpl.send_warehouse_name, ldpl.accept_warehouse_id, ldpl.accept_warehouse_name,
         ldpl.order_package_delivery_status,
-<!--        lwtg.pallet_name AS pallet,-->
         GROUP_CONCAT(DISTINCT lwt.pallet_name) pallet,
         GROUP_CONCAT(DISTINCT lwug.position_code) goodsAllocation
         From logpm_distribution_parcel_list ldpl
@@ -1749,6 +1748,14 @@
         </foreach>
         group by order_code
     </select>
+    <select id="findPackageCodeByCodes" resultType="java.util.Map">
+        select order_package_code code,id
+        from logpm_distribution_parcel_list ldpl
+        where order_package_code in
+        <foreach collection="orderCodes" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 
     <delete id="removePakcageByAdvanceIds" >
         delete from logpm_distribution_parcel_list

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

@@ -195,4 +195,6 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
     void updateAllOrderTotalNum(@Param("orderCode") String orderCode, @Param("total") Integer total);
 
     List<Map<String, Object>> selectAdvance(@Param("orderCode")String orderCode);
+
+    void updateCustomerAllByOrderCode(@Param("data") cn.hutool.json.JSONObject data);
 }

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

@@ -52,15 +52,22 @@
 
 
     <select id="selectDistributionStockArticlePage" resultMap="distributionStockArticleResultMap">
-        select * from logpm_distribution_stock_article where is_deleted = 0
+        select *
+        from logpm_distribution_stock_article
+        where is_deleted = 0
     </select>
 
     <update id="addHandQuantity">
-        update  logpm_distribution_stock_article set hand_quantity = hand_quantity + #{num} where id = #{id}
+        update logpm_distribution_stock_article
+        set hand_quantity = hand_quantity + #{num}
+        where id = #{id}
     </update>
 
     <update id="submitHandQuantity">
-        update  logpm_distribution_stock_article set hand_quantity = hand_quantity - #{allNum} where id = #{articleId} and hand_quantity - #{allNum} >= 0
+        update logpm_distribution_stock_article
+        set hand_quantity = hand_quantity - #{allNum}
+        where id = #{articleId}
+          and hand_quantity - #{allNum} >= 0
     </update>
 
     <select id="likeOrderSelfNumbering" resultMap="distributionStockArticleResultMap">
@@ -79,7 +86,8 @@
 
     <select id="selectClientListPage" resultMap="distributionStockArticleResultMap">
         SELECT * from logpm_distribution_stock_article ldsa where
-        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = '1'  and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20','30','70')
+        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = '1' and ldsa.reservation_status in ('10','20')
+        and ldsa.order_status in ('10','20','30','70')
         <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
             and ldsa.order_code like concat(#{distributionStockArticleVO.orderCode},'%')
         </if>
@@ -337,8 +345,10 @@
         ldsa.accept_warehouse_name as objective ,ldsa.send_warehouse_name departureStation,ldsa.dealer_name
         dealerName,ldsa.dealer_code dealerCode,ldsa.total_number totalNumber,
         CONCAT_WS('/', IFNULL(ldpl.firsts, ''), IFNULL(ldpl.second, ''), IFNULL(ldpl.third_product, '')) AS category,
-        CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code qrCode,ldpl.waybill_number,
-        CONCAT_WS('/', IFNULL(lww.shipper_name, ''), IFNULL(lww.shipper_mobile, '')) AS shipperName,lww.shipper_address shipperAddress
+        CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code
+        qrCode,ldpl.waybill_number,
+        CONCAT_WS('/', IFNULL(lww.shipper_name, ''), IFNULL(lww.shipper_mobile, '')) AS shipperName,lww.shipper_address
+        shipperAddress
 
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_distribution_stock_article ldsa on ldpl.stock_article_id = ldsa.id
@@ -349,19 +359,18 @@
     </select>
 
     <select id="fingListByServiceNumber" resultType="java.util.Map">
-        SELECT
-            ldsa.service_number serviceNum,
+        SELECT ldsa.service_number serviceNum,
                ldsa.order_code     orderCode,
                1                   goodsType,
                ldsa.total_number   totalNum,
                count(ldpl.id)      num
-        FROM
-            logpm_distribution_stock_article ldsa
+        FROM logpm_distribution_stock_article ldsa
                  left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
-            left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
-            left join logpm_warehouse_updown_goods lwug on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
-        WHERE
-            ldsa.is_deleted = 0
+                 left join logpm_warehouse_tray_goods lwtg
+                           on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
+                 left join logpm_warehouse_updown_goods lwug
+                           on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
+        WHERE ldsa.is_deleted = 0
           AND ldsa.service_number = #{serviceNumber}
           AND ldsa.warehouse_id = #{warehouseId}
           and lwtg.id is null
@@ -373,19 +382,18 @@
     </select>
 
     <select id="findShelfNumByOrderCodeAndWarehouseId" resultType="java.util.Map">
-        SELECT
-            ldsa.service_number serviceNum,
+        SELECT ldsa.service_number serviceNum,
                ldsa.order_code     orderCode,
                1                   goodsType,
                ldsa.total_number   totalNum,
                count(ldpl.id)      num
-        FROM
-            logpm_distribution_stock_article ldsa
+        FROM logpm_distribution_stock_article ldsa
                  left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
-                left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
-                left join logpm_warehouse_updown_goods lwug on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
-        WHERE
-            ldsa.is_deleted = 0
+                 left join logpm_warehouse_tray_goods lwtg
+                           on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
+                 left join logpm_warehouse_updown_goods lwug
+                           on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
+        WHERE ldsa.is_deleted = 0
           AND ldsa.order_code = #{orderCode}
           AND ldsa.warehouse_id = #{warehouseId}
           and lwtg.id is null
@@ -421,7 +429,8 @@
         ldsa.sorting_quantity, ldsa.delivery_quantity, ldsa.transfer_quantity,
         ldsa.signin_quantity, ldsa.resource, ldsa.is_opai,
         ldsa.inventory_date, ldsa.inventory_person, ldsa.inventory_person_id,
-        ldsa.available_quantity, ldsa.is_have_data, ldsa.stock_article_code, GROUP_CONCAT( DISTINCT ldpl.dealer_name ) dealerName, ldsa.dealer_code,
+        ldsa.available_quantity, ldsa.is_have_data, ldsa.stock_article_code, GROUP_CONCAT( DISTINCT ldpl.dealer_name )
+        dealerName, ldsa.dealer_code,
         ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,
         GROUP_CONCAT( DISTINCT lwtg.tray_code ) trays,
@@ -511,14 +520,27 @@
             <if test="  param.availableQuantity != null  ">and ldsa.available_quantity like
                 concat('%',#{param.availableQuantity},'%')
             </if>
-            <if test="  param.groundingStatus != null and param.groundingStatus != '' ">and ldsa.grounding_status = #{param.groundingStatus}</if>
+            <if test="  param.groundingStatus != null and param.groundingStatus != '' ">and ldsa.grounding_status =
+                #{param.groundingStatus}
+            </if>
             <if test="  param.genre != null and param.groundingStatus != '' ">and ldsa.genre = #{param.genre}</if>
-            <if test="  param.freezeStatus != null and param.groundingStatus != '' ">and ldsa.freeze_status = #{param.freezeStatus}</if>
-            <if test="  param.orderStatus != null and param.groundingStatus != '' ">and ldsa.order_status = #{param.orderStatus}</if>
-            <if test="  param.reservationStatus != null and param.groundingStatus != '' ">and ldsa.reservation_status = #{param.reservationStatus}</if>
-            <if test="  param.stockupStatus != null and param.groundingStatus != '' ">and ldsa.stockup_status = #{param.stockupStatus}</if>
-            <if test="  param.notification != null and param.notification != '' ">and ldsa.notification = #{param.notification}</if>
-            <if test="  param.orderReceiveStatus != null and param.groundingStatus != '' ">and ldsa.order_receive_status =
+            <if test="  param.freezeStatus != null and param.groundingStatus != '' ">and ldsa.freeze_status =
+                #{param.freezeStatus}
+            </if>
+            <if test="  param.orderStatus != null and param.groundingStatus != '' ">and ldsa.order_status =
+                #{param.orderStatus}
+            </if>
+            <if test="  param.reservationStatus != null and param.groundingStatus != '' ">and ldsa.reservation_status =
+                #{param.reservationStatus}
+            </if>
+            <if test="  param.stockupStatus != null and param.groundingStatus != '' ">and ldsa.stockup_status =
+                #{param.stockupStatus}
+            </if>
+            <if test="  param.notification != null and param.notification != '' ">and ldsa.notification =
+                #{param.notification}
+            </if>
+            <if test="  param.orderReceiveStatus != null and param.groundingStatus != '' ">and ldsa.order_receive_status
+                =
                 #{param.orderReceiveStatus}
             </if>
             <if test="  param.completeSet != null  ">and ldsa.complete_set like concat('%',#{param.completeSet},'%')
@@ -719,7 +741,8 @@
         ldsa.warehouse_entry_time DESC
     </select>
     <select id="selectListGrounding" resultType="com.logpm.distribution.vo.DistributionStockArticleGroundingVO">
-        select ldsa.grounding_status groundingStatus,lwtg.association_type associationType,lwtg.tray_id trayId,lwtg.tray_code trayCode,ldsa.id stockArticleId
+        select ldsa.grounding_status groundingStatus,lwtg.association_type associationType,lwtg.tray_id
+        trayId,lwtg.tray_code trayCode,ldsa.id stockArticleId
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
@@ -734,8 +757,7 @@
         </where>
     </select>
     <select id="getZeroOrderDetail" resultType="com.logpm.distribution.vo.DistributionParcelNumberVO">
-        SELECT
-            ldpn.id AS id,
+        SELECT ldpn.id                                       AS id,
                ldpn.stock_article_id                         AS stockArticleId,
                ldpn.parcel_list_id                           AS parcelListId,
                ldpl.firsts                                   AS firsts,
@@ -750,12 +772,10 @@
                ldpn.signin_quantity                          AS signinQuantity,
                (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum,
                ldpn.quantity                                 AS `number`
-        FROM
-        logpm_distribution_stock_article AS ldsa
+        FROM logpm_distribution_stock_article AS ldsa
                  LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id
                  LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id
-        WHERE
-            ldsa.id = #{stockArticleId}
+        WHERE ldsa.id = #{stockArticleId}
     </select>
     <select id="exportDistributionStockArticle"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
@@ -859,13 +879,23 @@
                     #{wIitem}
                 </foreach>
             </if>
-            <if test="param.waybillNumber != null and param.waybillNumber != ''">  and ldpl.waybill_number = #{param.waybillNumber}  </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''">and ldpl.waybill_number =
+                #{param.waybillNumber}
+            </if>
             <if test="param.orderCode != null and param.orderCode != ''">and ldsa.order_code = #{param.orderCode}</if>
             <if test="param.mallName != null and param.mallName != ''">and ldsa.mall_name = #{param.mallName}</if>
-            <if test="param.typeService != null and param.typeService != ''">  and ldsa.type_service = #{param.typeService}  </if>
-            <if test="param.consigneeUnit != null and param.consigneeUnit != ''">  and ldsa.consignee_unit = #{param.consigneeUnit}  </if>
-            <if test="param.trainNumber != null and param.trainNumber != ''">  and ldsa.train_number = #{param.trainNumber}  </if>
-            <if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''">  and ldsa.accept_warehouse_name = #{param.acceptWarehouseName}  </if>
+            <if test="param.typeService != null and param.typeService != ''">and ldsa.type_service =
+                #{param.typeService}
+            </if>
+            <if test="param.consigneeUnit != null and param.consigneeUnit != ''">and ldsa.consignee_unit =
+                #{param.consigneeUnit}
+            </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''">and ldsa.train_number =
+                #{param.trainNumber}
+            </if>
+            <if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''">and
+                ldsa.accept_warehouse_name = #{param.acceptWarehouseName}
+            </if>
             <if test="param.serviceNumber != null and param.serviceNumber != ''">
                 and ldsa.service_number = #{param.serviceNumber}
             </if>
@@ -916,10 +946,18 @@
         where order_code = #{orderCode}
     </update>
     <update id="deductionHandQuantity">
-        UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity - 1) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
+        UPDATE logpm_distribution_stock_article
+        SET hand_quantity = (hand_quantity - 1)
+        WHERE id = #{orderId}
+          AND is_deleted = 0
+          AND hand_quantity >= 0
     </update>
     <update id="augmentHandQuantity">
-        UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity + #{augmentNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
+        UPDATE logpm_distribution_stock_article
+        SET hand_quantity = (hand_quantity + #{augmentNum})
+        WHERE id = #{orderId}
+          AND is_deleted = 0
+          AND hand_quantity >= 0
 
     </update>
 
@@ -930,7 +968,9 @@
           and incoming_num + #{num} &lt;= total_number
     </update>
     <update id="augmentDeliveryQuantity">
-        UPDATE logpm_distribution_stock_article SET delivery_quantity = #{reservationNum} WHERE id = #{orderId}
+        UPDATE logpm_distribution_stock_article
+        SET delivery_quantity = #{reservationNum}
+        WHERE id = #{orderId}
     </update>
 
     <select id="findZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
@@ -963,12 +1003,14 @@
         select sum((
             select COUNT(ldl.id)
             from logpm_distribution_loadscan ldl
-            where ldl.package_id = ldpl.id and ldl.signfor_state = 2
+            where ldl.package_id = ldpl.id
+              and ldl.signfor_state = 2
         ))        signinQuantity,
                sum((
                    select COUNT(ldl.id)
                    from logpm_distribution_loadscan ldl
-                where ldl.package_id = ldpl.id and ldl.signfor_state = 1
+                   where ldl.package_id = ldpl.id
+                     and ldl.signfor_state = 1
                )) deliveryQuantity
         from logpm_distribution_parcel_list ldpl
         where ldpl.stock_article_id = #{id}
@@ -999,7 +1041,8 @@
         (SELECT lwga.qr_code from logpm_warehouse_updown_goods lwug left join
         logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
         where association_value=ldpl.order_package_code) goods_allocation,
-        (SELECT lwt.pallet_name from logpm_warehouse_tray_goods lwtg LEFT JOIN logpm_warehouse_tray lwt on lwt.id=lwtg.tray_id where lwtg.association_value=ldpl.order_package_code ) pallet,
+        (SELECT lwt.pallet_name from logpm_warehouse_tray_goods lwtg LEFT JOIN logpm_warehouse_tray lwt on
+        lwt.id=lwtg.tray_id where lwtg.association_value=ldpl.order_package_code ) pallet,
         ldpl.firsts_code,
         ldpl.firsts,
         ldpl.second_code,
@@ -1038,7 +1081,8 @@
         FROM
         logpm_distribution_parcel_list AS ldpl
         WHERE
-        ldpl.order_package_reservation_status  = 10  and ldpl.order_package_freeze_status = 10 AND ldpl.order_package_loading_status = 10 AND order_package_status IN (10,20)
+        ldpl.order_package_reservation_status = 10 and ldpl.order_package_freeze_status = 10 AND
+        ldpl.order_package_loading_status = 10 AND order_package_status IN (10,20)
         and ldpl.stock_article_id = #{param.id} and ldpl.warehouse_id = #{warehouseId}
         <if test="param.waybillNumber != null and param.waybillNumber != ''">
             and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
@@ -1076,8 +1120,7 @@
     </select>
     <select id="findUpDownStockupZeroByOrderCodeAndWarehouseId"
             resultType="com.logpm.distribution.vo.UpDownStockupAreaVO">
-        SELECT
-        ldsa.waybill_number AS waybillCode,
+        SELECT ldsa.waybill_number    AS waybillCode,
                0                      AS enterNum,
                ldsa.mall_id           AS marketId,
                ldsa.mall_name         AS marketName,
@@ -1090,14 +1133,15 @@
                2                      AS goods_type,
                #{warehouseId}         AS warehouseId,
                ldsa.description_goods AS goodsName
-        FROM
-        logpm_distribution_stock_article AS ldsa
-        WHERE
-        ldsa.order_code = #{orderCode} AND ldsa.warehouse_id = #{warehouseId}
+        FROM logpm_distribution_stock_article AS ldsa
+        WHERE ldsa.order_code = #{orderCode}
+          AND ldsa.warehouse_id = #{warehouseId}
     </select>
     <select id="getOrderListByWaybill"
             resultType="java.lang.Long">
-        SELECT id FROM logpm_distribution_stock_article WHERE FIND_IN_SET(#{waybillNumber},waybill_number) > 0
+        SELECT id
+        FROM logpm_distribution_stock_article
+        WHERE FIND_IN_SET(#{waybillNumber}, waybill_number) > 0
           AND waybill_number is not null
           AND waybill_number != ''
     </select>
@@ -1157,8 +1201,10 @@
         WHEN 30 THEN '已预约'
         END orderReservationStatusName,
         CASE ldsa.is_zero
-        WHEN 0 THEN IF(ldsa.total_number =(SELECT SUM(quantity) FROM logpm_distribution_parcel_list WHERE stock_article_id = ldsa.id),'是','否')
-        WHEN 1 THEN IF(ldsa.total_number =(SELECT SUM(quantity) FROM logpm_distribution_parcel_number WHERE stock_article_id = ldsa.id),'是','否')
+        WHEN 0 THEN IF(ldsa.total_number =(SELECT SUM(quantity) FROM logpm_distribution_parcel_list WHERE
+        stock_article_id = ldsa.id),'是','否')
+        WHEN 1 THEN IF(ldsa.total_number =(SELECT SUM(quantity) FROM logpm_distribution_parcel_number WHERE
+        stock_article_id = ldsa.id),'是','否')
         END isCompleteSet,
         CASE ldsa.type_service
         WHEN 1 THEN '商配'
@@ -1166,10 +1212,14 @@
         WHEN 3 THEN '自提'
         WHEN 4 THEN '三方中转'
         END typeServiceName,
-        IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND scan_status != 1 ), 0 ) AS deliveryNumber,
-        IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND scan_status != 1 ), 0 ) AS signForNumber,
-        IFNULL(( SELECT SUM( stock_quantity ) FROM logpm_distribution_stock WHERE stock_article = ldsa.id ), 0 ) AS stockUpNumber,
-        IFNULL(( SELECT SUM( reservation_num ) FROM logpm_distribution_reservation_stockarticle WHERE stock_article_id = ldsa.id AND stock_article_status!= 2), 0 ) AS reservationNumber,
+        IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND scan_status != 1
+        ), 0 ) AS deliveryNumber,
+        IFNULL(( SELECT SUM( received_quantity ) FROM logpm_distribution_loadscan WHERE order_id = ldsa.id AND
+        scan_status != 1 ), 0 ) AS signForNumber,
+        IFNULL(( SELECT SUM( stock_quantity ) FROM logpm_distribution_stock WHERE stock_article = ldsa.id ), 0 ) AS
+        stockUpNumber,
+        IFNULL(( SELECT SUM( reservation_num ) FROM logpm_distribution_reservation_stockarticle WHERE stock_article_id =
+        ldsa.id AND stock_article_status!= 2), 0 ) AS reservationNumber,
         IF(GROUP_CONCAT(t.msg) is not null,GROUP_CONCAT(t.msg),IFNULL(GROUP_CONCAT(y.msg),null)) AS reservationInfo,
         GROUP_CONCAT(DISTINCT IFNULL( m.mssg,'')) AS deliveryListInfo,
         ldsa.create_time As createTime,
@@ -1224,8 +1274,10 @@
         LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
         GROUP BY ldr.id
         ) AS m ON ldsa.id = m.stock_article_id AND t.reservation_id = m.reservation_id
-        LEFT JOIN ( SELECT stock_article_id, min( create_time ) AS earliestWarehouseEntryTime FROM logpm_distribution_parcel_list GROUP BY stock_article_id) AS k ON k.stock_article_id = ldsa.id
-        LEFT JOIN ( SELECT order_id, max( signing_time ) AS scanSigningTime FROM logpm_distribution_loadscan WHERE scan_status != 1 AND signfor_state = 2 GROUP BY order_id ) AS j ON j.order_id = ldsa.id
+        LEFT JOIN ( SELECT stock_article_id, min( create_time ) AS earliestWarehouseEntryTime FROM
+        logpm_distribution_parcel_list GROUP BY stock_article_id) AS k ON k.stock_article_id = ldsa.id
+        LEFT JOIN ( SELECT order_id, max( signing_time ) AS scanSigningTime FROM logpm_distribution_loadscan WHERE
+        scan_status != 1 AND signfor_state = 2 GROUP BY order_id ) AS j ON j.order_id = ldsa.id
         <where>
             ldsa.order_status in ('70','80')
             <if test="param.waybillNumber != null and param.waybillNumber != ''">
@@ -1327,7 +1379,9 @@
         ldsa.id
     </select>
     <select id="selectAdvance" resultType="java.util.Map">
-        SELECT dealer_name,dealer_code FROM logpm_trunkline_advance WHERE order_code = #{orderCode}
+        SELECT dealer_name, dealer_code
+        FROM logpm_trunkline_advance
+        WHERE order_code = #{orderCode}
     </select>
 
     <update id="updateAllOrderTotalNum">
@@ -1335,5 +1389,16 @@
         set total_number = #{total}
         where order_code = #{orderCode}
     </update>
+    <update id="updateCustomerAllByOrderCode">
+        update logpm_distribution_stock_article
+        set
+            customer_name = #{data.customerName},
+            customer_telephone=#{data.customerPhone},
+            customer_address=#{data.customerAddress}
+        where reservation_status = '10'
+        <if test="data.orderCode != null and data.orderCode != ''">
+            and order_code = #{data.orderCode}
+        </if>
+    </update>
 
 </mapper>

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

@@ -819,9 +819,9 @@
         stockupCode,lds.type_service typeService,
         lds.stockup_status stockupStatus,lds.stockup_area stockupArea
         from logpm_distribution_stockup lds
-        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id AND ldsi.stock_status != 4
         <where>
-            lds.id = #{param.stockupId} AND ldsi.stock_status != 4
+            lds.id = #{param.stockupId}
         </where>
     </select>
 

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

@@ -235,4 +235,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	List<String> findAllOrderCodesByAdvanceIds(List<Long> advanceIds, Long warehouseId);
 
 	void removePakcageByAdvanceIds(List<Long> advanceIds, Long warehouseId);
+
+	/**
+	 * 根据包件码查询包件
+	 * @param keySet
+	 * @return
+	 */
+    Map<String, Set<String>> findPackageCodeByCodes(Set<String> keySet);
 }

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

@@ -282,4 +282,10 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 * @return
 	 */
     Boolean maintenanceOrderMall(String orderIds);
+
+	/**
+	 * 全仓更新未预约的订单的客户信息
+	 * @param orderCode 订单号
+	 */
+    void updateCustomerAllByOrderCode(String orderCode);
 }

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

@@ -116,4 +116,12 @@ public interface IDistrilbutionBillStockService extends BaseService<Distrilbutio
 	 * @param l
 	 */
 	void maintenanceOrderInfo(Long l);
+
+	/**
+	 * 判断是否能够进行订单移除
+	 * @param billLadingId
+	 * @param orderId
+	 * @return
+	 */
+    boolean judgmentRemove(Long billLadingId, Long orderId);
 }

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

@@ -2,6 +2,7 @@ package com.logpm.distribution.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -50,6 +51,7 @@ 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;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
@@ -74,6 +76,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ISysClient;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -130,6 +133,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient;
 	private final IWarehouseWaybillClient waybillClient;
 	private final FactoryDataMessageSender factoryDataMessageSender;
+	private final RabbitTemplate rabbitTemplate;
 
 	private final ITrunklineWaybillOrderClient trunklineWaybillOrderClient;
 
@@ -1467,7 +1471,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Transactional(rollbackFor = Exception.class)
 	@LogpmAsync("asyncExecutor")
 	public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
-		String brands = "梦天,欧派,志邦";//可追加
+		String brands = "梦天,欧派,志邦,皮阿诺";//可追加
 		log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：=" + signingId + "warehouseName：=" + warehouseName + "warehouseId：=" + warehouseId);
 		//查询签收信息
 		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);
@@ -1592,6 +1596,28 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					factoryDataMessageSender.sendNodeDataByBrand(msg);
 
 				}
+				if (Func.isNotEmpty(brand.get("皮阿诺"))) {
+					List<MtReceiveContentDTO> zb = brand.get("皮阿诺");
+					if (CollUtil.isNotEmpty(zb)) {
+						for (MtReceiveContentDTO mtReceiveContentDTO : zb) {
+							try {
+								// 发送入库消息
+								com.logpm.distribution.dto.OrderStatusDTO orderStatusDTO = new com.logpm.distribution.dto.OrderStatusDTO();
+								// 通过包件id 查询包件
+								orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo());
+								orderStatusDTO.setOrderNo(mtReceiveContentDTO.getOrderCode());
+								orderStatusDTO.setStatus("7");
+								orderStatusDTO.setOperationTime(DateUtil.now());
+								orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+								Map<String, Object> map = new HashMap<>();
+								map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
+								rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+							} catch (Exception e) {
+								log.error("入库推送失败：{}", e);
+							}
+						}
+					}
+				}
 
 				//....工厂
 			} catch (Exception e) {

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

@@ -3631,6 +3631,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		} else {
 			StringBuilder driverNames = new StringBuilder();
 			StringBuilder vehicleNubs = new StringBuilder();
+			if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){
+				//检测无主司机  进行随机赋予主司机
+				deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+				deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub());
+			}
 			//自主配送
 			allocationInfo.forEach(a -> {
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
@@ -4047,6 +4052,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			StringBuilder driverNames = new StringBuilder();
 			StringBuilder vehicleNubs = new StringBuilder();
 			//自主配送
+			if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){
+				//检测无主司机  进行随机赋予主司机
+				deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+				deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub());
+			}
 			allocationInfo.forEach(a -> {
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
 				if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) {
@@ -6696,7 +6706,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		map.put("库存品集合", spaclStockList);
 		map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
-
+		log.info(">>>>>>>>>>>>>>>>>>预约打印模板查看备货信息》》》》》》》》》》》》:{}",distributionReservationEntity.getRemarks());
 		map.put("备注", distributionReservationEntity.getRemarks());
 	}
 

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

@@ -89,6 +89,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -1265,4 +1266,24 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		baseMapper.removePakcageByAdvanceIds(advanceIds,warehouseId);
 	}
 
+    @Override
+    public Map<String, Set<String>> findPackageCodeByCodes(Set<String> keySet) {
+		Map<String, Set<String>> resultMap = new HashMap<>();
+		List<Map<String,String>> map = baseMapper.findPackageCodeByCodes(keySet);
+		if(CollUtil.isNotEmpty(map)){
+			for (Map<String, String> stringStringMap : map) {
+				String code = stringStringMap.get("code");
+				String id = stringStringMap.get("id");
+				if(resultMap.containsKey(code)){
+					resultMap.get(code).add(id);
+				}else{
+					Set<String> set = new HashSet<>();
+					set.add(id);
+					resultMap.put(code,set);
+				}
+			}
+		}
+        return resultMap;
+    }
+
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -2668,6 +2669,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return null;
 	}
 
+    @Override
+    public void updateCustomerAllByOrderCode(String data) {
+		log.info("欧派工厂推送数据更新订单客户信息：{}", data);
+		this.baseMapper.updateCustomerAllByOrderCode(JSONUtil.parseObj(data));
+    }
+
     @Override
 	public R findEditCustomerLog(Long orderId) {
 

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

@@ -3426,7 +3426,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
 				for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
 					// 签收发送消息到工厂
-//					pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering());
+					pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering());
 				}
 			} else {
 				distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId());
@@ -3541,7 +3541,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			// 通过包件id 查询包件
 			orderStatusDTO.setUnitNo(orderPackageCode);
 			orderStatusDTO.setOrderNo(orderCode);
-			orderStatusDTO.setStatus("3");
+			orderStatusDTO.setStatus("7");
 			orderStatusDTO.setOperationTime(DateUtil.now());
 			orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
 			Map<String, Object> map = new HashMap<>();

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

@@ -24,12 +24,14 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.dto.app.StockupDTO;
+import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
 import com.logpm.distribution.entity.DistrilbutionBillPackageEntity;
 import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
 import com.logpm.distribution.excel.DistributionBillOrderExcel;
 import com.logpm.distribution.excel.DistributionBillOrderPackExcel;
 import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.logpm.distribution.mapper.DistrilbutionBillStockMapper;
+import com.logpm.distribution.service.IDistributionBillLadingScanService;
 import com.logpm.distribution.service.IDistrilbutionBillPackageService;
 import com.logpm.distribution.service.IDistrilbutionBillStockService;
 import com.logpm.distribution.vo.*;
@@ -64,6 +66,8 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 
 	private final IDistrilbutionBillPackageService distrilbutionBillPackageService;
 
+	private final IDistributionBillLadingScanService distributionBillLadingScanService;
+
 	@Override
 	public IPage<DistrilbutionBillStockVO> selectDistrilbutionBillStockPage(IPage<DistrilbutionBillStockVO> page, DistrilbutionBillStockVO distrilbutionBillStock) {
 		return page.setRecords(baseMapper.selectDistrilbutionBillStockPage(page, distrilbutionBillStock));
@@ -253,4 +257,17 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 		}
 	}
 
+	@Override
+	public boolean judgmentRemove(Long billLadingId, Long orderId) {
+		//此订单存在扫描记录既无法进行取消操作
+		List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+			.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+			.eq(DistributionBillLadingScanEntity::getStockArticleId, orderId)
+		);
+		if (ladingScanEntities.isEmpty()) {
+			return true;
+		}
+		return false;
+	}
+
 }

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

@@ -205,6 +205,11 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		queryWrapper.eq(DistributionBusinessPreOrderEntity::getInWarehouse, 1);
 		Long l = baseMapper.selectCount(queryWrapper);
 
+
+
+
+
+
 		return Resp.scanSuccess("扫描成功", l + "件");
 	}
 

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AdvanceJob.java

@@ -33,7 +33,6 @@ import org.springblade.common.constant.HttpConstants;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springblade.common.model.IDict;
 import org.springblade.core.tool.api.R;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/FactoryOrderListener.java

@@ -52,7 +52,6 @@ import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java

@@ -39,7 +39,6 @@ import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java

@@ -41,7 +41,6 @@ import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

blade-service/logpm-factory-data/logpm-factory-data-zbom/pom.xml

@@ -68,6 +68,11 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.logpm</groupId>
+            <artifactId>logpm-factory-data-zbom-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/InterceptorAdapterConfig.java

@@ -21,8 +21,8 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry interceptorRegistry) {
-		interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties))
-			.addPathPatterns("/**").order(2);
+//		interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties))
+//			.addPathPatterns("/**").order(2);
 		interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis, environment))
 			.addPathPatterns("/**").order(3);
 	}

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/controller/OrderController.java

@@ -1,21 +1,16 @@
 package com.logpm.factorydata.zbom.controller;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factorydata.enums.SaxStatusEnums;
 import com.logpm.factorydata.feign.IFactoryDataClient;
 import com.logpm.factorydata.vo.SendMsg;
 import com.logpm.factorydata.zbom.constants.ZbomConstants;
 import com.logpm.factorydata.zbom.entity.FactoryLogEntity;
-import com.logpm.factorydata.zbom.entity.ZbFactoryOrderLogEntity;
-import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
 import com.logpm.factorydata.zbom.service.FactoryLogService;
-import com.logpm.factorydata.zbom.service.IFactoryOrderLogService;
-import com.logpm.factorydata.zbom.service.IReceiptService;
 import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
 import com.logpm.factorydata.zbom.vo.ZbResp;
 import io.swagger.annotations.Api;
@@ -31,6 +26,7 @@ import org.springblade.common.utils.FileLogsUtil;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springblade.resource.feign.IOssClient;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,8 +59,22 @@ public class OrderController {
 	private final FactoryLogService factoryLogService;
 
 	private final IOssClient ossClient;
+	private final RabbitTemplate rabbitTemplate;
 
 
+	@ResponseBody
+	@PostMapping("pushData")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "推送志邦工厂节点数据", notes = "推送志邦工厂节点数据")
+	public ZbResp pushData(@RequestBody String msg, HttpServletRequest request) {
+		log.info("推送志邦工厂节点数据：{}", msg);
+		if (StrUtil.isNotEmpty(msg)) {
+			rabbitTemplate.convertAndSend(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH,
+				FactoryDataConstants.Mq.RoutingKeys.ZBOM_NODE_DATA_PUSH, msg);
+		}
+		return ZbResp.success("成功");
+	}
+
 	@ResponseBody
 	@PostMapping
 	@ApiOperationSupport(order = 1)
@@ -79,60 +89,12 @@ public class OrderController {
 		String corpId = request.getHeader("corpId");
 		zbReceiptDTO.setCorpId(corpId);
 
-		// 1 上传数据到 minio 获取到地址
-		String url = uploadFile(JSONUtil.toJsonStr(zbReceiptDTO));
-		// 2 保存地址到数据库
-		FactoryLogEntity logEntity = new FactoryLogEntity();
-		logEntity.setType(1);
-		logEntity.setSaxStatus(SaxStatusEnums.NOMAL.getCode());
-		logEntity.setLogUrl(url);
-		factoryLogService.save(logEntity);
+		factoryLogService.orderData(zbReceiptDTO);
 
-		// 3 将消息发送给 mq，解析保存
-		SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER)
-			.routingKey(FactoryDataConstants.Mq.RoutingKeys.ZBOM_FACTORY_ORDER)
-			.message(JSONUtil.toJsonStr(logEntity)).build();
-		factoryDataClient.sendMessage(build);
 		return ZbResp.success("成功");
 	}
 
 
-	private String uploadFile(String body) {
-		//文本内容和保存为本地文件 并上传
-		String logPath = FileLogsUtil.saveFileLogs(body);
-		log.info(">>> 文件路径 {}", logPath);
 
-		MultipartFile multi = getMultipartFile(logPath);
-		//上传到服务器
-		R r = ossClient.fileUpload(multi, "zb-order-logs");
-		if (r.isSuccess()) {
-			BladeFile data = (BladeFile) r.getData();
-			// 删除本地文件
-			FileUtil.del(logPath);
-			return data.getLink();
-		}
-		return null;
-	}
-
-	@NotNull
-	private MultipartFile getMultipartFile(String logPath) {
-		File file = new File(logPath);
-
-		// File 转 MultipartFile
-		FileItem item = new DiskFileItemFactory().createItem("file"
-			, MediaType.MULTIPART_FORM_DATA_VALUE
-			, true
-			, file.getName());
-		try (
-			InputStream input = Files.newInputStream(file.toPath());
-			OutputStream os = item.getOutputStream()) {
-			// 流转移
-			IOUtils.copy(input, os);
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Invalid file: " + e, e);
-		}
-
-		return new CommonsMultipartFile(item);
-	}
 
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/feign/FactoryDataZbomClient.java

@@ -0,0 +1,26 @@
+package com.logpm.factorydata.zbom.feign;
+
+import cn.hutool.json.JSONUtil;
+import com.logpm.factorydata.zbom.service.FactoryLogService;
+import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhaoqiaobo
+ * @create 2024-05-25
+ */
+@RestController
+@AllArgsConstructor
+public class FactoryDataZbomClient implements IFactoryDataZbomClient {
+
+	private final FactoryLogService factoryLogService;
+
+	@Override
+	public R<String> order(String data) {
+		factoryLogService.orderData(JSONUtil.toBean(data, ZBReceiptDTO.class));
+		return R.success("成功");
+	}
+
+}

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomFactoryOrderListener.java

@@ -10,8 +10,6 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,6 +24,7 @@ import com.logpm.factorydata.zbom.entity.ZbOrderPackageEntity;
 import com.logpm.factorydata.zbom.entity.ZbPackageInfoEntity;
 import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
 import com.logpm.factorydata.zbom.mapper.ZbCategoryContrastMapper;
+import com.logpm.factorydata.zbom.pros.ZbFactoryProperties;
 import com.logpm.factorydata.zbom.service.IOrderPackageService;
 import com.logpm.factorydata.zbom.service.IPackageInfoService;
 import com.logpm.factorydata.zbom.service.IReceiptService;
@@ -50,7 +49,6 @@ import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -81,10 +79,7 @@ public class ZbomFactoryOrderListener {
 	private final IReceiptService receiptService;
 	private final IPackageInfoService packageInfoService;
 	private final IOrderPackageService orderPackageService;
-	private final BladeRedis bladeRedis;
-	private final ZbCategoryContrastMapper zbCategoryContrastMapper;
-	private final IFactoryDataBaseClient baseClient;
-	private final IFactoryDataClient factoryDataClient;
+	private final ZbFactoryProperties zbFactoryProperties;
 
 	@RabbitListener(bindings = @QueueBinding(
 		value = @Queue(name = FactoryDataConstants.Mq.Queues.ZBOM_FACTORY_ORDER),
@@ -148,8 +143,8 @@ public class ZbomFactoryOrderListener {
 			}
 		}
 		ZbReceiptEntity zbReceiptEntity = new ZbReceiptEntity();
-		zbReceiptEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 		BeanUtil.copyProperties(zbReceiptDTO, zbReceiptEntity);
+		zbReceiptEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 		// 保存订单数据
 		receiptService.save(zbReceiptEntity);
 		if (CollUtil.isNotEmpty(details)) {
@@ -193,211 +188,9 @@ public class ZbomFactoryOrderListener {
 			packageInfoService.saveBatch(packageInfoEntities);
 		}
 		// 处理暂存单
-		buildAdvance(zbReceiptDTO, packageCode);
-	}
-
-	@LogpmAsync("asyncExecutor")
-	public void buildAdvance(ZBReceiptDTO zbReceiptDTO, Set packageCode) {
-		// 新起线程构建暂存单发送mq
-		Long startWarehouseId = null;
-		String startWarehouseName = null;
-		String tenantId = null;
-		// 获取工厂基地绑定的始发仓信息
-		R<FactoryWarehouseBindVO> warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(zbReceiptDTO.getSenderName(), zbReceiptDTO.getSenderName());
-		if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, warehouseByBrandAndSiteName.getCode())) {
-			FactoryWarehouseBindVO data = warehouseByBrandAndSiteName.getData();
-			if (ObjectUtil.isNotNull(data)) {
-				startWarehouseId = data.getWarehouseId();
-				startWarehouseName = data.getWarehouseName();
-				tenantId = data.getTenantId();
-			}
-		}
-		Map<String, List<OrderPackageDTO>> advanceMap = new HashMap<>();
-		List<OrderPackageDTO> details = zbReceiptDTO.getDetails();
-		// 入库单号 + 订单自编号 + 发车单号 一个暂存单
-		for (OrderPackageDTO detail : details) {
-			if (packageCode.contains(detail.getPackageCode())) {
-				log.info(" 接收志邦数据：包条码 {} 已存在数据库中，不生成暂存单。", detail.getPackageCode());
-				continue;
-			}
-			String taskCode = zbReceiptDTO.getTaskCode();
-			String departCode = zbReceiptDTO.getDepartCode();
-			String platformOrderCode = detail.getPlatformOrderCode();
-			String advanceKey = taskCode + departCode + platformOrderCode;
-			if (advanceMap.containsKey(advanceKey)) {
-				advanceMap.get(advanceKey).add(detail);
-			} else {
-				ArrayList<OrderPackageDTO> orderPackageDTOS = new ArrayList<>();
-				orderPackageDTOS.add(detail);
-				advanceMap.put(advanceKey, orderPackageDTOS);
-			}
-		}
-		// 组装暂存单数据
-		List<JSONObject> advances = new ArrayList<>();
-		for (Map.Entry<String, List<OrderPackageDTO>> stringListEntry : advanceMap.entrySet()) {
-			List<OrderPackageDTO> value = stringListEntry.getValue();
-			TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity();
-			advanceEntity.setTenantId(tenantId);
-			advanceEntity.setStatus(0);
-			advanceEntity.setIsDeleted(0);
-			advanceEntity.setHasPackage(CollUtil.isNotEmpty(zbReceiptDTO.getDetails()) ? 1 : 0);
-			advanceEntity.setOrderType(zbReceiptDTO.getOrderType());
-			advanceEntity.setBrand(zbReceiptDTO.getSenderName());
-			advanceEntity.setSiteName("");
-			advanceEntity.setArea("");
-			advanceEntity.setTotalNum(CollUtil.isNotEmpty(value) ? value.size() : 0);
-			advanceEntity.setPackName("");
-			advanceEntity.setPackCode("");
-			advanceEntity.setWarehouseId(startWarehouseId);
-			advanceEntity.setWarehouseName(startWarehouseName);
-
-			advanceEntity.setIsGcp(0);
-			advanceEntity.setCarrierName(zbReceiptDTO.getVendorName());
-			advanceEntity.setSystemType("线上");
-			advanceEntity.setMatingType("1");
-			advanceEntity.setSenderName(zbReceiptDTO.getSenderName());
-			advanceEntity.setSenderPhone(zbReceiptDTO.getSenderTel());
-			advanceEntity.setSenderAddress(zbReceiptDTO.getSenderAddress());
-			advanceEntity.setWaybillStatus("0");
-			advanceEntity.setWaybillNo("");
-			advanceEntity.setTrainNumber(zbReceiptDTO.getDepartCode());
-			advanceEntity.setFreezeStatus("0");
-
-			advanceEntity.setSenderFactory(zbReceiptDTO.getSenderName());
-			List<JSONObject> packageList = new ArrayList<>();
-			for (OrderPackageDTO orderPackageDTO : value) {
-				advanceEntity.setOrderCode(orderPackageDTO.getPlatformOrderCode());
-				advanceEntity.setDealerCode(orderPackageDTO.getCustomerCode());
-				advanceEntity.setDealerName(orderPackageDTO.getCustomerName());
-				advanceEntity.setStoreCode(orderPackageDTO.getCustomerCode());
-				advanceEntity.setStoreName(orderPackageDTO.getCustomerName());
-				advanceEntity.setServiceNum(orderPackageDTO.getRelationOrderCode());
-				advanceEntity.setCustomerName(orderPackageDTO.getReceiverName());
-				advanceEntity.setCustomerPhone(orderPackageDTO.getReceiverMobile());
-				advanceEntity.setCustomerAddress(orderPackageDTO.getReceiverAddress());
-
-				// 封装包件
-				TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
-				advanceDetailEntity.setWarehouseId(startWarehouseId);
-				advanceDetailEntity.setWarehouseName(startWarehouseName);
-//					advanceDetailEntity.setIncomingWarehouseId(0L);
-//					advanceDetailEntity.setIncomingWarehouseName("");
-				// 根据志邦的一流单标识赋值
-				advanceEntity.setLegacyStatus("0");
-				if (ObjectUtil.equal(orderPackageDTO.getLegacyFlag(), "Y")) {
-					advanceEntity.setLegacyStatus("1");
-				}
-
-				advanceDetailEntity.setOrderCode(orderPackageDTO.getPlatformOrderCode());
-				advanceDetailEntity.setBrand(zbReceiptDTO.getSenderName());
-				advanceDetailEntity.setSystemType("线上");
-				advanceDetailEntity.setFirstPackName(orderPackageDTO.getPackageTypeName());
-				advanceDetailEntity.setFirstPackCode(orderPackageDTO.getPackageType());
-				// 获取映射志邦映射品类信息
-				ZbCategoryContrastEntity zbCategoryContrastEntity = buildZbCategoryContrastEntityCache(orderPackageDTO.getPackageClass());
-				if (zbCategoryContrastEntity != null) {
-					advanceDetailEntity.setSecondPackName(zbCategoryContrastEntity.getSecondName());//二级品类名称
-					advanceDetailEntity.setSecondPackCode(zbCategoryContrastEntity.getSecondCode());//二级品类
-					advanceDetailEntity.setThirdPackName(zbCategoryContrastEntity.getThirdName());//三级品类名称
-					advanceDetailEntity.setThirdPackCode(zbCategoryContrastEntity.getThirdCode());//三级品类
-				} else {
-					advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
-					advanceDetailEntity.setSecondPackCode("");//二级品类
-					advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
-					advanceDetailEntity.setThirdPackCode("");//三级品类
-				}
-				advanceDetailEntity.setSiteName("");
-				advanceDetailEntity.setSiteCode("");
-				String planQty = orderPackageDTO.getPlanQty();
-				advanceDetailEntity.setQuantity((StrUtil.isNotBlank(planQty) && NumberUtil.isNumber(planQty)) ? Convert.toInt(planQty) : 0);
-				advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getPackageCode());
-				advanceDetailEntity.setTrainNumber(zbReceiptDTO.getDepartCode());
-				advanceDetailEntity.setServiceNum(orderPackageDTO.getRelationOrderCode());
-				advanceDetailEntity.setWaybillNo("");
-				advanceDetailEntity.setPackageStatus("0");
-				advanceDetailEntity.setWeight(StrUtil.isNotBlank(orderPackageDTO.getTotalGrossWeight()) ? new BigDecimal(orderPackageDTO.getTotalGrossWeight()) : BigDecimal.ZERO);
-				advanceDetailEntity.setVolume(StrUtil.isNotBlank(orderPackageDTO.getTotalVolume()) ? new BigDecimal(orderPackageDTO.getTotalVolume()) : BigDecimal.ZERO);
-//					advanceDetailEntity.setChargeType(0);
-				advanceDetailEntity.setSupple("");
-				advanceDetailEntity.setManifest("");
-				advanceDetailEntity.setReturnNum("");
-				advanceDetailEntity.setSendDateStr(DateUtil.formatLocalDateTime(LocalDateTime.now()));
-				advanceDetailEntity.setCarNumber("");
-				advanceDetailEntity.setGoodsMan("");
-				advanceDetailEntity.setTenantId(tenantId);
-				advanceDetailEntity.setStatus(0);
-				advanceDetailEntity.setIsDeleted(0);
-				List<JSONObject> itemJsons = new ArrayList<>();
-				List<PackageInfoDTO> items = orderPackageDTO.getItems();
-				for (PackageInfoDTO item : items) {
-					TrunklineDetailProductEntity detailProductEntity = new TrunklineDetailProductEntity();
-					detailProductEntity.setTenantId(tenantId);
-					detailProductEntity.setWarehouseId(startWarehouseId);
-					detailProductEntity.setWarehouseName(startWarehouseName);
-					detailProductEntity.setUnitNo(orderPackageDTO.getPackageCode());
-					detailProductEntity.setProductCode(item.getItemCode());
-					detailProductEntity.setProductName(item.getItemName());
-					detailProductEntity.setQuantity(item.getPlanQty());
-					detailProductEntity.setStatus(0);
-					detailProductEntity.setIsDeleted(0);
-					itemJsons.add(JSONUtil.parseObj(detailProductEntity));
+		if(zbFactoryProperties.isAdvance()){
+			receiptService.buildAdvance(zbReceiptDTO, packageCode);
 		}
-				JSONObject entries = JSONUtil.parseObj(advanceDetailEntity);
-				entries.set("items", itemJsons);
-				packageList.add(entries);
-			}
-			// 转成json对象，然后将包件明细放到detail中
-			JSONObject entries = JSONUtil.parseObj(advanceEntity);
-			entries.set("details", JSONUtil.toJsonStr(packageList));
-			advances.add(entries);
-		}
-		// 将组装好的暂存单发送到 MQ ，由暂存单服务统一消费SendMsg.
-		if (CollUtil.isNotEmpty(advances)) {
-			for (JSONObject advance : advances) {
-				SendMsg sendMsg = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.ADVANCE_ORDER)
-					.routingKey(FactoryDataConstants.Mq.RoutingKeys.ADVANCE_ORDER).message(JSONUtil.toJsonStr(advance)).build();
-				factoryDataClient.sendMessage(sendMsg);
-			}
-		}
-	}
-
-	private ZbCategoryContrastEntity buildZbCategoryContrastEntityCache(String packageClass) {
-
-
-		if (StringUtil.isBlank(packageClass)) {
-			return null;
-		}
-		if (containsChinese(packageClass)) {
-			return null;
-		}
-
-		String key = TenantNum.HUITONGCODE + ":" + ZbCategoryContrastEntity.class.getName() + ":" + packageClass;
-		ZbCategoryContrastEntity zbCategoryContrastEntity = bladeRedis.get(key);
-		if (zbCategoryContrastEntity == null) {
-			QueryWrapper<ZbCategoryContrastEntity> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("source_code", packageClass);
-			queryWrapper.eq("status", "1");
-			zbCategoryContrastEntity = zbCategoryContrastMapper.selectOne(queryWrapper);
-			if (!Objects.isNull(zbCategoryContrastEntity)) {
-				// 缓存起来
-				bladeRedis.setEx(key, zbCategoryContrastEntity, 3600 * 24L);
-			}
-		}
-		return zbCategoryContrastEntity;
-
-
-	}
-
-	/**
-	 * 验证参数中是否包含中文
-	 *
-	 * @param str 匹配参数
-	 * @return true 包含中文 false 不包含中文
-	 */
-	private boolean containsChinese(String str) {
-		Pattern pattern = Pattern.compile(PatternConstant.REGEX_CHINESE);
-		Matcher matcher = pattern.matcher(str);
-		return matcher.find();
 	}
 
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/pros/ZbFactoryProperties.java

@@ -19,6 +19,7 @@ public class ZbFactoryProperties {
 	private String customerid;
 	private String secretkey;
 	private String url;
+	private boolean isAdvance = false;
 	private boolean enable = true;
 
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/FactoryLogService.java

@@ -1,6 +1,7 @@
 package com.logpm.factorydata.zbom.service;
 
 import com.logpm.factorydata.zbom.entity.FactoryLogEntity;
+import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
 import org.springblade.core.mp.base.BaseService;
 
 /**
@@ -11,4 +12,5 @@ import org.springblade.core.mp.base.BaseService;
  **/
 public interface FactoryLogService extends BaseService<FactoryLogEntity> {
 
+    void orderData(ZBReceiptDTO zbReceiptDTO);
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/IReceiptService.java

@@ -17,8 +17,11 @@
 package com.logpm.factorydata.zbom.service;
 
 import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
+import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.Set;
+
 /**
  * 志邦入库单 服务类
  *
@@ -27,4 +30,6 @@ import org.springblade.core.mp.base.BaseService;
  */
 public interface IReceiptService extends BaseService<ZbReceiptEntity> {
 
+	void buildAdvance(ZBReceiptDTO zbReceiptDTO, Set<String> packageCode);
+
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/FactoryLogServiceImpl.java

@@ -1,12 +1,35 @@
 package com.logpm.factorydata.zbom.service.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.json.JSONUtil;
+import com.logpm.factorydata.enums.SaxStatusEnums;
+import com.logpm.factorydata.feign.IFactoryDataClient;
+import com.logpm.factorydata.vo.SendMsg;
 import com.logpm.factorydata.zbom.entity.FactoryLogEntity;
 import com.logpm.factorydata.zbom.mapper.FactoryLogMapper;
 import com.logpm.factorydata.zbom.service.FactoryLogService;
+import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.io.IOUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springblade.common.constant.factorydata.FactoryDataConstants;
+import org.springblade.common.utils.FileLogsUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.tool.api.R;
+import org.springblade.resource.feign.IOssClient;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 
 /**
  * 工厂订单日志 业务实现类
@@ -19,4 +42,64 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class FactoryLogServiceImpl extends BaseServiceImpl<FactoryLogMapper, FactoryLogEntity> implements FactoryLogService {
 
+
+	private final IFactoryDataClient factoryDataClient;
+
+	private final IOssClient ossClient;
+
+    @Override
+    public void orderData(ZBReceiptDTO zbReceiptDTO) {
+		// 1 上传数据到 minio 获取到地址
+		String url = uploadFile(JSONUtil.toJsonStr(zbReceiptDTO));
+		// 2 保存地址到数据库
+		FactoryLogEntity logEntity = new FactoryLogEntity();
+		logEntity.setType(1);
+		logEntity.setSaxStatus(SaxStatusEnums.NOMAL.getCode());
+		logEntity.setLogUrl(url);
+		this.save(logEntity);
+
+		// 3 将消息发送给 mq，解析保存
+		SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER)
+			.routingKey(FactoryDataConstants.Mq.RoutingKeys.ZBOM_FACTORY_ORDER)
+			.message(JSONUtil.toJsonStr(logEntity)).build();
+		factoryDataClient.sendMessage(build);
+    }
+
+	private String uploadFile(String body) {
+		//文本内容和保存为本地文件 并上传
+		String logPath = FileLogsUtil.saveFileLogs(body);
+		log.info(">>> 文件路径 {}", logPath);
+
+		MultipartFile multi = getMultipartFile(logPath);
+		//上传到服务器
+		R r = ossClient.fileUpload(multi, "zb-order-logs");
+		if (r.isSuccess()) {
+			BladeFile data = (BladeFile) r.getData();
+			// 删除本地文件
+			FileUtil.del(logPath);
+			return data.getLink();
+		}
+		return null;
+	}
+
+	@NotNull
+	private MultipartFile getMultipartFile(String logPath) {
+		File file = new File(logPath);
+
+		// File 转 MultipartFile
+		FileItem item = new DiskFileItemFactory().createItem("file"
+			, MediaType.MULTIPART_FORM_DATA_VALUE
+			, true
+			, file.getName());
+		try (
+			InputStream input = Files.newInputStream(file.toPath());
+			OutputStream os = item.getOutputStream()) {
+			// 流转移
+			IOUtils.copy(input, os);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Invalid file: " + e, e);
+		}
+
+		return new CommonsMultipartFile(item);
+	}
 }

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java

@@ -16,14 +16,54 @@
  */
 package com.logpm.factorydata.zbom.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.factorydata.base.feign.IFactoryDataBaseClient;
+import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO;
+import com.logpm.factorydata.feign.IFactoryDataClient;
+import com.logpm.factorydata.vo.SendMsg;
+import com.logpm.factorydata.zbom.entity.ZbCategoryContrastEntity;
 import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
 import com.logpm.factorydata.zbom.mapper.ReceiptMapper;
+import com.logpm.factorydata.zbom.mapper.ZbCategoryContrastMapper;
 import com.logpm.factorydata.zbom.service.IReceiptService;
+import com.logpm.factorydata.zbom.vo.OrderPackageDTO;
+import com.logpm.factorydata.zbom.vo.PackageInfoDTO;
+import com.logpm.factorydata.zbom.vo.ZBReceiptDTO;
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
+import com.logpm.trunkline.entity.TrunklineDetailProductEntity;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.annotations.LogpmAsync;
+import org.springblade.common.constant.HttpConstants;
+import org.springblade.common.constant.PatternConstant;
+import org.springblade.common.constant.TenantNum;
+import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * 志邦入库单 服务实现类
  *
@@ -35,4 +75,209 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceiptEntity> implements IReceiptService {
 
+	private final BladeRedis bladeRedis;
+	private final ZbCategoryContrastMapper zbCategoryContrastMapper;
+	private final IFactoryDataBaseClient baseClient;
+	private final IFactoryDataClient factoryDataClient;
+
+    @Override
+	@LogpmAsync("asyncExecutor")
+	public void buildAdvance(ZBReceiptDTO zbReceiptDTO, Set packageCode) {
+		// 新起线程构建暂存单发送mq
+		Long startWarehouseId = null;
+		String startWarehouseName = null;
+		String tenantId = null;
+		// 获取工厂基地绑定的始发仓信息
+		R<FactoryWarehouseBindVO> warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(zbReceiptDTO.getSenderName(), zbReceiptDTO.getSenderName());
+		if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, warehouseByBrandAndSiteName.getCode())) {
+			FactoryWarehouseBindVO data = warehouseByBrandAndSiteName.getData();
+			if (ObjectUtil.isNotNull(data)) {
+				startWarehouseId = data.getWarehouseId();
+				startWarehouseName = data.getWarehouseName();
+				tenantId = data.getTenantId();
+			}
+		}
+		Map<String, List<OrderPackageDTO>> advanceMap = new HashMap<>();
+		List<OrderPackageDTO> details = zbReceiptDTO.getDetails();
+		// 入库单号 + 订单自编号 + 发车单号 一个暂存单
+		for (OrderPackageDTO detail : details) {
+			if (packageCode.contains(detail.getPackageCode())) {
+				log.info(" 接收志邦数据：包条码 {} 已存在数据库中，不生成暂存单。", detail.getPackageCode());
+				continue;
+			}
+			String taskCode = zbReceiptDTO.getTaskCode();
+			String departCode = zbReceiptDTO.getDepartCode();
+			String platformOrderCode = detail.getPlatformOrderCode();
+			String advanceKey = taskCode + departCode + platformOrderCode;
+			if (advanceMap.containsKey(advanceKey)) {
+				advanceMap.get(advanceKey).add(detail);
+			} else {
+				ArrayList<OrderPackageDTO> orderPackageDTOS = new ArrayList<>();
+				orderPackageDTOS.add(detail);
+				advanceMap.put(advanceKey, orderPackageDTOS);
+			}
+		}
+		// 组装暂存单数据
+		List<JSONObject> advances = new ArrayList<>();
+		for (Map.Entry<String, List<OrderPackageDTO>> stringListEntry : advanceMap.entrySet()) {
+			List<OrderPackageDTO> value = stringListEntry.getValue();
+			TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity();
+			advanceEntity.setTenantId(tenantId);
+			advanceEntity.setStatus(0);
+			advanceEntity.setIsDeleted(0);
+			advanceEntity.setHasPackage(CollUtil.isNotEmpty(zbReceiptDTO.getDetails()) ? 1 : 0);
+			advanceEntity.setOrderType(zbReceiptDTO.getOrderType());
+			advanceEntity.setBrand(zbReceiptDTO.getSenderName());
+			advanceEntity.setSiteName("");
+			advanceEntity.setArea("");
+			advanceEntity.setTotalNum(CollUtil.isNotEmpty(value) ? value.size() : 0);
+			advanceEntity.setPackName("");
+			advanceEntity.setPackCode("");
+			advanceEntity.setWarehouseId(startWarehouseId);
+			advanceEntity.setWarehouseName(startWarehouseName);
+
+			advanceEntity.setIsGcp(0);
+			advanceEntity.setCarrierName(zbReceiptDTO.getVendorName());
+			advanceEntity.setSystemType("线上");
+			advanceEntity.setMatingType("1");
+			advanceEntity.setSenderName(zbReceiptDTO.getSenderName());
+			advanceEntity.setSenderPhone(zbReceiptDTO.getSenderTel());
+			advanceEntity.setSenderAddress(zbReceiptDTO.getSenderAddress());
+			advanceEntity.setWaybillStatus("0");
+			advanceEntity.setWaybillNo("");
+			advanceEntity.setTrainNumber(zbReceiptDTO.getDepartCode());
+			advanceEntity.setFreezeStatus("0");
+
+			advanceEntity.setSenderFactory(zbReceiptDTO.getSenderName());
+			List<JSONObject> packageList = new ArrayList<>();
+			for (OrderPackageDTO orderPackageDTO : value) {
+				advanceEntity.setOrderCode(orderPackageDTO.getPlatformOrderCode());
+				advanceEntity.setDealerCode(orderPackageDTO.getCustomerCode());
+				advanceEntity.setDealerName(orderPackageDTO.getCustomerName());
+				advanceEntity.setStoreCode(orderPackageDTO.getCustomerCode());
+				advanceEntity.setStoreName(orderPackageDTO.getCustomerName());
+				advanceEntity.setServiceNum(orderPackageDTO.getRelationOrderCode());
+				advanceEntity.setCustomerName(orderPackageDTO.getReceiverName());
+				advanceEntity.setCustomerPhone(orderPackageDTO.getReceiverMobile());
+				advanceEntity.setCustomerAddress(orderPackageDTO.getReceiverAddress());
+				// 根据志邦的一流单标识赋值
+				advanceEntity.setLegacyStatus("0");
+				if (ObjectUtil.equal(orderPackageDTO.getLegacyFlag(), "Y")) {
+					advanceEntity.setLegacyStatus("1");
+				}
+				// 封装包件
+				TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
+				advanceDetailEntity.setWarehouseId(startWarehouseId);
+				advanceDetailEntity.setWarehouseName(startWarehouseName);
+				advanceDetailEntity.setOrderCode(orderPackageDTO.getPlatformOrderCode());
+				advanceDetailEntity.setBrand(zbReceiptDTO.getSenderName());
+				advanceDetailEntity.setSystemType("线上");
+				advanceDetailEntity.setFirstPackName(orderPackageDTO.getPackageTypeName());
+				advanceDetailEntity.setFirstPackCode(orderPackageDTO.getPackageType());
+				// 获取映射志邦映射品类信息
+				ZbCategoryContrastEntity zbCategoryContrastEntity = buildZbCategoryContrastEntityCache(orderPackageDTO.getPackageClass());
+				if (zbCategoryContrastEntity != null) {
+					advanceDetailEntity.setSecondPackName(zbCategoryContrastEntity.getSecondName());//二级品类名称
+					advanceDetailEntity.setSecondPackCode(zbCategoryContrastEntity.getSecondCode());//二级品类
+					advanceDetailEntity.setThirdPackName(zbCategoryContrastEntity.getThirdName());//三级品类名称
+					advanceDetailEntity.setThirdPackCode(zbCategoryContrastEntity.getThirdCode());//三级品类
+				} else {
+					advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
+					advanceDetailEntity.setSecondPackCode("");//二级品类
+					advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
+					advanceDetailEntity.setThirdPackCode("");//三级品类
+				}
+				advanceDetailEntity.setSiteName("");
+				advanceDetailEntity.setSiteCode("");
+				String planQty = orderPackageDTO.getPlanQty();
+				advanceDetailEntity.setQuantity((StrUtil.isNotBlank(planQty) && NumberUtil.isNumber(planQty)) ? Convert.toInt(planQty) : 0);
+				advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getPackageCode());
+				advanceDetailEntity.setTrainNumber(zbReceiptDTO.getDepartCode());
+				advanceDetailEntity.setServiceNum(orderPackageDTO.getRelationOrderCode());
+				advanceDetailEntity.setWaybillNo("");
+				advanceDetailEntity.setPackageStatus("0");
+				advanceDetailEntity.setWeight(StrUtil.isNotBlank(orderPackageDTO.getTotalGrossWeight()) ? new BigDecimal(orderPackageDTO.getTotalGrossWeight()) : BigDecimal.ZERO);
+				advanceDetailEntity.setVolume(StrUtil.isNotBlank(orderPackageDTO.getTotalVolume()) ? new BigDecimal(orderPackageDTO.getTotalVolume()) : BigDecimal.ZERO);
+//					advanceDetailEntity.setChargeType(0);
+				advanceDetailEntity.setSupple("");
+				advanceDetailEntity.setManifest("");
+				advanceDetailEntity.setReturnNum("");
+				advanceDetailEntity.setSendDateStr(DateUtil.formatLocalDateTime(LocalDateTime.now()));
+				advanceDetailEntity.setCarNumber("");
+				advanceDetailEntity.setGoodsMan("");
+				advanceDetailEntity.setTenantId(tenantId);
+				advanceDetailEntity.setStatus(0);
+				advanceDetailEntity.setIsDeleted(0);
+				List<JSONObject> itemJsons = new ArrayList<>();
+				List<PackageInfoDTO> items = orderPackageDTO.getItems();
+				for (PackageInfoDTO item : items) {
+					TrunklineDetailProductEntity detailProductEntity = new TrunklineDetailProductEntity();
+					detailProductEntity.setTenantId(tenantId);
+					detailProductEntity.setWarehouseId(startWarehouseId);
+					detailProductEntity.setWarehouseName(startWarehouseName);
+					detailProductEntity.setUnitNo(orderPackageDTO.getPackageCode());
+					detailProductEntity.setProductCode(item.getItemCode());
+					detailProductEntity.setProductName(item.getItemName());
+					detailProductEntity.setQuantity(item.getPlanQty());
+					detailProductEntity.setStatus(0);
+					detailProductEntity.setIsDeleted(0);
+					itemJsons.add(JSONUtil.parseObj(detailProductEntity));
+				}
+				JSONObject entries = JSONUtil.parseObj(advanceDetailEntity);
+				entries.set("items", itemJsons);
+				packageList.add(entries);
+			}
+			// 转成json对象，然后将包件明细放到detail中
+			JSONObject entries = JSONUtil.parseObj(advanceEntity);
+			entries.set("details", JSONUtil.toJsonStr(packageList));
+			advances.add(entries);
+		}
+		// 将组装好的暂存单发送到 MQ ，由暂存单服务统一消费SendMsg.
+		if (CollUtil.isNotEmpty(advances)) {
+			for (JSONObject advance : advances) {
+				SendMsg sendMsg = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.ADVANCE_ORDER)
+					.routingKey(FactoryDataConstants.Mq.RoutingKeys.ADVANCE_ORDER).message(JSONUtil.toJsonStr(advance)).build();
+				factoryDataClient.sendMessage(sendMsg);
+			}
+		}
+	}
+
+	private ZbCategoryContrastEntity buildZbCategoryContrastEntityCache(String packageClass) {
+
+
+		if (StringUtil.isBlank(packageClass)) {
+			return null;
+		}
+		if (containsChinese(packageClass)) {
+			return null;
+		}
+
+		String key = TenantNum.HUITONGCODE + ":" + ZbCategoryContrastEntity.class.getName() + ":" + packageClass;
+		ZbCategoryContrastEntity zbCategoryContrastEntity = bladeRedis.get(key);
+		if (zbCategoryContrastEntity == null) {
+			QueryWrapper<ZbCategoryContrastEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("source_code", packageClass);
+			queryWrapper.eq("status", "1");
+			zbCategoryContrastEntity = zbCategoryContrastMapper.selectOne(queryWrapper);
+			if (!Objects.isNull(zbCategoryContrastEntity)) {
+				// 缓存起来
+				bladeRedis.setEx(key, zbCategoryContrastEntity, 3600 * 24L);
+			}
+		}
+		return zbCategoryContrastEntity;
+
+
+	}
+
+	/**
+	 * 验证参数中是否包含中文
+	 *
+	 * @param str 匹配参数
+	 * @return true 包含中文 false 不包含中文
+	 */
+	private boolean containsChinese(String str) {
+		Pattern pattern = Pattern.compile(PatternConstant.REGEX_CHINESE);
+		Matcher matcher = pattern.matcher(str);
+		return matcher.find();
+	}
 }

blade-service/logpm-factory/pom.xml

@@ -129,6 +129,11 @@
             <artifactId>logpm-factory-data-api</artifactId>
             <version>3.2.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.logpm</groupId>
+            <artifactId>logpm-factory-data-zbom-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
 
     </dependencies>
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java

@@ -10,24 +10,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springblade.common.annotations.LocalServerUser;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.core.tool.utils.ThreadLocalUtil;
-import org.springblade.core.tool.utils.WebUtil;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -104,7 +97,10 @@ public class FactoryCommonController {
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.ORDER_STATUS_EXCHANGE, RabbitConstant.ORDER_STATUS_ROUTING, map);
 			map.put("type", "DealWith");
-			rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map);
+			rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map,message->{
+				message.getMessageProperties().setHeader("x-delay",2000);
+				return message;
+			});
 
 
 //			R r = factoryDataService.handleStatusData(orderStatusDTO);

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -64,7 +64,6 @@ import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.Nullable;
 import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.constant.HttpConstants;
-import org.springblade.common.constant.PackagesTypeEnum;
 import org.springblade.common.constant.PatternConstant;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
@@ -72,9 +71,7 @@ import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
@@ -770,9 +767,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			List<FactoryOrderEntity> factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list();
 			log.info(">>>>>>>>>>>>>>>>>>>>>handlerOuPaiDataToHt 派车单 {} 派车单下面订单集合长度 {}", receivingOrderEntity.getCode(), factoryOrderEntities.size());
 
-			addAdvanceEntityBtOuPai(receivingOrderEntity, factoryOrderEntities);
-			// TODO 走新系统暂存单,暂时不写后面再写
-//			addAdvanceEntityBtOuPaiNew(receivingOrderEntity, factoryOrderEntities);
+//			addAdvanceEntityBtOuPai(receivingOrderEntity, factoryOrderEntities);
+			//  走新系统暂存单
+			addAdvanceEntityBtOuPaiNew(receivingOrderEntity, factoryOrderEntities);
 			receivingOrderEntity.setTurnStatus(1);
 			log.info(">>>>>>>>>>>>>>>>>>>>>handlerOuPaiDataToHt 更新收货单状态 收货单号 {}", receivingOrderEntity.getCode());
 			receivingOrderService.updateById(receivingOrderEntity);
@@ -781,6 +778,149 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 	}
 
+	private void addAdvanceEntityBtOuPaiNew(ReceivingOrderEntity receivingOrderEntity, List<FactoryOrderEntity> factoryOrderEntities) {
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>> addAdvanceEntityBtOuPai  派车单数据推送到新系统，更新物料信息 单号{}", receivingOrderEntity.getCode());
+		String carNumber = receivingOrderEntity.getCarNumber();
+		// 欧派只更新物料信息 不管暂存单信息
+		String fromWarehouseName = receivingOrderEntity.getFromWarehouseName();
+		// 只处理 已配置的基地的数据 其他基地无法确认，暂时不处理
+		Long startWarehouseId = null;
+		String startWarehouseName = null;
+		String tenantId = null;
+		// 获取工厂基地绑定的始发仓信息
+		R<FactoryWarehouseBindVO> warehouseByBrandAndSiteName = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.OP.getValue(), fromWarehouseName);
+		if (cn.hutool.core.util.ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, warehouseByBrandAndSiteName.getCode())) {
+			FactoryWarehouseBindVO data = warehouseByBrandAndSiteName.getData();
+			if (cn.hutool.core.util.ObjectUtil.isNotNull(data)) {
+				startWarehouseId = data.getWarehouseId();
+				startWarehouseName = data.getWarehouseName();
+				tenantId = data.getTenantId();
+			}
+		}
+		if (cn.hutool.core.util.ObjectUtil.isAllNotEmpty(startWarehouseId, startWarehouseName, tenantId)) {
+			// 订单
+			List<JSONObject> advances = new ArrayList<>();
+			for (FactoryOrderEntity factoryOrderEntity : factoryOrderEntities) {
+				factoryOrderEntity.setTurnStatus(1);
+
+				TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity();
+				advanceEntity.setTenantId(tenantId);
+				advanceEntity.setStatus(0);
+				advanceEntity.setIsDeleted(0);
+				advanceEntity.setOrderType(factoryOrderEntity.getOrderType());
+				advanceEntity.setBrand(BrandEnums.OP.getValue());
+				advanceEntity.setSiteName(fromWarehouseName);
+				advanceEntity.setArea("");
+				advanceEntity.setPackName("");
+				advanceEntity.setPackCode("");
+				advanceEntity.setWarehouseId(startWarehouseId);
+				advanceEntity.setWarehouseName(startWarehouseName);
+				advanceEntity.setIsGcp(0);
+				advanceEntity.setCarrierName("汇通物流");
+				advanceEntity.setSystemType("线上");
+				advanceEntity.setMatingType("1");
+				advanceEntity.setWaybillStatus("0");
+				advanceEntity.setWaybillNo("");
+				advanceEntity.setTrainNumber(receivingOrderEntity.getCarNumber());
+				advanceEntity.setFreezeStatus("0");
+
+				advanceEntity.setSenderFactory("");
+				advanceEntity.setOrderCode(factoryOrderEntity.getSelfCode());
+				advanceEntity.setDealerCode(factoryOrderEntity.getShopCode());
+				advanceEntity.setDealerName(factoryOrderEntity.getShopName());
+				advanceEntity.setStoreCode(factoryOrderEntity.getShopCode());
+				advanceEntity.setStoreName(factoryOrderEntity.getShopName());
+				advanceEntity.setServiceNum(factoryOrderEntity.getServiceNumber());
+				advanceEntity.setCustomerName(factoryOrderEntity.getCustomer());
+				advanceEntity.setCustomerPhone(factoryOrderEntity.getCustomerPhone());
+				advanceEntity.setCustomerAddress(factoryOrderEntity.getCustomerAddress());
+				advanceEntity.setConsigneePerson(factoryOrderEntity.getShopReceiver());
+				// 处理订单下面的包件数据
+				List<FactoryPackageEntity> list = factoryPackageService.lambdaQuery()
+					.eq(FactoryPackageEntity::getOrderId, factoryOrderEntity.getId()).eq(FactoryPackageEntity::getTurnStatus, 0).list();
+				advanceEntity.setHasPackage(CollUtil.isNotEmpty(list) ? 1 : 0);
+				advanceEntity.setTotalNum(CollUtil.isNotEmpty(list) ? list.size() : 0);
+				List<JSONObject> packageList = new ArrayList<>();
+				for (FactoryPackageEntity factoryPackageEntity : list) {
+					TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
+					advanceDetailEntity.setWarehouseId(startWarehouseId);
+					advanceDetailEntity.setWarehouseName(startWarehouseName);
+					advanceDetailEntity.setOrderCode(factoryOrderEntity.getSelfCode());
+					advanceDetailEntity.setBrand(BrandEnums.OP.getValue());
+					advanceDetailEntity.setSystemType("线上");
+					advanceDetailEntity.setFirstPackName(factoryPackageEntity.getFirstClassName());
+					advanceDetailEntity.setFirstPackCode(factoryPackageEntity.getFirstClassCode());
+					advanceDetailEntity.setSecondPackName(factoryPackageEntity.getSecondClassName());//二级品类名称
+					advanceDetailEntity.setSecondPackCode(factoryPackageEntity.getSecondClassCode());//二级品类
+					advanceDetailEntity.setThirdPackName(factoryPackageEntity.getThirdClassName());//三级品类名称
+					advanceDetailEntity.setThirdPackCode(factoryPackageEntity.getThirdClassCode());//三级品类
+					advanceDetailEntity.setMaterialName(factoryPackageEntity.getPackageDetailNames());
+					advanceDetailEntity.setSiteName(fromWarehouseName);
+					advanceDetailEntity.setSiteCode("");
+					advanceDetailEntity.setQuantity(1);
+					advanceDetailEntity.setOrderPackageCode(factoryPackageEntity.getCode());
+					advanceDetailEntity.setTrainNumber(receivingOrderEntity.getCarNumber());
+					advanceDetailEntity.setServiceNum(factoryOrderEntity.getServiceNumber());
+					advanceDetailEntity.setWaybillNo("");
+					advanceDetailEntity.setPackageStatus("0");
+					advanceDetailEntity.setWeight(factoryPackageEntity.getWeight());
+					if (cn.hutool.core.util.ObjectUtil.isAllNotEmpty(factoryPackageEntity.getHeight(), factoryPackageEntity.getWidth(), factoryPackageEntity.getLength())) {
+						advanceDetailEntity.setVolume(factoryPackageEntity.getHeight().multiply(factoryPackageEntity.getWidth()).multiply(factoryPackageEntity.getLength()));
+					}
+					advanceDetailEntity.setSupple("");
+					advanceDetailEntity.setManifest("");
+					advanceDetailEntity.setReturnNum("");
+					advanceDetailEntity.setSendDateStr(DateUtil.formatLocalDateTime(LocalDateTime.now()));
+					advanceDetailEntity.setCarNumber("");
+					advanceDetailEntity.setGoodsMan("");
+					advanceDetailEntity.setTenantId(tenantId);
+					advanceDetailEntity.setStatus(0);
+					advanceDetailEntity.setIsDeleted(0);
+					// 物料
+					List<FactoryPackageDetailEntity> factoryPackageDetailEntities = factoryPackageDetailService.lambdaQuery()
+						.eq(FactoryPackageDetailEntity::getPackageId, factoryPackageEntity.getId()).list();
+					List<JSONObject> itemJsons = new ArrayList<>();
+					if (CollUtil.isNotEmpty(factoryPackageDetailEntities)) {
+						for (FactoryPackageDetailEntity factoryPackageDetailEntity : factoryPackageDetailEntities) {
+							if(cn.hutool.core.util.ObjectUtil.equal(factoryPackageEntity.getPackageDetailNames(),factoryPackageDetailEntity.getName())){
+								advanceDetailEntity.setMaterialCode(factoryPackageDetailEntity.getCode());
+							}
+							TrunklineDetailProductEntity detailProductEntity = new TrunklineDetailProductEntity();
+							detailProductEntity.setTenantId(tenantId);
+							detailProductEntity.setWarehouseId(startWarehouseId);
+							detailProductEntity.setWarehouseName(startWarehouseName);
+							detailProductEntity.setUnitNo(factoryPackageEntity.getCode());
+							detailProductEntity.setProductCode(factoryPackageDetailEntity.getCode());
+							detailProductEntity.setProductName(factoryPackageDetailEntity.getName());
+							detailProductEntity.setReserve1(factoryPackageDetailEntity.getType());
+							detailProductEntity.setReserve2(factoryPackageDetailEntity.getUnit());
+							detailProductEntity.setQuantity(1);
+							detailProductEntity.setStatus(0);
+							detailProductEntity.setIsDeleted(0);
+							itemJsons.add(JSONUtil.parseObj(detailProductEntity));
+						}
+					}
+					JSONObject entries = JSONUtil.parseObj(advanceDetailEntity);
+					entries.set("items", itemJsons);
+					packageList.add(entries);
+				}
+				JSONObject entries = JSONUtil.parseObj(advanceEntity);
+				entries.set("details", JSONUtil.toJsonStr(packageList));
+				advances.add(entries);
+			}
+			factoryOrderService.updateBatchById(factoryOrderEntities);
+			// 发送消息
+			if (CollUtil.isNotEmpty(advances)) {
+				for (JSONObject advance : advances) {
+					SendMsg sendMsg = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.ADVANCE_ORDER_OUPAI)
+						.routingKey(FactoryDataConstants.Mq.RoutingKeys.ADVANCE_ORDER).message(JSONUtil.toJsonStr(advance)).build();
+					factoryDataClient.sendMessage(sendMsg);
+				}
+			}
+		}
+
+	}
+
 	/**
 	 * 欧派数据保存到老系统
 	 *

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -129,7 +129,8 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 	@Override
 	public void extracted(String status, String unitNo, String currentWarehouseId, String operationTime, Integer trayId) {
 		log.info("#############extracted: 当前处理的数据为 status={} unitNo={} currentWarehouseId={} operationTime={} trayId={}",status,unitNo,currentWarehouseId,operationTime,trayId);
-		if ("4".equals(status) || "2".equals(status)) {
+		String redisKey = "extracted:"+unitNo;
+		if ("4".equals(status) || "2".equals(status) || "1".equals(status)) {
 			//继续判断是否到达目的仓
 
 			//查询destinationWarehouse logiBillNo plantId数据
@@ -152,8 +153,12 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 						if (OldSystemDataPushConfig.getWarehourseIdList().contains(currentWarehouseId)) {
 							try {
 								if ("1".equals(status) || "4".equals(status)) {
+									Boolean exists = bladeRedis.exists(redisKey);
+									if(Boolean.FALSE.equals(exists)){
+										bladeRedis.setEx(redisKey, "1", 60L);
 										// 始发仓和目的仓入库
 										panFactoryDataService.handleDataToPlatform(unitNo, operationTime,Integer.parseInt(currentWarehouseId));
+									}
 								} else {
 									log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>> 错误的状态");
 								}
@@ -162,6 +167,10 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 
 							} catch (Exception e) {
 								log.error(">>>> 数据推送异常", e);
+								Boolean exists = bladeRedis.exists(redisKey);
+								if(Boolean.TRUE.equals(exists)){
+									bladeRedis.del(redisKey);
+								}
 								orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId);
 								log.error(">>>> 保存到错误数据推送记录 {}", unitNo);
 							}
@@ -169,6 +178,10 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 					}
 				}
 			} else {
+				Boolean exists = bladeRedis.exists(redisKey);
+				if(Boolean.TRUE.equals(exists)){
+					bladeRedis.del(redisKey);
+				}
 				orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId);
 			}
 		}

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java

@@ -222,6 +222,22 @@ public class RabbitMqConfiguration {
 	public Binding unloadCarNumBinding(Queue unloadCarNumQueue, CustomExchange unloadCarNumExchange) {
 		return BindingBuilder.bind(unloadCarNumQueue).to(unloadCarNumExchange).with(RabbitConstant.UNLOAD_CAR_COM_INFO_ROUTING).noargs();
 	}
+	@Bean
+	public Queue hwyUnloadCarNumQueue() {
+		return new Queue(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_QUEUE, true);
+	}
+
+	@Bean
+	public CustomExchange hwyUnloadCarNumExchange() {
+		Map<String, Object> args = Maps.newHashMap();
+		args.put("x-delayed-type", "direct");
+		return new CustomExchange(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_EXCHANGE, "x-delayed-message", true, false, args);
+	}
+
+	@Bean
+	public Binding hwyUnloadCarNumBinding(Queue hwyUnloadCarNumQueue, CustomExchange hwyUnloadCarNumExchange) {
+		return BindingBuilder.bind(hwyUnloadCarNumQueue).to(hwyUnloadCarNumExchange).with(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_ROUTING).noargs();
+	}
 
 
 	@Bean

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

@@ -4,21 +4,19 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.oupai.mapper.FactoryOrderMapper;
 import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.props.SendDataProperties;
 import com.logpm.factory.snm.dto.GroupByPackagesDTO;
 import com.logpm.factory.snm.entity.OrderLogEntity;
 import com.logpm.factory.snm.entity.StaorderPackagesEntity;
 import com.logpm.factory.snm.entity.StationOrderEntity;
 import com.logpm.factory.snm.entity.StationlinenumEntity;
 import com.logpm.factory.snm.service.*;
-import com.logpm.factory.zb.vo.PackageInfoVO;
 import com.logpm.factorydata.base.feign.IFactoryDataBaseClient;
 import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO;
 import com.logpm.factorydata.enums.BrandEnums;
@@ -35,6 +33,7 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.common.constant.HttpConstants;
@@ -43,7 +42,6 @@ import org.springblade.common.constant.PackagesTypeEnum;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -64,6 +62,7 @@ import java.util.stream.Collectors;
  *
  * @author xuxueli
  */
+@Slf4j
 @AllArgsConstructor
 @Component
 public class FactoryXxlJob {
@@ -91,6 +90,8 @@ public class FactoryXxlJob {
 	private final IFactoryDataBaseClient factoryDataBaseClient;
 	private final IFactoryDataClient factoryDataClient;
 
+	private final SendDataProperties sendDataProperties;
+
 
 	/**
 	 * snm工厂数据任务调度
@@ -194,9 +195,15 @@ public class FactoryXxlJob {
 
 		});
 		// 调用接口写入到老系统的数据库
+		if (ObjectUtil.equal(sendDataProperties.getSend(), "old")) {
+			log.info("推送到老系统");
 			resoveFactoryData();
+		}
 		// 走新系统暂存单
-//		resoveFactoryDataNew();
+		if (ObjectUtil.equal(sendDataProperties.getSend(), "new")) {
+			log.info("推送到新系统");
+			resoveFactoryDataNew();
+		}
 		return ReturnT.SUCCESS;
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java

@@ -16,20 +16,31 @@
  */
 package com.logpm.factory.mt.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.EnumUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factory.comfac.service.IAsyncDataService;
 import com.logpm.factory.comfac.service.IOrderStatusLogService;
 import com.logpm.factory.mt.dto.MtFactoryDataDTO;
 import com.logpm.factory.mt.service.IMtFactoryDataService;
+import com.logpm.factory.props.SendDataProperties;
 import com.logpm.factory.snm.entity.OrderStatusLog;
+import com.logpm.factorydata.enums.BrandEnums;
+import com.logpm.factorydata.vo.NodePushMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.RabbitConstant;
+import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +49,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -58,6 +72,34 @@ public class MtFactoryDataController extends BladeController {
 	private final IMtFactoryDataService mtFactoryDataService;
 
 	private final IAsyncDataService asyncDataService;
+	private final RabbitTemplate rabbitTemplate;
+	private final SendDataProperties sendDataProperties;
+
+	@ResponseBody
+	@PostMapping("/sendMsg")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "发送消息", notes = "传入factoryOrderDTO")
+	public R sendMsg(@Validated @RequestBody cn.hutool.json.JSONObject mtFactoryDataDTO, HttpServletRequest request) {
+		log.info("############data:{} ", mtFactoryDataDTO);
+		String corpId = request.getHeader("corpId");
+		NodePushMsg msg = new NodePushMsg();
+		msg.setNode(EnumUtil.fromString(WorkNodeEnums.class, mtFactoryDataDTO.getStr("node")));
+		msg.setBrand(BrandEnums.MTMM);
+		msg.setOperator(AuthUtil.getUser().getNickName());
+		msg.setOperatorTime(new Date());
+		List<Object> contents = new ArrayList<>();
+		ArrayList<String> codes = CollUtil.newArrayList(mtFactoryDataDTO.getStr("packageCode").split(","));
+		if (CollUtil.isNotEmpty(codes)) {
+			for (String code : codes) {
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("packageCode", code);
+				contents.add(jsonObject);
+			}
+		}
+		msg.setContent(contents);
+		rabbitTemplate.convertAndSend(RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_EXCHANGE, RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_ROUTING, msg);
+		return R.success("1");
+	}
 
 	/**
 	 * 工厂数据推送接口
@@ -91,9 +133,15 @@ public class MtFactoryDataController extends BladeController {
 				orderStatusLog.setStatus(0);
 				//开启异步线程处理数据
 				if (!Objects.isNull(mainId)) {
+					if (ObjectUtil.equal(sendDataProperties.getSend(), "old")) {
+						log.info("推送到老系统");
 						asyncDataService.handlerMtDataToHt(map.get("mainId"));
+					}
 					// 走新系统暂存单
-//					asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
+					if (ObjectUtil.equal(sendDataProperties.getSend(), "new")) {
+						log.info("推送到新系统");
+						asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
+					}
 				}
 			} else {
 				orderStatusLog.setStatus(2);

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.factory.oupai.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONArray;
@@ -17,6 +18,7 @@ import com.logpm.factory.oupai.entity.*;
 import com.logpm.factory.oupai.mapper.ReceivingOrderMapper;
 import com.logpm.factory.oupai.service.*;
 import com.logpm.factory.props.OuPaiProperties;
+import com.logpm.factory.props.SendDataProperties;
 import com.logpm.factory.snm.bean.Resp;
 import com.logpm.oldproject.feign.IAdvanceClient;
 import com.logpm.oldproject.feign.IAdvanceDetailClient;
@@ -39,6 +41,7 @@ import org.springblade.system.cache.DictCache;
 import org.springblade.system.entity.Dict;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -96,6 +99,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 	@Autowired
 	private OpPushFailedPackageRecordService opPushFailedPackageRecordService;
+	@Autowired
+	private SendDataProperties sendDataProperties;
 
 	@Override
 	public String saveOuPaiFactoryOrderDTOByCarCarNumber(String code) {
@@ -111,7 +116,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		handleData(code);
 		if (ObjectUtils.isNotNull(code)) {
 			// 暂停推送
-//			asyncDataService.handlerOuPaiDataToHt(code);
+			if(ObjectUtil.equal(sendDataProperties.getSend(), "new")){
+				log.info("推送新系统");
+				asyncDataService.handlerOuPaiDataToHt(code);
+			}
 		}
 		return code;
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.factory.pan.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factory.comfac.service.IAsyncDataService;
@@ -25,6 +26,7 @@ import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.logpm.factory.pan.service.IPanFactoryOrderService;
 import com.logpm.factory.pan.service.IPanPackageInfoService;
 import com.logpm.factory.pan.service.IPanPackageListService;
+import com.logpm.factory.props.SendDataProperties;
 import com.logpm.factory.snm.bean.Resp;
 import com.logpm.factory.snm.entity.OrderStatusLog;
 import io.swagger.annotations.Api;
@@ -32,9 +34,13 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
@@ -57,8 +63,8 @@ public class PanFactoryDataController extends BladeController {
 	private final IPanPackageListService packageListService;
 	private final IPanFactoryDataService panFactoryDataService;
 	private final IAsyncDataService syncDataService;
-	private RabbitTemplate rabbitTemplate;
 	private final IOrderStatusLogService panOrderStatusLogService;
+	private final SendDataProperties sendDataProperties;
 
 //	@ResponseBody
 //	@PostMapping("/token")
@@ -87,7 +93,6 @@ public class PanFactoryDataController extends BladeController {
 //	}
 
 
-
 	/**
 	 * 工厂数据推送接口
 	 */
@@ -124,9 +129,15 @@ public class PanFactoryDataController extends BladeController {
 
 		//开启异步线程处理数据
 		if (!Objects.isNull(orderId)) {
+			if (ObjectUtil.equal(sendDataProperties.getSend(), "old")) {
+				log.info("推送到老系统");
 				syncDataService.handlerPanDataToHt(orderId);
+			}
 			// 走新系统暂存单
-//			syncDataService.handlerPanDataToHtNew(orderId);
+			if (ObjectUtil.equal(sendDataProperties.getSend(), "new")) {
+				log.info("推送到新系统");
+				syncDataService.handlerPanDataToHtNew(orderId);
+			}
 		}
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/props/SendDataProperties.java

@@ -0,0 +1,23 @@
+package com.logpm.factory.props;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * FactoryProperties
+ *
+ * @author pref
+ */
+@Component
+@Data
+@ConfigurationProperties(prefix = "factory.data")
+public class SendDataProperties {
+	/**
+	 * 名称
+	 */
+	private String send = "old";
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java

@@ -0,0 +1,179 @@
+package com.logpm.factory.receiver;
+
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.logpm.factory.mt.entity.MtPushData;
+import com.logpm.factory.mt.service.IMtFactoryDataService;
+import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
+import com.logpm.factory.mt.service.IMtPushDataService;
+import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
+import com.logpm.factorydata.enums.BrandEnums;
+import com.logpm.factorydata.vo.NodePushMsg;
+import com.logpm.oldproject.feign.IAdvanceDetailClient;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
+import org.springblade.common.constant.RabbitConstant;
+import org.springblade.common.constant.WorkNodeEnums;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 卸车完成处理队列
+ */
+@Slf4j
+@RabbitListener(queues = RabbitConstant.HWY_UNLOAD_CAR_COM_INFO_QUEUE)
+@Component
+public class HwyUnloadCarComHandler {
+
+	@Autowired
+	private IAdvanceDetailClient advanceDetailClient;
+
+
+	@Autowired
+	private IMtFactoryOrderMainService mtFactoryOrderMainService;
+
+	@Autowired
+	private IMtFactoryDataService mtFactoryDataService;
+
+	@Autowired
+	private IMtPushDataService mtPushDataService;
+
+
+	@RabbitHandler
+	public void unloadCarComDataHandler(NodePushMsg nodePushMsg, Message message, Channel channel) {
+//		NodePushMsg nodePushMsg = JSONUtil.toBean(msg, NodePushMsg.class);
+		BrandEnums brand = nodePushMsg.getBrand();
+		switch (brand) {
+			case MTMM:
+				pushMentTian(nodePushMsg);
+				break;
+		}
+	}
+
+	private void pushMentTian(NodePushMsg nodePushMsg) {
+		if (!ObjectUtil.equals(WorkNodeEnums.END_WAREHOUSE_UNLOADING, nodePushMsg.getNode())) {
+			return;
+		}
+		// 根据包件获取车次
+		List<Object> content = nodePushMsg.getContent();
+		List<String> carNumList = new ArrayList<>();
+		if (CollUtil.isNotEmpty(content)) {
+			for (Object s : content) {
+				JSONObject jsonObject = JSONUtil.parseObj(s);
+				String packageCode = (String) jsonObject.get("packageCode");
+				carNumList.add(packageCode);
+			}
+		}
+
+		try {
+
+			List<MTOrderPackageRelationVO> allMtData = mtFactoryOrderMainService.mtOrderPackageRelation();
+			// 对这个集合内进行分组
+			Map<String, List<MTOrderPackageRelationVO>> stringListMap = allMtData.stream().collect(Collectors.groupingBy(MTOrderPackageRelationVO::getInvoiceOrderCode));
+			Set<String> set = stringListMap.keySet();
+			String carNum = null;
+
+			Set<String> r = new HashSet<>();
+			for (String s : set) {
+				// 得到某个工厂运输批次的集合
+				List<MTOrderPackageRelationVO> t = stringListMap.get(s);
+				//得到这个批次下面所有的包件
+				List<String> strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList());
+				// 当前批次的包件 在 这个配载计划中存在一个 则进行通知
+				for (String mtStr : carNumList) {
+					if (strs.contains(mtStr)) {
+						carNum = s;
+						break;
+					}
+				}
+				if (StringUtil.isNoneBlank(carNum)) {
+					r.add(carNum);
+				}
+			}
+
+			r.forEach(t -> {
+				sendDataCarNum(t, DateUtil.formatDateTime(nodePushMsg.getOperatorTime()));
+			});
+
+
+		} catch (Exception e) {
+			log.error("##################unloadCarComDataHandler 解析数据出错：{}", e.getMessage());
+		}
+	}
+
+	/**
+	 * 根基匹配到的发货单编号 推送梦天
+	 *
+	 * @param carNum       车次号
+	 * @param completeDate 完成时间
+	 * @throws ParseException
+	 * @throws NoSuchAlgorithmException
+	 * @throws JsonProcessingException
+	 */
+	private void sendDataCarNum(String carNum, String completeDate) {
+		log.info("##################sendDataCarNum carNum：{},completeDate{}", carNum, completeDate);
+
+		// 需要判断这个发货单编号是否推送过
+		QueryWrapper<MtPushData> lambdaQueryChainWrapper = new QueryWrapper<MtPushData>();
+		lambdaQueryChainWrapper.eq("ref_code", carNum);
+		MtPushData ms = mtPushDataService.getOne(lambdaQueryChainWrapper);
+		if (ObjectUtils.isNotNull(ms)) {
+			log.info("##################{} 车次已经推送过", carNum);
+			return;
+		}
+		try {
+
+			R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
+
+			log.info("MT 数据卸车推送 {}", r.getMsg());
+		} catch (Exception e) {
+
+
+			log.error(">>>> 梦天数据卸车推送异常", e);
+		}
+		log.info("##################{} 梦天确认签收数据推送1", carNum);
+
+	}
+
+	@Nullable
+	private List<String> getBizData(JSONObject entries) {
+		List<JSONObject> content = entries.getBeanList("content", JSONObject.class);
+		List<String> packageCodeList = null;
+		if (CollUtil.isNotEmpty(content)) {
+			// 查询这次操作的所有包件和运单号
+			packageCodeList = new ArrayList<>();
+			for (JSONObject obj : content) {
+				String packageCode = obj.getStr("packageCode");
+				if (StrUtil.isNotBlank(packageCode)) {
+					packageCodeList.add(packageCode);
+				}
+			}
+		}
+		return packageCodeList;
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java

@@ -21,13 +21,16 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.tool.api.R;
 import org.springblade.resource.feign.IOssClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -35,6 +38,7 @@ import java.util.Objects;
 
 /**
  * 志邦工厂数据推送
+ *
  * @author pref
  * @data 2023-02-21
  */
@@ -55,6 +59,7 @@ public class ZbFactoryDataController {
 
 	private final IOssClient ossClient;
 
+
 	/**
 	 * 工厂数据推送接口
 	 */
@@ -116,6 +121,12 @@ public class ZbFactoryDataController {
 		if (!Objects.isNull(orderId)) {
 			syncDataService.handlerZbDataToHt(orderId);
 		}
+		// 推送数据到新系统
+		try {
+			zbFactoryDataService.saveDataNew(zbReceiptDTO);
+		} catch (Exception e) {
+			log.error("志邦数据传新系统失败");
+		}
 		return ZbResp.success("成功");
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/IZbFactoryDataService.java

@@ -16,4 +16,6 @@ public interface IZbFactoryDataService {
 
     R handleStatusData(OrderStatusDTO orderStatusDTO);
 
+	void saveDataNew(ZBReceiptDTO zbReceiptDTO);
+
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java

@@ -17,12 +17,14 @@ import com.logpm.factory.zb.entity.ZbPackageInfoEntity;
 import com.logpm.factory.zb.entity.ZbReceiptEntity;
 import com.logpm.factory.zb.service.*;
 import com.logpm.factory.zb.untils.QmSignUntil;
+import com.logpm.factorydata.zbom.feign.IFactoryDataZbomClient;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
 import com.logpm.oldproject.feign.IAdvanceClient;
 import com.logpm.oldproject.feign.IAdvanceDetailClient;
 import com.logpm.oldproject.feign.IOrderDetailClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
@@ -46,6 +48,7 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService {
 	private final IPackageInfoService packageInfoService;
 	private final ZbFactoryProperties zbFactoryProperties;
 	private final IZbOrderLogService zbOrderLogService;
+	private final IFactoryDataZbomClient zbomClient;
 
 	@Override
 	public Long saveData(ZBReceiptDTO zbReceiptDTO) {
@@ -218,6 +221,12 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService {
 		}
 	}
 
+	@Override
+	@LogpmAsync("asyncExecutor")
+	public void saveDataNew(ZBReceiptDTO zbReceiptDTO) {
+		zbomClient.order(JSONObject.toJSONString(zbReceiptDTO));
+	}
+
 	private String getZbUrl(String url, Map<String, String> params, String sign) {
 
 		String[] keys = params.keySet().toArray(new String[0]);

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

@@ -0,0 +1,48 @@
+package com.logpm.statistics.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.dto.MerchantStatisticsDTO;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import com.logpm.statistics.service.IStatisticsWaybillInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/merchantStatistics")
+@Api(value = "商户结算控制类", tags = "珊瑚结算接口")
+public class MerchantStatisticsController {
+
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+	private final IStatisticsWaybillInfoService statisticsWaybillInfoService;
+
+	@ResponseBody
+	@PostMapping("/pageToBussesList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "运单维度对账单", notes = "传入waybillDTO")
+	public R pageToBussesList(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO) {
+		String method = "############pageToBussesList: ";
+		log.info(method+"请求参数{}",merchantStatisticsDTO);
+		try{
+
+//			IPage<TrunklineBillladingVO> pages = statisticsWaybillInfoService.pageToBussesList(merchantStatisticsDTO);
+//
+//			return R.data(pages);
+			return R.data(null);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java

@@ -0,0 +1,114 @@
+package com.logpm.statistics.listener.mq;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import com.logpm.statistics.service.IStatisticsDistributionPackageService;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.WorkNodeEnums;
+import org.springblade.common.constant.broadcast.FanoutConstants;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class PackageFanoutListener {
+
+	private final IStatisticsDistributionPackageService statisticsDistributionPackageService;
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+
+	@RabbitListener(bindings = @QueueBinding(
+		value = @Queue(name = FanoutConstants.trunkline.PACKAGNODE.QUEUE.PACKAGE_SIGN),
+		exchange = @Exchange(name = FanoutConstants.trunkline.PACKAGNODE.EXCHANGE, type = ExchangeTypes.FANOUT)
+	))
+	@Transactional(rollbackFor = Exception.class)
+	public void packageSignFanout(String msg) {
+		JSONObject jsonObject = JSONUtil.parseObj(msg);
+		Integer workNode = jsonObject.getInt("workNode");
+		if(WorkNodeEnums.SIGN_DIRECT_SHIPPER.getCode().equals(workNode)
+			|| WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode().equals(workNode)
+			|| WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode().equals(workNode)){
+
+			JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
+			List<String> orderPackageCodeList = orderPackageCodes.toList(String.class);
+
+			//如果是签收
+			List<StatisticsDistributionPackageEntity> statisticsDistributionList = statisticsDistributionPackageService.findListByOrderPackageCodes(orderPackageCodeList);
+			//修改statisticsDistributionList中所有元素的isSign为1
+			Set<Long> orderInfoSet = new HashSet<>();
+			statisticsDistributionList.forEach(statisticsDistributionPackageEntity -> {
+				statisticsDistributionPackageEntity.setIsSign(1);
+				String typeService = statisticsDistributionPackageEntity.getTypeService();
+				if("3".equals(typeService)){
+					statisticsDistributionPackageEntity.setRealDeliveryFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryDistance(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryCrossingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryLoadingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryMoveFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryServiceFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliverySortingFee(BigDecimal.ZERO);
+					statisticsDistributionPackageEntity.setRealDeliveryUpfloorFee(BigDecimal.ZERO);
+				}
+				orderInfoSet.add(statisticsDistributionPackageEntity.getOrderInfoId());
+			});
+			statisticsDistributionPackageService.updateBatchById(statisticsDistributionList);
+
+			List<StatisticsDistributionPackageEntity> statisticsList = statisticsDistributionPackageService.findListByOrderInfoSet(orderInfoSet);
+			//把statisticsList通过元素的orderInfoId进行map分组
+			Map<Long, List<StatisticsDistributionPackageEntity>> groupedStatisticsList = statisticsList.stream()
+				.collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getOrderInfoId));
+
+			List<StatisticsOrderInfoEntity> orderInfoList = statisticsOrderInfoService.findListByOrderInfoIdsSet(orderInfoSet);
+			//把orderInfoList转成以id为key的map
+			Map<Long, StatisticsOrderInfoEntity> orderInfoMap = orderInfoList.stream()
+				.collect(Collectors.toMap(StatisticsOrderInfoEntity::getId, statisticsOrderInfoEntity -> statisticsOrderInfoEntity));
+
+			List<StatisticsOrderInfoEntity> updateOrderInfoList = new ArrayList<>();
+			groupedStatisticsList.keySet().forEach(orderInfoId -> {
+				StatisticsOrderInfoEntity statisticsOrderInfoEntity = orderInfoMap.get(orderInfoId);
+				Integer signStatus = statisticsOrderInfoEntity.getSignStatus();
+				List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntities = groupedStatisticsList.get(orderInfoId);
+				int allSize = statisticsDistributionPackageEntities.size();
+
+				//过滤出statisticsDistributionPackageEntities中isSign等于0的元素
+				List<StatisticsDistributionPackageEntity> unSignStatisticsDistributionPackageEntities = statisticsDistributionPackageEntities.stream()
+					.filter(statisticsDistributionPackageEntity -> !statisticsDistributionPackageEntity.getIsSign().equals(1))
+					.collect(Collectors.toList());
+
+				int unSignSize = unSignStatisticsDistributionPackageEntities.size();
+
+				if(unSignSize == 0){
+					if(signStatus != 2){
+						statisticsOrderInfoEntity.setSignStatus(2);
+					}
+				}else{
+					if(unSignSize != allSize){
+						if(signStatus != 1){
+							statisticsOrderInfoEntity.setSignStatus(1);
+						}
+					}
+				}
+				updateOrderInfoList.add(statisticsOrderInfoEntity);
+			});
+
+			statisticsOrderInfoService.updateBatchById(updateOrderInfoList);
+
+		}
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java

@@ -3,8 +3,8 @@ package com.logpm.statistics.listener.mq;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import com.logpm.statistics.service.IStatisticsPackageInfoService;
+import com.logpm.statistics.entity.*;
+import com.logpm.statistics.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.broadcast.FanoutConstants;
@@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -25,7 +27,11 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class WaybillFanoutListener {
 
-	private final IStatisticsPackageInfoService statisticsPackageInfoService;
+	private final IStatisticsTrunklinePackageService statisticsTrunklinePackageService;
+	private final IStatisticsWarehousePackageService statisticsWarehousePackageService;
+	private final IStatisticsDistributionPackageService statisticsDistributionPackageService;
+	private final IStatisticsOrderInfoService statisticsOrderInfoService;
+	private final IStatisticsWaybillInfoService statisticsWaybillInfoService;
 
 	@RabbitListener(bindings = @QueueBinding(
 		value = @Queue(name = FanoutConstants.trunkline.OPENWAYBILL.QUEUE.STATISTICSDATA_CREATEPACKAGEINFO),
@@ -34,113 +40,216 @@ public class WaybillFanoutListener {
 	@Transactional(rollbackFor = Exception.class)
 	public void createPackageInfo(String msg) {
 
-//		if(StringUtil.isBlank(msg)){
-//			log.warn("############createPackageInfo: 接收参数为空 msg={}",msg);
-//
-//		}
-
 		JSONObject jsonObject = JSONUtil.parseObj(msg);
 		Long warehouseId = jsonObject.getLong("warehouseId");
 		String warehouseName = jsonObject.getStr("warehouseName");
 		Long waybillId = jsonObject.getLong("waybillId");
 		String waybillNo = jsonObject.getStr("waybillNo");
+		String typeService = jsonObject.getStr("typeService");//服务类型
+
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntities = new ArrayList<>();
+		List<StatisticsWarehousePackageEntity> statisticsWarehousePackageEntities = new ArrayList<>();
+		List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntities = new ArrayList<>();
 
-		List<StatisticsPackageInfoEntity> ls = new ArrayList<>();
 		JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
 		for (int i = 0; i < orderPackageCodes.size(); i++) {
 			JSONObject json = orderPackageCodes.getJSONObject(i);
-			StatisticsPackageInfoEntity statisticsPackageInfoEntity = new StatisticsPackageInfoEntity();
-			statisticsPackageInfoEntity.setWarehouseId(warehouseId);
-			statisticsPackageInfoEntity.setWarehouseName(warehouseName);
-			statisticsPackageInfoEntity.setTypeService(json.getStr("typeService"));
-			statisticsPackageInfoEntity.setWaybillId(waybillId);
-			statisticsPackageInfoEntity.setWaybillNo(waybillNo);
+
+			//干线
+			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
+			statisticsTrunklinePackageEntity.setWarehouseId(warehouseId);
+			statisticsTrunklinePackageEntity.setWarehouseName(warehouseName);
+			statisticsTrunklinePackageEntity.setTypeService(typeService);
+			statisticsTrunklinePackageEntity.setWaybillId(waybillId);
+			statisticsTrunklinePackageEntity.setWaybillNo(waybillNo);
 			Integer waybillType = json.getInt("waybillType");
 			if(waybillType.equals(1)){
-				statisticsPackageInfoEntity.setGoodsType(1);
+				statisticsTrunklinePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsTrunklinePackageEntity.setGoodsType(2);
+			}else{
+				statisticsTrunklinePackageEntity.setGoodsType(3);
+			}
+			statisticsTrunklinePackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
+			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsTrunklinePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsTrunklinePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsTrunklinePackageEntity.setOpenPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setTotalPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setRealInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setRealXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setRealDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setRealHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntity.setRealYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntities.add(statisticsTrunklinePackageEntity);
+
+			//仓库
+			StatisticsWarehousePackageEntity statisticsWarehousePackageEntity = new StatisticsWarehousePackageEntity();
+			statisticsWarehousePackageEntity.setWarehouseId(warehouseId);
+			statisticsWarehousePackageEntity.setWarehouseName(warehouseName);
+			statisticsWarehousePackageEntity.setTypeService(typeService);
+			statisticsWarehousePackageEntity.setWaybillId(waybillId);
+			statisticsWarehousePackageEntity.setWaybillNo(waybillNo);
+			if(waybillType.equals(1)){
+				statisticsWarehousePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsWarehousePackageEntity.setGoodsType(2);
+			}else{
+				statisticsWarehousePackageEntity.setGoodsType(3);
+			}
+			statisticsWarehousePackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsWarehousePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsWarehousePackageEntity.setProductName(json.getStr("productName"));
+			statisticsWarehousePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsWarehousePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsWarehousePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsWarehousePackageEntity.setWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
+			statisticsWarehousePackageEntity.setWarehouseFee(json.getBigDecimal("warehouseFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseFee(json.getBigDecimal("warehouseFee"));
+			statisticsWarehousePackageEntity.setWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
+			statisticsWarehousePackageEntity.setWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
+			statisticsWarehousePackageEntity.setWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
+			statisticsWarehousePackageEntity.setRealWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
+			statisticsWarehousePackageEntities.add(statisticsWarehousePackageEntity);
+
+
+			//配送
+			StatisticsDistributionPackageEntity statisticsDistributionPackageEntity = new StatisticsDistributionPackageEntity();
+			statisticsDistributionPackageEntity.setWarehouseId(warehouseId);
+			statisticsDistributionPackageEntity.setWarehouseName(warehouseName);
+			statisticsDistributionPackageEntity.setTypeService(typeService);
+			statisticsDistributionPackageEntity.setWaybillId(waybillId);
+			statisticsDistributionPackageEntity.setWaybillNo(waybillNo);
+			if(waybillType.equals(1)){
+				statisticsDistributionPackageEntity.setGoodsType(1);
 			}else if (waybillType.equals(2)){
-				statisticsPackageInfoEntity.setGoodsType(2);
+				statisticsDistributionPackageEntity.setGoodsType(2);
 			}else{
-				statisticsPackageInfoEntity.setGoodsType(3);
+				statisticsDistributionPackageEntity.setGoodsType(3);
+			}
+			statisticsDistributionPackageEntity.setOrderCode(json.getStr("orderCode"));
+			statisticsDistributionPackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsDistributionPackageEntity.setProductName(json.getStr("productName"));
+			statisticsDistributionPackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsDistributionPackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsDistributionPackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsDistributionPackageEntity.setDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
+			statisticsDistributionPackageEntity.setDeliveryFee(json.getBigDecimal("deliveryFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryFee(json.getBigDecimal("deliveryFee"));
+			statisticsDistributionPackageEntity.setDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
+			statisticsDistributionPackageEntity.setDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
+			statisticsDistributionPackageEntity.setRealDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
+			statisticsDistributionPackageEntity.setDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
+			statisticsDistributionPackageEntity.setDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
+			statisticsDistributionPackageEntity.setDeliveryDistance(json.getBigDecimal("deliveryDistance"));
+			statisticsDistributionPackageEntity.setRealDeliveryDistance(json.getBigDecimal("deliveryDistance"));
+			statisticsDistributionPackageEntity.setDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
+			statisticsDistributionPackageEntity.setRealDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
+			statisticsDistributionPackageEntities.add(statisticsDistributionPackageEntity);
+
 		}
-			statisticsPackageInfoEntity.setOrderCode(json.getStr("orderCode"));
-			statisticsPackageInfoEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
-			statisticsPackageInfoEntity.setProductName(json.getStr("productName"));
-			statisticsPackageInfoEntity.setTotalNum(json.getInt("totalNum"));
-			statisticsPackageInfoEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
-			statisticsPackageInfoEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
-			statisticsPackageInfoEntity.setOpenPrice(json.getBigDecimal("openPrice"));
-			statisticsPackageInfoEntity.setTotalPrice(json.getBigDecimal("openPrice"));
-			statisticsPackageInfoEntity.setPickupFee(json.getBigDecimal("pickupFee"));
-			statisticsPackageInfoEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
-			statisticsPackageInfoEntity.setFreightFee(json.getBigDecimal("freightFee"));
-			statisticsPackageInfoEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
-			statisticsPackageInfoEntity.setWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
-			statisticsPackageInfoEntity.setRealWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
-			statisticsPackageInfoEntity.setWarehouseFee(json.getBigDecimal("warehouseFee"));
-			statisticsPackageInfoEntity.setRealWarehouseFee(json.getBigDecimal("warehouseFee"));
-			statisticsPackageInfoEntity.setWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
-			statisticsPackageInfoEntity.setRealWarehouseManageFee(json.getBigDecimal("warehouseManageFee"));
-			statisticsPackageInfoEntity.setWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
-			statisticsPackageInfoEntity.setRealWarehouseSortingFee(json.getBigDecimal("warehouseSortingFee"));
-			statisticsPackageInfoEntity.setWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
-			statisticsPackageInfoEntity.setRealWarehouseOperatingFee(json.getBigDecimal("warehouseOperatingFee"));
-			statisticsPackageInfoEntity.setDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
-			statisticsPackageInfoEntity.setRealDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));
-			statisticsPackageInfoEntity.setDeliveryFee(json.getBigDecimal("deliveryFee"));
-			statisticsPackageInfoEntity.setRealDeliveryFee(json.getBigDecimal("deliveryFee"));
-			statisticsPackageInfoEntity.setDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
-			statisticsPackageInfoEntity.setRealDeliveryLoadingFee(json.getBigDecimal("deliveryLoadingFee"));
-			statisticsPackageInfoEntity.setDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
-			statisticsPackageInfoEntity.setRealDeliverySortingFee(json.getBigDecimal("deliverySortingFee"));
-			statisticsPackageInfoEntity.setDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
-			statisticsPackageInfoEntity.setRealDeliveryUpfloorFee(json.getBigDecimal("deliveryUpfloorFee"));
-			statisticsPackageInfoEntity.setDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
-			statisticsPackageInfoEntity.setRealDeliveryMoveFee(json.getBigDecimal("deliveryMoveFee"));
-			statisticsPackageInfoEntity.setDeliveryDistance(json.getBigDecimal("deliveryDistance"));
-			statisticsPackageInfoEntity.setRealDeliveryDistance(json.getBigDecimal("deliveryDistance"));
-			statisticsPackageInfoEntity.setDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
-			statisticsPackageInfoEntity.setRealDeliveryCrossingFee(json.getBigDecimal("deliveryCrossingFee"));
-			statisticsPackageInfoEntity.setInstallFee(json.getBigDecimal("installFee"));
-			statisticsPackageInfoEntity.setRealInstallFee(json.getBigDecimal("installFee"));
-			statisticsPackageInfoEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
-			statisticsPackageInfoEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
-			statisticsPackageInfoEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
-			statisticsPackageInfoEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
-			statisticsPackageInfoEntity.setOtherFee(json.getBigDecimal("otherFee"));
-			statisticsPackageInfoEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
-			statisticsPackageInfoEntity.setReturnFee(json.getBigDecimal("returnFee"));
-			statisticsPackageInfoEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
-			statisticsPackageInfoEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
-			statisticsPackageInfoEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
-			statisticsPackageInfoEntity.setXPay(json.getBigDecimal("xPay"));
-			statisticsPackageInfoEntity.setRealXPay(json.getBigDecimal("xPay"));
-			statisticsPackageInfoEntity.setDPay(json.getBigDecimal("dPay"));
-			statisticsPackageInfoEntity.setRealDPay(json.getBigDecimal("dPay"));
-			statisticsPackageInfoEntity.setHPay(json.getBigDecimal("hPay"));
-			statisticsPackageInfoEntity.setRealHPay(json.getBigDecimal("hPay"));
-			statisticsPackageInfoEntity.setYPay(json.getBigDecimal("yPay"));
-			statisticsPackageInfoEntity.setRealYPay(json.getBigDecimal("yPay"));
-			statisticsPackageInfoEntity.setIsAftersales(0);
-			statisticsPackageInfoEntity.setHasStatement(0);
-			ls.add(statisticsPackageInfoEntity);
+
+		Long waybillInfoId = null;
+		//生成运单维度
+		if(!"2".equals(typeService)){
+			StatisticsWaybillInfoEntity statisticsWaybillInfoEntity = new StatisticsWaybillInfoEntity();
+			statisticsWaybillInfoEntity.setWaybillNo(waybillNo);
+			statisticsWaybillInfoEntity.setWaybillId(waybillId);
+			statisticsWaybillInfoEntity.setTypeService(typeService);
+			statisticsWaybillInfoEntity.setConfirmStatisticsOrder(0);
+			statisticsWaybillInfoService.save(statisticsWaybillInfoEntity);
+			waybillInfoId = statisticsWaybillInfoEntity.getId();
 		}
-		statisticsPackageInfoService.saveBatch(ls);
 
 
-		//把ls通过typeService=2过滤为一个新的list
-		List<StatisticsPackageInfoEntity> shipeiList = ls.stream().filter(item -> item.getTypeService().equals("2")).collect(Collectors.toList());
-		//toC维度
+		//把statisticsPackageInfoEntities的orderCode作为key进行分组
+		Map<String, List<StatisticsTrunklinePackageEntity>> trunklineMap = statisticsTrunklinePackageEntities.stream().collect(Collectors.groupingBy(StatisticsTrunklinePackageEntity::getOrderCode));
+		Map<String, List<StatisticsWarehousePackageEntity>> warehouseMap = statisticsWarehousePackageEntities.stream().collect(Collectors.groupingBy(StatisticsWarehousePackageEntity::getOrderCode));
+		Map<String, List<StatisticsDistributionPackageEntity>> distributionMap = statisticsDistributionPackageEntities.stream().collect(Collectors.groupingBy(StatisticsDistributionPackageEntity::getOrderCode));
+		List<StatisticsOrderInfoEntity> orderInfoEntities = new ArrayList<>();
+		Long finalWaybillInfoId = waybillInfoId;
+		trunklineMap.keySet().forEach(key -> {
 
+			StatisticsOrderInfoEntity statisticsOrderInfoEntity = new StatisticsOrderInfoEntity();
+			statisticsOrderInfoEntity.setWaybillId(waybillId);
+			statisticsOrderInfoEntity.setWaybillNo(waybillNo);
+			statisticsOrderInfoEntity.setOrderCode(key);
+			statisticsOrderInfoEntity.setTypeService(typeService);
+			if(!Objects.isNull(finalWaybillInfoId)){
+				statisticsOrderInfoEntity.setWaybillInfoId(finalWaybillInfoId);
+			}
 
+//			statisticsOrderInfoEntity.setConfirmStatus(0);
+			orderInfoEntities.add(statisticsOrderInfoEntity);
+		});
 
+		statisticsOrderInfoService.saveBatch(orderInfoEntities);
 
-		List<StatisticsPackageInfoEntity> otherList = ls.stream().filter(item -> !item.getTypeService().equals("2")).collect(Collectors.toList());
-		//toB维度
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageSaveList = new ArrayList<>();
+		List<StatisticsWarehousePackageEntity> statisticsWarehousePackageSaveList = new ArrayList<>();
+		List<StatisticsDistributionPackageEntity> statisticsDistributionPackageSaveList = new ArrayList<>();
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntityList= trunklineMap.get(orderCode);
+			statisticsTrunklinePackageEntityList.forEach(statisticsTrunklinePackageEntity -> {
+				statisticsTrunklinePackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsTrunklinePackageSaveList.addAll(statisticsTrunklinePackageEntityList);
+		});
+		statisticsTrunklinePackageService.saveBatch(statisticsTrunklinePackageSaveList);
 
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsWarehousePackageEntity> statisticsWarehousePackageEntityList= warehouseMap.get(orderCode);
+			statisticsWarehousePackageEntityList.forEach(statisticsWarehousePackageEntity -> {
+				statisticsWarehousePackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsWarehousePackageSaveList.addAll(statisticsWarehousePackageEntityList);
+		});
 
+		statisticsWarehousePackageService.saveBatch(statisticsWarehousePackageSaveList);
 
+		orderInfoEntities.forEach(statisticsOrderInfoEntity -> {
+			String orderCode = statisticsOrderInfoEntity.getOrderCode();
+			Long orderInfoId = statisticsOrderInfoEntity.getId();
+			List<StatisticsDistributionPackageEntity> statisticsDistributionPackageEntityList= distributionMap.get(orderCode);
+			statisticsDistributionPackageEntityList.forEach(statisticsDistributionPackageEntity -> {
+				statisticsDistributionPackageEntity.setOrderInfoId(orderInfoId);
+			});
+			statisticsDistributionPackageSaveList.addAll(statisticsDistributionPackageEntityList);
+		});
 
+		statisticsDistributionPackageService.saveBatch(statisticsDistributionPackageSaveList);
 
 
 		log.info("处理完成：{}", msg);
@@ -155,6 +264,84 @@ public class WaybillFanoutListener {
 	@Transactional(rollbackFor = Exception.class)
 	public void updateWaybillData(String msg) {
 		log.info("接收到消息：{}", msg);
+
+		JSONObject jsonObject = JSONUtil.parseObj(msg);
+		Long warehouseId = jsonObject.getLong("warehouseId");
+		String warehouseName = jsonObject.getStr("warehouseName");
+		Long waybillId = jsonObject.getLong("waybillId");
+		String waybillNo = jsonObject.getStr("waybillNo");
+		String typeService = jsonObject.getStr("typeService");//服务类型
+
+		statisticsTrunklinePackageService.deleteListByWaybillId(waybillId);
+
+		List<StatisticsOrderInfoEntity> orderInfoEntities = statisticsOrderInfoService.findListByWaybillId(waybillId);
+		//把orderInfoEntities以orderCode未key,元素本身为value转成Map
+		Map<String, StatisticsOrderInfoEntity> orderInfoMap = orderInfoEntities.stream()
+			.collect(Collectors.toMap(
+				StatisticsOrderInfoEntity::getOrderCode,
+				entity -> entity
+			));
+		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntities = new ArrayList<>();
+
+		JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
+		for (int i = 0; i < orderPackageCodes.size(); i++) {
+			JSONObject json = orderPackageCodes.getJSONObject(i);
+
+			//干线
+			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
+			statisticsTrunklinePackageEntity.setWarehouseId(warehouseId);
+			statisticsTrunklinePackageEntity.setWarehouseName(warehouseName);
+			statisticsTrunklinePackageEntity.setTypeService(typeService);
+			statisticsTrunklinePackageEntity.setWaybillId(waybillId);
+			statisticsTrunklinePackageEntity.setWaybillNo(waybillNo);
+			Integer waybillType = json.getInt("waybillType");
+			if(waybillType.equals(1)){
+				statisticsTrunklinePackageEntity.setGoodsType(1);
+			}else if (waybillType.equals(2)){
+				statisticsTrunklinePackageEntity.setGoodsType(2);
+			}else{
+				statisticsTrunklinePackageEntity.setGoodsType(3);
+			}
+			String orderCode = json.getStr("orderCode");
+			StatisticsOrderInfoEntity statisticsOrderInfoEntity = orderInfoMap.get(orderCode);
+			statisticsTrunklinePackageEntity.setOrderInfoId(statisticsOrderInfoEntity.getId());
+			statisticsTrunklinePackageEntity.setOrderCode(orderCode);
+			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
+			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
+			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
+			statisticsTrunklinePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
+			statisticsTrunklinePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsTrunklinePackageEntity.setOpenPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setTotalPrice(json.getBigDecimal("openPrice"));
+			statisticsTrunklinePackageEntity.setPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setRealPickupFee(json.getBigDecimal("pickupFee"));
+			statisticsTrunklinePackageEntity.setFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setRealFreightFee(json.getBigDecimal("freightFee"));
+			statisticsTrunklinePackageEntity.setInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setRealInstallFee(json.getBigDecimal("installFee"));
+			statisticsTrunklinePackageEntity.setQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setRealQuotationFee(json.getBigDecimal("quotationFee"));
+			statisticsTrunklinePackageEntity.setClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setRealClaimingValue(json.getBigDecimal("claimingValue"));
+			statisticsTrunklinePackageEntity.setOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setRealOtherFee(json.getBigDecimal("otherFee"));
+			statisticsTrunklinePackageEntity.setReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setRealReturnFee(json.getBigDecimal("returnFee"));
+			statisticsTrunklinePackageEntity.setThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setRealThirdOprationFee(json.getBigDecimal("thirdOprationFee"));
+			statisticsTrunklinePackageEntity.setXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setRealXPay(json.getBigDecimal("xPay"));
+			statisticsTrunklinePackageEntity.setDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setRealDPay(json.getBigDecimal("dPay"));
+			statisticsTrunklinePackageEntity.setHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setRealHPay(json.getBigDecimal("hPay"));
+			statisticsTrunklinePackageEntity.setYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntity.setRealYPay(json.getBigDecimal("yPay"));
+			statisticsTrunklinePackageEntities.add(statisticsTrunklinePackageEntity);
+
+		}
+		statisticsTrunklinePackageService.saveBatch(statisticsTrunklinePackageEntities);
+
 	}
 
 

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

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsDistributionPackageMapper extends BaseMapper<StatisticsDistributionPackageEntity> {
+}

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

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsOrderInfoMapper extends BaseMapper<StatisticsOrderInfoEntity> {
+}

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

@@ -1,9 +0,0 @@
-package com.logpm.statistics.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface StatisticsPackageInfoMapper extends BaseMapper<StatisticsPackageInfoEntity> {
-}

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.logpm.statistics.mapper.StatisticsPackageInfoMapper">
-
-
-</mapper>

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

@@ -0,0 +1,11 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface StatisticsTrunklinePackageMapper extends BaseMapper<StatisticsTrunklinePackageEntity> {
+	void deleteListByWaybillId(@Param("waybillId") Long waybillId);
+}

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.StatisticsTrunklinePackageMapper">
+
+    <delete id="deleteListByWaybillId" >
+        delete from logpm_statistics_trunkline_package
+        where waybill_id = #{waybillId}
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsWarehousePackageMapper extends BaseMapper<StatisticsWarehousePackageEntity> {
+}

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

@@ -0,0 +1,9 @@
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StatisticsWaybillInfoMapper extends BaseMapper<StatisticsWaybillInfoEntity> {
+}

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

@@ -0,0 +1,13 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Set;
+
+public interface IStatisticsDistributionPackageService extends BaseService<StatisticsDistributionPackageEntity> {
+    List<StatisticsDistributionPackageEntity> findListByOrderPackageCodes(List<String> orderPackageCodeList);
+
+	List<StatisticsDistributionPackageEntity> findListByOrderInfoSet(Set<Long> orderInfoSet);
+}

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

@@ -0,0 +1,13 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+import java.util.Set;
+
+public interface IStatisticsOrderInfoService extends BaseService<StatisticsOrderInfoEntity> {
+    List<StatisticsOrderInfoEntity> findListByWaybillId(Long waybillId);
+
+    List<StatisticsOrderInfoEntity> findListByOrderInfoIdsSet(Set<Long> orderInfoSet);
+}

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

@@ -1,7 +0,0 @@
-package com.logpm.statistics.service;
-
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import org.springblade.core.mp.base.BaseService;
-
-public interface IStatisticsPackageInfoService extends BaseService<StatisticsPackageInfoEntity> {
-}

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

@@ -0,0 +1,8 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsTrunklinePackageService extends BaseService<StatisticsTrunklinePackageEntity> {
+	void deleteListByWaybillId(Long waybillId);
+}

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

@@ -0,0 +1,7 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsWarehousePackageService extends BaseService<StatisticsWarehousePackageEntity> {
+}

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

@@ -0,0 +1,7 @@
+package com.logpm.statistics.service;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IStatisticsWaybillInfoService extends BaseService<StatisticsWaybillInfoEntity> {
+}

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

@@ -0,0 +1,34 @@
+package com.logpm.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.statistics.entity.StatisticsDistributionPackageEntity;
+import com.logpm.statistics.mapper.StatisticsDistributionPackageMapper;
+import com.logpm.statistics.service.IStatisticsDistributionPackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsDistributionPackageServiceImpl extends BaseServiceImpl<StatisticsDistributionPackageMapper,StatisticsDistributionPackageEntity> implements IStatisticsDistributionPackageService {
+	@Override
+	public List<StatisticsDistributionPackageEntity> findListByOrderPackageCodes(List<String> orderPackageCodeList) {
+		QueryWrapper<StatisticsDistributionPackageEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("order_package_code", orderPackageCodeList);
+
+		return baseMapper.selectList(queryWrapper);
+	}
+
+	@Override
+	public List<StatisticsDistributionPackageEntity> findListByOrderInfoSet(Set<Long> orderInfoSet) {
+		QueryWrapper<StatisticsDistributionPackageEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("order_info_id", orderInfoSet);
+
+		return baseMapper.selectList(queryWrapper);
+	}
+}

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

@@ -0,0 +1,32 @@
+package com.logpm.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
+import com.logpm.statistics.mapper.StatisticsOrderInfoMapper;
+import com.logpm.statistics.service.IStatisticsOrderInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOrderInfoMapper, StatisticsOrderInfoEntity> implements IStatisticsOrderInfoService {
+	@Override
+	public List<StatisticsOrderInfoEntity> findListByWaybillId(Long waybillId) {
+		QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("waybill_id",waybillId);
+		return baseMapper.selectList(queryWrapper);
+	}
+
+	@Override
+	public List<StatisticsOrderInfoEntity> findListByOrderInfoIdsSet(Set<Long> orderInfoSet) {
+		QueryWrapper<StatisticsOrderInfoEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("id",orderInfoSet);
+		return baseMapper.selectList(queryWrapper);
+	}
+}

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

@@ -1,15 +0,0 @@
-package com.logpm.statistics.service.impl;
-
-import com.logpm.statistics.entity.StatisticsPackageInfoEntity;
-import com.logpm.statistics.mapper.StatisticsPackageInfoMapper;
-import com.logpm.statistics.service.IStatisticsPackageInfoService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-@Slf4j
-public class StatisticsPackageInfoServiceImpl extends BaseServiceImpl<StatisticsPackageInfoMapper, StatisticsPackageInfoEntity> implements IStatisticsPackageInfoService {
-}

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

@@ -0,0 +1,19 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsTrunklinePackageEntity;
+import com.logpm.statistics.mapper.StatisticsTrunklinePackageMapper;
+import com.logpm.statistics.service.IStatisticsTrunklinePackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class StatisticsTrunklinePackageServiceImpl extends BaseServiceImpl<StatisticsTrunklinePackageMapper, StatisticsTrunklinePackageEntity> implements IStatisticsTrunklinePackageService {
+	@Override
+	public void deleteListByWaybillId(Long waybillId) {
+		baseMapper.deleteListByWaybillId(waybillId);
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsWarehousePackageEntity;
+import com.logpm.statistics.mapper.StatisticsWarehousePackageMapper;
+import com.logpm.statistics.service.IStatisticsWarehousePackageService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsWarehousePackageServiceImpl extends BaseServiceImpl<StatisticsWarehousePackageMapper,StatisticsWarehousePackageEntity> implements IStatisticsWarehousePackageService {
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.StatisticsWaybillInfoEntity;
+import com.logpm.statistics.mapper.StatisticsWaybillInfoMapper;
+import com.logpm.statistics.service.IStatisticsWaybillInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class StatisticsWaybillInfoServiceImpl extends BaseServiceImpl<StatisticsWaybillInfoMapper, StatisticsWaybillInfoEntity> implements IStatisticsWaybillInfoService {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Mapper
@@ -55,7 +56,7 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
      * @return 返回一个List<String>类型的集合，包含与输入订单包裹代码相匹配的包裹编码。
      *         如果没有找到匹配的包裹编码，则返回一个空集合。
      */
-    List<String> findPackageCodeByCodes(@Param("orderPackageCodes") Set<String> orderPackageCodes);
+    List<Map<String, String>> findPackageCodeByCodes(@Param("orderPackageCodes") Set<String> orderPackageCodes);
 
     IPage<OrderDetailInfoVO> findOrderDetails(IPage<Object> page, @Param("param") OrderDetailsDTO orderDetailsDTO);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -198,8 +198,8 @@
         and package_status = #{packageStatus}
         and is_deleted = 0
     </select>
-    <select id="findPackageCodeByCodes" resultType="java.lang.String">
-        select t.order_package_code from logpm_trunkline_advance_detail t
+    <select id="findPackageCodeByCodes" resultType="java.util.Map">
+        select t.order_package_code code,t.id id from logpm_trunkline_advance_detail t
         where exists(
         select 1 from (
         <foreach collection="orderPackageCodes" index="ind" item="item">
@@ -358,7 +358,8 @@
     </select>
 
     <select id="findAdvanceDetailVoByAdvanceIds" resultType="com.logpm.trunkline.vo.TrunklineAdvanceDetailVO">
-        select IFNULL(lbc.name,'其他') goodsName,
+        select lbc.id goodsId,
+               IFNULL(lbc.name,'其他') goodsName,
                ltad.*
         from logpm_trunkline_advance_detail ltad
         left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -773,7 +773,7 @@
         select ltcls.*,
                ltco.sign_order_id signOrderId
         from logpm_trunkline_cars_load_scan ltcls
-        left join logpm_trunkline_cars_order ltco on ltco.waybill_id = ltcls.waybill_id and ltco.order_code = ltcls.order_code and ltcls.node_id = ltco.warehouse_id
+        left join logpm_trunkline_cars_order ltco on ltco.waybill_id = ltcls.waybill_id and ltco.order_code = ltcls.order_code and ltcls.warehouse_id = ltco.warehouse_id
         where ltcls.scan_status = '1'
         and ltcls.id in
         <foreach collection="carsLoadScanIds" item="item" separator="," open="(" close=")">

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceOrderListener.java

@@ -1,6 +1,7 @@
 package com.logpm.trunkline.mq;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,6 +10,9 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.feign.IDistributionParcelListClient;
+import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
@@ -29,8 +33,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -48,6 +54,8 @@ public class AdvanceOrderListener {
 	private final ITrunklineAdvanceDetailService advanceDetailService;
 	private final ITrunklineDetailProductService detailProductService;
 	private final ITrunklineCarsLoadService trunklineCarsLoadService;
+	private final IDistributionStockArticleClient stockArticleClient;
+	private final IDistributionParcelListClient parcelListClient;
 
 	@RabbitListener(bindings = @QueueBinding(
 		value = @Queue(name = FactoryDataConstants.Mq.Queues.ADVANCE_ORDER),
@@ -76,7 +84,7 @@ public class AdvanceOrderListener {
 				TrunklineAdvanceEntity entity = advanceEntities.get(0);
 				if (ObjectUtil.isNotEmpty(entity)) {
 					advanceEntity.setId(entity.getId());
-					advanceEntity.setTrainNumber(entity.getTrainNumber() + advanceEntity.getTotalNum());
+//					advanceEntity.setTotalNum(entity.getTotalNum() + advanceEntity.getTotalNum());
 				}
 			}
 			Set<String> packageCodeSet = new HashSet<>();
@@ -99,9 +107,9 @@ public class AdvanceOrderListener {
 				});
 				// 查询数据库，校验订单包件编码是否重复
 				if (CollUtil.isNotEmpty(orderPackageCodes)) {
-					List<String> codes = advanceDetailService.findPackageCodeByCodes(orderPackageCodes);
-					if (CollUtil.isNotEmpty(codes)) {
-						packageCodeSet.addAll(codes);
+					Map<String, String> packageCodeByCodes = advanceDetailService.findPackageCodeByCodes(orderPackageCodes);
+					if (CollUtil.isNotEmpty(packageCodeByCodes)) {
+						packageCodeSet.addAll(packageCodeByCodes.keySet());
 					}
 				}
 			}
@@ -172,4 +180,192 @@ public class AdvanceOrderListener {
 		}
 	}
 
+	@RabbitListener(bindings = @QueueBinding(
+		value = @Queue(name = FactoryDataConstants.Mq.Queues.ADVANCE_ORDER_OUPAI),
+		exchange = @Exchange(name = FactoryDataConstants.Mq.Exchanges.ADVANCE_ORDER_OUPAI, type = ExchangeTypes.TOPIC),
+		key = FactoryDataConstants.Mq.RoutingKeys.ADVANCE_ORDER
+	))
+	@Transactional(rollbackFor = Exception.class)
+	public void advanceOrderOuPai(String msg) {
+		// 新增暂存单
+		if (StrUtil.isNotBlank(msg)) {
+			log.info("收到欧派工厂数据暂存单消息：{}", msg);
+			JSONObject entries = JSONUtil.parseObj(msg);
+			JSONArray details = entries.getJSONArray("details");
+			TrunklineAdvanceEntity advanceEntity = JSONUtil.toBean(entries, TrunklineAdvanceEntity.class);
+			LambdaQueryWrapper<TrunklineAdvanceEntity> eq = Wrappers.<TrunklineAdvanceEntity>lambdaQuery()
+				.eq(TrunklineAdvanceEntity::getOrderCode, advanceEntity.getOrderCode());
+			if (StrUtil.isNotEmpty(advanceEntity.getTrainNumber())) {
+				eq.eq(TrunklineAdvanceEntity::getTrainNumber, advanceEntity.getTrainNumber());
+			}
+			// 暂存单 订单自编号 + 车次号 唯一
+			List<TrunklineAdvanceEntity> advanceEntities = advanceService.list(eq);
+
+			// 暂存单存在 并且未开单 则将新数据添加到原来的暂存单上
+			// 如果已开单则新增暂存单
+			// 订单 修改最终客户信息
+			if (CollUtil.isNotEmpty(advanceEntities)) {
+				TrunklineAdvanceEntity entity = advanceEntities.get(0);
+				if (ObjectUtil.isNotEmpty(entity)) {
+					// 如果存在则只修改客户信息
+					if (StrUtil.isNotEmpty(advanceEntity.getCustomerName())) {
+						entity.setCustomerName(advanceEntity.getCustomerName());
+					}
+					if (StrUtil.isNotEmpty(advanceEntity.getCustomerAddress())) {
+						entity.setCustomerAddress(advanceEntity.getCustomerAddress());
+					}
+					if (StrUtil.isNotEmpty(advanceEntity.getCustomerPhone())) {
+						entity.setCustomerPhone(advanceEntity.getCustomerPhone());
+					}
+					advanceService.updateById(entity);
+					// 修改在库订单信息 未预约的数据 reservation_status = 10 才更新
+					if (ObjectUtil.isAllNotEmpty(entity.getOrderCode(), advanceEntity.getCustomerName(), advanceEntity.getCustomerAddress(), advanceEntity.getCustomerPhone())) {
+						try {
+							JSONObject jsonObject = new JSONObject();
+							jsonObject.set("orderCode", entity.getOrderCode());
+							jsonObject.set("customerName", advanceEntity.getCustomerName());
+							jsonObject.set("customerAddress", advanceEntity.getCustomerAddress());
+							jsonObject.set("customerPhone", advanceEntity.getCustomerPhone());
+							stockArticleClient.updateCustomerAllByOrderCode(JSONUtil.toJsonStr(jsonObject));
+						} catch (Exception e) {
+							log.error("更新在库订单失败");
+						}
+					}
+				}
+			}
+			if (ObjectUtil.isNotNull(advanceEntity)) {
+				String orderCode = advanceEntity.getOrderCode();
+				if (StrUtil.isNotEmpty(orderCode) && orderCode.contains("遗")) {
+					advanceEntity.setLegacyStatus("1");
+				}
+				// 暂存单不存在则新增，暂存单存在则将暂存单明细往原暂存单中添加
+				if (ObjectUtil.isEmpty(advanceEntity.getId())) {
+					advanceService.save(advanceEntity);
+				}
+			}
+			Map<String, String> packageCodeMap = new HashMap<>();
+			Map<String, Set<String>> parcelListMap = new HashMap<>();
+			if (CollUtil.isNotEmpty(details)) {
+				// 使用HashSet代替ArrayList以优化内存使用和检查重复值
+				Set<String> orderPackageCodes = new HashSet<>();
+				details.forEach(detail -> {
+					try {
+						// 更具描述性的变量命名
+						JSONObject jsonObject = JSONUtil.parseObj(detail);
+						TrunklineAdvanceDetailEntity entity = JSONUtil.toBean(jsonObject, TrunklineAdvanceDetailEntity.class);
+						// 检查转换后的实体不为null，且其orderPackageCode非null
+						if (!ObjectUtil.isAllEmpty(entity, entity.getOrderPackageCode())) {
+							orderPackageCodes.add(entity.getOrderPackageCode());
+						}
+					} catch (Exception e) {
+						// 异常处理，可根据实际情况记录日志或进行其他处理
+						log.error("暂存单转换时发生异常: " + detail + "，异常：" + e.getMessage());
+					}
+				});
+				// 查询数据库，校验订单包件编码是否重复
+				if (CollUtil.isNotEmpty(orderPackageCodes)) {
+					packageCodeMap = advanceDetailService.findPackageCodeByCodes(orderPackageCodes);
+					try {
+						if(CollUtil.isNotEmpty(packageCodeMap)){
+							parcelListMap = parcelListClient.findPackageCodeByCodes(packageCodeMap.keySet());
+						}
+					}catch (Exception e){
+						log.error("查询包件表失败");
+					}
+				}
+			}
+
+			// 包件 修改 品类信息 物料名称
+			if (ObjectUtil.isNotEmpty(advanceEntity) && CollUtil.isNotEmpty(details)) {
+				List<TrunklineAdvanceDetailEntity> advanceDetailEntityList = new ArrayList<>();
+				List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>();
+				List<TrunklineDetailProductEntity> detailProductEntityList = new ArrayList<>();
+				Set<String> productCodes = new HashSet<>();
+				for (Object detailObj : details) {
+					JSONObject detail = JSONUtil.parseObj(detailObj);
+					TrunklineAdvanceDetailEntity advanceDetailEntity = JSONUtil.toBean(detail, TrunklineAdvanceDetailEntity.class);
+					if (ObjectUtil.isNotNull(advanceDetailEntity)) {
+						if (CollUtil.isNotEmpty(packageCodeMap) && StrUtil.isNotEmpty(advanceDetailEntity.getOrderPackageCode())
+							&& packageCodeMap.containsKey(advanceDetailEntity.getOrderPackageCode())) {
+							if(!ObjectUtil.isAllEmpty(advanceDetailEntity.getFirstPackName(),advanceDetailEntity.getSecondPackName(),
+								advanceDetailEntity.getThirdPackName(),advanceDetailEntity.getMaterialName())){
+								TrunklineAdvanceDetailEntity updatedetailEntity = new TrunklineAdvanceDetailEntity();
+								updatedetailEntity.setId(Convert.toLong(packageCodeMap.get(advanceDetailEntity.getOrderPackageCode())));
+								updatedetailEntity.setFirstPackName(advanceDetailEntity.getFirstPackName());
+								updatedetailEntity.setFirstPackCode(advanceDetailEntity.getFirstPackCode());
+								updatedetailEntity.setSecondPackName(advanceDetailEntity.getSecondPackName());
+								updatedetailEntity.setSecondPackCode(advanceDetailEntity.getSecondPackCode());
+								updatedetailEntity.setThirdPackName(advanceDetailEntity.getThirdPackName());
+								updatedetailEntity.setThirdPackCode(advanceDetailEntity.getThirdPackCode());
+								updatedetailEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+								updatedetailEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
+								advanceDetailEntityList.add(updatedetailEntity);
+							}
+							if(CollUtil.isNotEmpty(parcelListMap) && parcelListMap.containsKey(advanceDetailEntity.getOrderPackageCode())){
+								Set<String> strings = parcelListMap.get(advanceDetailEntity.getOrderPackageCode());
+								for (String string : strings) {
+									DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+									parcelListEntity.setId(Convert.toLong(string));
+									parcelListEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+									parcelListEntity.setSecond(advanceDetailEntity.getSecondPackName());
+									parcelListEntity.setThirdProduct(advanceDetailEntity.getThirdPackName());
+									parcelListEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+									parcelListEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
+									parcelListEntityList.add(parcelListEntity);
+								}
+
+							}
+						} else {
+							advanceDetailEntity.setAdvanceId(advanceEntity.getId());
+							// 设置发货时间为当前时间
+							if (StrUtil.isEmpty(advanceDetailEntity.getSendDateStr())) {
+								advanceDetailEntity.setSendDateStr(DateUtil.today());
+							}
+							advanceDetailEntityList.add(advanceDetailEntity);
+						}
+
+						JSONArray items = detail.getJSONArray("items");
+						if (CollUtil.isNotEmpty(items)) {
+							for (Object itemObj : items) {
+								JSONObject item = JSONUtil.parseObj(itemObj);
+								TrunklineDetailProductEntity detailProductEntity = JSONUtil.toBean(item, TrunklineDetailProductEntity.class);
+								if (ObjectUtil.isNotNull(detailProductEntity)) {
+									productCodes.add(detailProductEntity.getProductCode());
+									detailProductEntityList.add(detailProductEntity);
+								}
+							}
+						}
+					}
+
+				}
+				if(CollUtil.isNotEmpty(parcelListEntityList)){
+					parcelListClient.saveorUpdateBatchByOP(parcelListEntityList);
+				}
+				if(CollUtil.isNotEmpty(advanceDetailEntityList)){
+					advanceDetailService.saveOrUpdateBatch(advanceDetailEntityList);
+				}
+				//发送入库包件处理无数据装车数据
+				trunklineCarsLoadService.sendRabbitMessageLoadScanData(JSONUtil.toJsonStr(advanceEntity));
+				if(CollUtil.isNotEmpty(detailProductEntityList)){
+					if(ObjectUtil.isAllNotEmpty(packageCodeMap,productCodes)){
+						List<TrunklineDetailProductEntity> list = detailProductService.list(Wrappers.<TrunklineDetailProductEntity>lambdaQuery()
+							.in(TrunklineDetailProductEntity::getUnitNo, packageCodeMap.keySet())
+							.in(TrunklineDetailProductEntity::getProductCode, productCodes)
+						);
+						if(CollUtil.isNotEmpty(list)){
+							for (TrunklineDetailProductEntity productEntity : detailProductEntityList) {
+								for (TrunklineDetailProductEntity detailProductEntity : list) {
+									if(ObjectUtil.equal(productEntity.getProductCode(),detailProductEntity.getProductCode())){
+										productEntity.setId(detailProductEntity.getId());
+									}
+								}
+							}
+						}
+					}
+					detailProductService.saveOrUpdateBatch(detailProductEntityList);
+				}
+			}
+		}
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java

@@ -24,4 +24,6 @@ public interface IOpenOrderAsyncService {
 	void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity);
 
     void sendOpenWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details, List<Long> advanceIds);
+
+    void sendUpdateWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details, List<Long> advanceIds);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IPackageTrackLogAsyncService.java

@@ -9,4 +9,7 @@ public interface IPackageTrackLogAsyncService {
 	void addPackageTrackLog(String tenantId, Long userId, Long deptId, String nickName, List<String> orderPackageCodes, Long warehouseId, String warehouseName, Integer workNode, String content);
 
 	void addBatchPackageTrackLog(List<WarehousePackageTrackLogEntity> addPackageTrackLogList, List<String> orderPackageCodes, Integer code);
+
+    void sendPackageWorkNodeFanout(List<String> orderPackageCodes,Integer workNodeV);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@@ -69,7 +69,7 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
 	 * @return 返回一个List<String>类型的列表，包含与输入的订单包裹代码相匹配的所有包裹编码。
 	 * 如果没有找到匹配的包裹编码，则返回空列表。
 	 */
-	List<String> findPackageCodeByCodes(Set<String> orderPackageCodes);
+	Map<String,String> findPackageCodeByCodes(Set<String> orderPackageCodes);
 
 	R findOrderDetails(OrderDetailsDTO orderDetailsDTO);
 

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

@@ -1,16 +1,25 @@
 package com.logpm.trunkline.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.factorydata.enums.BrandEnums;
+import com.logpm.factorydata.util.FactoryDataMessageSender;
+import com.logpm.factorydata.vo.NodePushMsg;
+import com.logpm.factorydata.vo.PushData;
 import com.logpm.trunkline.bean.Resp;
 import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.dto.OrderStatusDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
-import com.logpm.trunkline.service.*;
+import com.logpm.trunkline.service.IInComingService;
+import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
+import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
+import com.logpm.trunkline.service.ITrunklineAdvanceService;
+import com.logpm.trunkline.service.ITrunklineBillladingPackageServicie;
 import com.logpm.trunkline.vo.TrunklineAdvanceVO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
@@ -26,7 +35,13 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -41,6 +56,7 @@ public class InComingServiceImpl implements IInComingService {
 	private final IPackageTrackLogAsyncService packageTrackLogAsyncService;
 	//	private final DynamicDataSourceProvider dynamicDataSourceProvider;
 	private final RabbitTemplate rabbitTemplate;
+	private final FactoryDataMessageSender factoryDataMessageSender;
 
 
 	@Override
@@ -145,6 +161,16 @@ public class InComingServiceImpl implements IInComingService {
 					Map<String, Object> map = new HashMap<>();
 					map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 					rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+
+					NodePushMsg nodePushMsg = NodePushMsg.builder()
+						.operator(AuthUtil.getNickName())
+						.operatorTime(new Date())
+						.address("在【"+ warehouseName +"】入库")
+						.brand(BrandEnums.getByValue(advanceDetailEntity.getBrand()))
+						.node(WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY)
+						.content(Arrays.asList(PushData.builder().packageCode(packageCode).build()))
+						.build();
+					factoryDataMessageSender.sendNodeDataByBrand(nodePushMsg);
 				} catch (Exception e) {
 					log.error("入库推送失败：{}", e);
 				}
@@ -215,6 +241,20 @@ public class InComingServiceImpl implements IInComingService {
 			//存入日志
 			packageTrackLogAsyncService.addPackageTrackLog(tenantId, userId, deptId, nickName, orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType));
 			total = total + detailList.size();
+			if(CollUtil.isNotEmpty(detailList)){
+				for (TrunklineAdvanceDetailEntity advanceDetailEntity : detailList) {
+					NodePushMsg nodePushMsg = NodePushMsg.builder()
+						.operator(AuthUtil.getNickName())
+						.operatorTime(new Date())
+						.address("在【"+ warehouseName +"】入库")
+						.brand(BrandEnums.getByValue(advanceDetailEntity.getBrand()))
+						.node(WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY)
+						.content(Arrays.asList(PushData.builder().packageCode(advanceDetailEntity.getOrderPackageCode()).build()))
+						.build();
+					factoryDataMessageSender.sendNodeDataByBrand(nodePushMsg);
+				}
+			}
+
 		}
 
 //		DynamicDataSourceContextHolder.clear();

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

@@ -328,7 +328,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		jsonObject.put("waybillNo",waybillNo);
 		jsonObject.put("waybillType",waybillType);
 		Long consigneeId = waybillEntity.getConsigneeId();
-		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(consigneeId);
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
 		if(Objects.isNull(basicdataClientEntity)){
 			jsonObject.put("typeService","1");
 		}else{
@@ -387,14 +387,16 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 			List<JSONObject> jsonList = new ArrayList<>();
 			list.forEach(advanceDetailVO -> {
 				JSONObject json = new JSONObject();
+				String goodsName = advanceDetailVO.getGoodsName();
 				BigDecimal openPrice = BigDecimal.ZERO;
 				json.put("orderPackageCode",advanceDetailVO.getOrderPackageCode());
 				json.put("orderCode",advanceDetailVO.getOrderCode());
-				json.put("productName",advanceDetailVO.getFirstPackName());
+				json.put("productId",advanceDetailVO.getGoodsId());
+				json.put("productName",goodsName);
 				json.put("totalNum",advanceDetailVO.getQuantity());
 				json.put("totalWeight",advanceDetailVO.getWeight());
 				json.put("totalVolume",advanceDetailVO.getVolume());
-				String goodsName = advanceDetailVO.getGoodsName();
+
 				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
 				if(!Objects.isNull(warehouseWayBillDetail)){
 					Integer num = warehouseWayBillDetail.getNum();
@@ -537,4 +539,234 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		sendFanoutService.sendFanoutMsg(build);
 
 	}
+
+
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void sendUpdateWaybillFanout(WarehouseWaybillEntity waybillEntity, List<WarehouseWayBillDetail> details,List<Long> advanceIds) {
+
+		Integer waybillType = waybillEntity.getWaybillType();
+		String waybillNo = waybillEntity.getWaybillNo();
+
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("warehouseId",waybillEntity.getDepartureWarehouseId());
+		jsonObject.put("warehouseName",waybillEntity.getDepartureWarehouseName());
+		jsonObject.put("waybillId",waybillEntity.getId());
+		jsonObject.put("waybillNo",waybillNo);
+		jsonObject.put("waybillType",waybillType);
+		Long consigneeId = waybillEntity.getConsigneeId();
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
+		if(Objects.isNull(basicdataClientEntity)){
+			jsonObject.put("typeService","1");
+		}else{
+			BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
+			if(Objects.isNull(storeBusinessEntity)){
+				jsonObject.put("typeService","1");
+			}else{
+				jsonObject.put("typeService",storeBusinessEntity.getMold());
+			}
+		}
+
+
+		Integer totalCount = waybillEntity.getTotalCount();
+		BigDecimal pickupFee = waybillEntity.getPickupFee();
+		BigDecimal pickupPrice = pickupFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal installFee = waybillEntity.getInstallFee();
+		BigDecimal installPrice = installFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal insuranceFee = waybillEntity.getInsuranceFee();
+		BigDecimal insurancePrice = insuranceFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal claimingValue = waybillEntity.getClaimingValue();
+		BigDecimal claimingPrice = claimingValue.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal otherFee = waybillEntity.getOtherFee();
+		BigDecimal otherPrice = otherFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal rebate = waybillEntity.getRebate();
+		BigDecimal rebatePrice = rebate.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal thirdOperationFee = waybillEntity.getThirdOperationFee();
+		BigDecimal thirdOperationPrice = thirdOperationFee.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal xPay = waybillEntity.getXPay();
+		BigDecimal xPayPrice = xPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal dPay = waybillEntity.getDPay();
+		BigDecimal dPayPrice = dPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal hPay = waybillEntity.getHPay();
+		BigDecimal hPayPrice = hPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+		BigDecimal yPay = waybillEntity.getYPay();
+		BigDecimal yPayPrice = yPay.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP);
+
+		//把details转化成不分组以productName为key的map
+		Map<String, WarehouseWayBillDetail> detailsMap = details.stream()
+			.collect(Collectors.toMap(WarehouseWayBillDetail::getProductName, detail -> detail, (a, b) -> a));
+
+		if(waybillType.equals(1)){
+			//订制品
+			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findAdvanceDetailVoByAdvanceIds(advanceIds);
+			//把list按goodsName分组，并统计一个count，转成一个map
+//			Map<String, Integer> countMap = list.stream()
+//				.collect(Collectors.toMap(TrunklineAdvanceDetailVO::getGoodsName, TrunklineAdvanceDetailVO::getQuantity, Integer::sum));
+//			countMap.keySet().forEach(goodsName -> {
+//				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
+//
+//
+//
+//			});
+
+
+
+			List<JSONObject> jsonList = new ArrayList<>();
+			list.forEach(advanceDetailVO -> {
+				JSONObject json = new JSONObject();
+				String goodsName = advanceDetailVO.getGoodsName();
+				BigDecimal openPrice = BigDecimal.ZERO;
+				json.put("orderPackageCode",advanceDetailVO.getOrderPackageCode());
+				json.put("orderCode",advanceDetailVO.getOrderCode());
+				json.put("productId",advanceDetailVO.getGoodsId());
+				json.put("productName",goodsName);
+				json.put("totalNum",advanceDetailVO.getQuantity());
+				json.put("totalWeight",advanceDetailVO.getWeight());
+				json.put("totalVolume",advanceDetailVO.getVolume());
+
+				WarehouseWayBillDetail warehouseWayBillDetail = detailsMap.get(goodsName);
+				if(!Objects.isNull(warehouseWayBillDetail)){
+					Integer num = warehouseWayBillDetail.getNum();
+					if(num > 0){
+						json.put("freightFee",warehouseWayBillDetail.getPrice());
+						openPrice = openPrice.add(warehouseWayBillDetail.getPrice());
+						json.put("deliveryFee",warehouseWayBillDetail.getDeliveryPrice());
+						json.put("deliveryServiceFee",warehouseWayBillDetail.getDeliveryPrice());
+						openPrice = openPrice.add(warehouseWayBillDetail.getDeliveryPrice());
+						warehouseWayBillDetail.setNum(num-1);
+						detailsMap.put(goodsName,warehouseWayBillDetail);
+					}
+				}
+				json.put("warehouseServiceFee",BigDecimal.ZERO);
+				json.put("warehouseFee",BigDecimal.ZERO);
+				json.put("warehouseManageFee",BigDecimal.ZERO);
+				json.put("warehouseSortingFee",BigDecimal.ZERO);
+				json.put("warehouseOperatingFee",BigDecimal.ZERO);
+				json.put("pickupFee",pickupPrice);
+				openPrice = openPrice.add(pickupPrice);
+				json.put("deliveryLoadingFee",BigDecimal.ZERO);
+				json.put("deliverySortingFee",BigDecimal.ZERO);
+				json.put("deliveryUpfloorFee",BigDecimal.ZERO);
+				json.put("deliveryMoveFee",BigDecimal.ZERO);
+				json.put("deliveryDistance",BigDecimal.ZERO);
+				json.put("deliveryCrossingFee",BigDecimal.ZERO);
+				json.put("installFee",installPrice);
+				json.put("quotationFee",insurancePrice);
+				json.put("claimingValue",claimingPrice);
+				json.put("otherFee",otherPrice);
+				json.put("returnFee",rebatePrice);
+				json.put("thirdOprationFee",thirdOperationPrice);
+				json.put("xPay",xPayPrice);
+				json.put("dPay",dPayPrice);
+				json.put("hPay",hPayPrice);
+				json.put("yPay",yPayPrice);
+				openPrice = openPrice.add(installPrice).add(insurancePrice).add(claimingPrice).add(otherPrice).add(rebatePrice).add(thirdOperationPrice).add(xPayPrice).add(dPayPrice).add(hPayPrice).add(yPayPrice);
+				json.put("openPrice",openPrice);
+				jsonList.add(json);
+			});
+
+
+			AtomicInteger atomicOtherNum = new AtomicInteger();
+			List<BigDecimal> otherTotalPriceList = new ArrayList<>();
+			List<BigDecimal> otherTotalDeliveryPriceList = new ArrayList<>();
+			detailsMap.values().forEach(warehouseWayBillDetail -> {
+				if (warehouseWayBillDetail != null && warehouseWayBillDetail.getNum() > 0) {
+					Integer num = warehouseWayBillDetail.getNum();
+					atomicOtherNum.addAndGet(num);
+
+					// 使用 BigDecimal 的 add 方法来正确累加总价，确保精度
+					otherTotalPriceList.add(warehouseWayBillDetail.getPrice().multiply(new BigDecimal(num)));
+					otherTotalDeliveryPriceList.add(warehouseWayBillDetail.getDeliveryPrice().multiply(new BigDecimal(num)));
+				}
+			});
+
+			int otherNum = atomicOtherNum.get();
+			//otherTotalPriceList元素求和
+			BigDecimal otherTotalPrice = otherTotalPriceList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal p = otherTotalPrice.divide(new BigDecimal(otherNum), 2, RoundingMode.HALF_UP);
+			BigDecimal otherTotalDeliveryPrice = otherTotalDeliveryPriceList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal dp = otherTotalDeliveryPrice.divide(new BigDecimal(otherNum), 2, RoundingMode.HALF_UP);
+
+			jsonList.forEach(json -> {
+				BigDecimal op = json.getBigDecimal("openPrice");
+				BigDecimal freightFee = json.getBigDecimal("freightFee");
+				if(Objects.isNull(freightFee)){
+					json.put("freightFee",p);
+					op = op.add(p);
+				}
+				BigDecimal deliveryFee = json.getBigDecimal("deliveryFee");
+				if(Objects.isNull(deliveryFee)){
+					json.put("deliveryFee",dp);
+					json.put("deliveryServiceFee",dp);
+					op = op.add(dp);
+				}
+				json.put("openPrice",op);
+			});
+			jsonObject.put("orderPackageCodes",jsonList);
+
+		}else if(waybillType.equals(2)){
+			//零担
+			List<JSONObject> jsonList = new ArrayList<>();
+			details.forEach(detail -> {
+				Integer num = detail.getNum();
+				JSONObject json = new JSONObject();
+				BigDecimal openPrice = BigDecimal.ZERO;
+				json.put("orderPackageCode",detail.getProductName());
+				json.put("orderCode",waybillNo);
+				json.put("productName",detail.getProductName());
+				json.put("totalNum",num);
+				json.put("totalWeight",detail.getWeight());
+				json.put("totalVolume",detail.getVolume());
+				json.put("freightFee",detail.getSubtotalFreight());
+				openPrice = openPrice.add(detail.getSubtotalFreight());
+				json.put("deliveryFee",detail.getSubtotalDeliveryFee());
+				openPrice = openPrice.add(detail.getSubtotalDeliveryFee());
+				json.put("warehouseServiceFee",BigDecimal.ZERO);
+				json.put("warehouseFee",BigDecimal.ZERO);
+				json.put("warehouseManageFee",BigDecimal.ZERO);
+				json.put("warehouseSortingFee",BigDecimal.ZERO);
+				json.put("warehouseOperatingFee",BigDecimal.ZERO);
+				json.put("pickupFee",pickupPrice.multiply(new BigDecimal(num)));
+				openPrice = openPrice.add(pickupPrice.multiply(new BigDecimal(num)));
+				json.put("deliveryLoadingFee",BigDecimal.ZERO);
+				json.put("deliverySortingFee",BigDecimal.ZERO);
+				json.put("deliveryUpfloorFee",BigDecimal.ZERO);
+				json.put("deliveryMoveFee",BigDecimal.ZERO);
+				json.put("deliveryDistance",BigDecimal.ZERO);
+				json.put("deliveryCrossingFee",BigDecimal.ZERO);
+				json.put("installFee",installPrice);
+				openPrice = openPrice.add(installPrice.multiply(new BigDecimal(num)));
+				json.put("quotationFee",insurancePrice);
+				openPrice = openPrice.add(insurancePrice.multiply(new BigDecimal(num)));
+				json.put("claimingValue",claimingPrice);
+				openPrice = openPrice.add(claimingPrice.multiply(new BigDecimal(num)));
+				json.put("otherFee",otherPrice);
+				openPrice = openPrice.add(otherPrice.multiply(new BigDecimal(num)));
+				json.put("returnFee",rebatePrice);
+				openPrice = openPrice.add(rebatePrice.multiply(new BigDecimal(num)));
+				json.put("thirdOprationFee",thirdOperationPrice);
+				openPrice = openPrice.add(thirdOperationPrice.multiply(new BigDecimal(num)));
+				json.put("xPay",xPayPrice);
+				openPrice = openPrice.add(xPayPrice.multiply(new BigDecimal(num)));
+				json.put("dPay",dPayPrice);
+				openPrice = openPrice.add(dPayPrice.multiply(new BigDecimal(num)));
+				json.put("hPay",hPayPrice);
+				openPrice = openPrice.add(hPayPrice.multiply(new BigDecimal(num)));
+				json.put("yPay",yPayPrice);
+				openPrice = openPrice.add(yPayPrice.multiply(new BigDecimal(num)));
+				json.put("openPrice",openPrice);
+				jsonList.add(json);
+			});
+			jsonObject.put("orderPackageCodes",jsonList);
+		}
+
+		FanoutMsg build = FanoutMsg.builder().msg(jsonObject.toJSONString())
+			.exchange(FanoutConstants.trunkline.UPDATEWAYBILL.EXCHANGE).build();
+
+		sendFanoutService.sendFanoutMsg(build);
+
+	}
+
+
+
 }

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

@@ -633,7 +633,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		carsLoadService.sendRabbitMessageOpenOrder(advanceIds, waybillId);
 
 		//发布开单广播
-//		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, advanceIds);
+		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, advanceIds);
 
 		Map<String,Object> map = new HashMap<>();
 		map.put("waybillId",waybillId);
@@ -843,7 +843,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		trunklineWaybillOrderService.save(trunklineWaybillOrderEntity);
 
 		//发布开单广播
-//		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, null);
+		openOrderAsyncService.sendOpenWaybillFanout(waybillEntity, details, null);
 
 		Map<String,Object> map = new HashMap<>();
 		map.put("waybillId",waybillId);
@@ -2078,7 +2078,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405, "运单已作废");
 		}
 
-
 		String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);
 
 		warehouseWaybillClient.updateEntity(waybillEntity);
@@ -2087,6 +2086,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//异步存入日志
 		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
 
+
+		List<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
+
+		List<Long> waybillIds = new ArrayList<>();
+		waybillIds.add(waybillId);
+		List<Long> advanceIds = trunklineWaybillOrderService.findAdvanceIdsByWaybillIds(waybillIds);
+
+		openOrderAsyncService.sendUpdateWaybillFanout(waybillEntity,wayBillDetailList,advanceIds);
+
 		return R.success("改单成功");
 	}
 

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

@@ -1,13 +1,16 @@
 package com.logpm.trunkline.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
+import com.logpm.trunkline.service.ISendFanoutService;
 import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
 import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
 import com.logpm.warehouse.feign.IWarehousePackageTrackLogClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.annotations.LogpmAsync;
-import org.springframework.scheduling.annotation.Async;
+import org.springblade.common.constant.broadcast.FanoutConstants;
+import org.springblade.common.model.FanoutMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -21,6 +24,7 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer
 
 	private final IWarehousePackageTrackLogClient warehousePackageTrackLogClient;
 	private final ITrunklineWaybillPackageService waybillPackageService;
+	private final ISendFanoutService sendFanoutService;
 
 	@LogpmAsync("asyncExecutor")
 	@Override
@@ -58,5 +62,18 @@ public class PackageTrackLogAsyncServiceImpl implements IPackageTrackLogAsyncSer
 		waybillPackageService.updatePackageStatus(orderPackageCodes, workNode);
 	}
 
+	@LogpmAsync("asyncExecutor")
+	@Override
+	public void sendPackageWorkNodeFanout(List<String> orderPackageCodes,Integer workNode) {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("orderPackageCodes",orderPackageCodes);
+		jsonObject.put("workNode",workNode);
+
+		FanoutMsg build = FanoutMsg.builder().msg(jsonObject.toJSONString())
+			.exchange(FanoutConstants.trunkline.PACKAGNODE.EXCHANGE).build();
+
+		sendFanoutService.sendFanoutMsg(build);
+	}
+
 }