From dac0292ac86423cb062a3a4f4c6f5d41dfe7b013 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 10 May 2024 19:56:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=A2=A6=E5=A4=A9?=
 =?UTF-8?q?=E7=9A=AE=E9=9B=85=E7=BD=97=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factorydata/FactoryDataConstants.java     |   2 +-
 .../distribution/vo/SignforPageCountVO.java   |  25 ++++
 .../feign/ITrunklineWaybillOrderClient.java   |   4 +
 .../DistributionSignforController.java        |  13 ++
 .../mapper/DistributionSignforMapper.java     |   4 +-
 .../mapper/DistributionSignforMapper.xml      | 132 +++++++++++++++---
 .../service/IDistributionSignforService.java  |   1 +
 .../impl/DistributionSignforServiceImpl.java  |  24 +++-
 .../src/main/resources/application.yml        |   2 +-
 .../pan/service/IPanFactoryDataService.java   |   2 +
 .../impl/PanFactoryDataServiceImpl.java       | 102 +++++++++++++-
 .../receiver/HwyOrderStatusHandler.java       |  42 +-----
 .../logpm/oldproject/mapper/AdvanceMapper.xml |   1 +
 .../config/RabbitMqConfiguration.java         |  18 ---
 .../ITrunklineWaybillOrderService.java        |   1 +
 15 files changed, 290 insertions(+), 83 deletions(-)
 create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/SignforPageCountVO.java

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java
index d73575d69..43b273aad 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java
@@ -15,7 +15,7 @@ public abstract class FactoryDataConstants {
 		/**
 		 * 如果不需要 ""
 		 */
-		String DEVAUTH = "";
+		String DEVAUTH = ".pref";
 
 		/**
 		 * 定义交换机
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/SignforPageCountVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/SignforPageCountVO.java
new file mode 100644
index 000000000..585ee974e
--- /dev/null
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/SignforPageCountVO.java
@@ -0,0 +1,25 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+public class SignforPageCountVO {
+
+	/**
+	 * 总件数
+	 */
+	private Long totalNumber;
+
+	/**
+	 * 装车件数
+	 */
+	private Long loadedNumber;
+
+
+	/**
+	 * 签收件数
+	 */
+	private Long signeeNumber;
+
+}
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java
index 2d3f997f3..1aacd6391 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java
@@ -1,6 +1,7 @@
 package com.logpm.trunkline.feign;
 
 import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,4 +23,7 @@ public interface ITrunklineWaybillOrderClient {
 
 	@PostMapping(API_PREFIX+"/addEntityReturnId")
 	Long addEntityReturnId(@RequestBody TrunklineWaybillOrderEntity trunklineWaybillOrderEntity);
+
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index 5d61351d8..232f66fa6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -194,6 +194,19 @@ public class DistributionSignforController extends BladeController {
 
 
 
+	/**
+	 * 签收管理 列表数据查询
+	 */
+	@GetMapping("/pageCount")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "条件", notes = "传入distributionSignfor")
+	public R<SignforPageCountVO> pageCount(DistributionSignforVO distributionSignfor, Query query) {
+		SignforPageCountVO selectDistributionSignforPageCount= distributionSignforService.selectDistributionSignforPageCount(distributionSignfor);
+		return R.data(selectDistributionSignforPageCount);
+	}
+
+
+
 
 	/**
 	 * 商场签收管理 自定义分页
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index b70116412..6885b85d2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -353,8 +353,10 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 
 	/**
 	 * 查询需要推送老系统的签收信息
-	 * @param warehouseIds
+	 * @param
 	 * @return
 	 */
 	List<PushNotificationDTO> pushNotification(@Param("warehouseIds") List<Long> id,@Param("reservationCodes")List<String> reservationCodes);
+
+	SignforPageCountVO selectDistributionSignforPageCount(@Param("param") DistributionSignforVO distributionSignfor);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 258cb7054..43b6fc729 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -263,28 +263,12 @@
 <!--            </if>-->
 <!--        </where>-->
 <!--    </select> -->
+
+
+
+
     <select id="selectDistributionSignforPage" resultType="com.logpm.distribution.vo.DistributionSignforVO">
-<!--&#45;&#45;         SELECT
-&#45;&#45;         lds.id id,
-&#45;&#45;         lds.shopping_name shoppingName,
-&#45;&#45;         lds.stock_article_id stockArticleId,
-&#45;&#45;         lds.consignee consignee,
-&#45;&#45;         lds.delivery_type deliveryType,
-&#45;&#45;         lds.delivery_time deliveryTime,
-&#45;&#45;         lds.order_source orderSource,
-&#45;&#45;         lds.train_number trainNumber,
-&#45;&#45;         lds.delivery_phone deliveryPhone,
-&#45;&#45;         lds.delivery_driver_name  deliveryDriverName,
-&#45;&#45;         lds.delivery_address deliveryAddress,
-&#45;&#45;         lds.sjsigning_time sjsigningTime,
-&#45;&#45;         lds.signing_time signingTime,
-&#45;&#45;         lds.delivery_sign_pictures deliverySignPictures,
-&#45;&#45;         lds.reservation_num reservationNum,
-&#45;&#45;         lds.driver_signing driverSigning,
-&#45;&#45;         (SELECT sum(ldl.package_nub) from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id and ldl.scan_status !=1)  loadedNumber,
-&#45;&#45;         COALESCE((SELECT sum(ldl.received_quantity) from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id and lds.driver_signing ='2'), 0)     receivedQuantity
-&#45;&#45;         FROM
-&#45;&#45;         logpm_distribution_signfor lds-->
+
         SELECT
         lds.id id,
         lds.signee_name signeeName,
@@ -1367,6 +1351,112 @@
     <select id="selectByReservationId" resultType="com.logpm.distribution.entity.DistributionSignforEntity">
         SELECT * FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
     </select>
+    <select id="selectDistributionSignforPageCount" resultType="com.logpm.distribution.vo.SignforPageCountVO">
+        SELECT
+        sum(lds.received_quantity+receivedin_quantity) signeeNumber,
+        sum(ldr.reservation_num + ldr.reservation_stock_list_num) totalNumber,
+        sum(lds.loaded_number+lds.loadedin_number) loadedNumber
+        FROM
+        logpm_distribution_signfor lds
+        JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+
+        <where>
+            lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 AND lddl.customers_number > 0
+
+            <if test="param.mallName != null and param.mallName!=''">
+                and ldr.mall_name like concat('%',#{param.mallName},'%')
+            </if>
+
+            <if test="param.ids != null" >and lds.id in
+                <foreach collection="param.ids" separator="," close=")" open="(" item="a" >
+                    #{a}
+                </foreach>
+            </if>
+            <if test="param.warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList)">
+                and ldr.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.storeName != null and param.storeName!=''">
+                and ldr.store_name like concat('%',#{param.storeName},'%')
+            </if>
+            <if test="param.reservationCode != null and param.reservationCode!=''">
+                and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
+            </if>
+            <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
+            </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+            <if test="param.deliveryTime!=null and param.deliveryTime!=''">
+                and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
+            </if>
+            <if test="param.signingTime!=null and param.signingTime!=''">
+                and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
+            </if>
+            <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
+                and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
+            </if>
+            <if test="param.createTime_query!=null and param.createTime_query!=''">
+                and date_format(lds.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+            </if>
+            <if test="param.stockArticleId != null and param.stockArticleId!=''">
+                and ldr.stock_article_id like concat('%',#{param.stockArticleId},'%')
+            </if>
+            <if test="param.consignee != null and param.consignee!=''">
+                and ldr.consignee like concat('%',#{param.consignee},'%')
+            </if>
+            <if test="param.deliveryType != null and param.deliveryType!=''">
+                and ldr.delivery_type = #{param.deliveryType}
+            </if>
+            <if test="param.deliveryPhone != null and param.deliveryPhone!=''">
+                and  ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%')
+            </if>
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
+            <if test="param.deliveryAddress != null and param.deliveryAddress!=''">
+                and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
+            </if>
+            <if test="param.driverSigning != null and param.driverSigning!=''">
+                and lds.driver_signing = #{param.driverSigning}
+            </if>
+            <if test="param.signingStatus != null and param.signingStatus!=''">
+                and lds.signing_status = #{param.signingStatus}
+            </if>
+            <if test="param.taskTime != null and param.taskTime!=''">
+                and  date_format(lddl.task_time,'%Y-%m-%d') = #{param.taskTime}
+            </if>
+            <if test="param.signLoadingDate != null and param.signLoadingDate!=''">
+                and  date_format(lddl.loading_time,'%Y-%m-%d') = #{param.signLoadingDate}
+            </if>
+            <if test="param.taskTimeSection != null and param.taskTimeSection!=''">
+                and lddl.task_time between #{param.taskTimeSection[0]} and #{param.taskTimeSection[1]}
+            </if>
+            <if test="param.loadingTimeSection != null and param.loadingTimeSection!=''">
+                and lddl.loading_time between #{param.loadingTimeSection[0]} and #{param.loadingTimeSection[1]}
+            </if>
+            <if test="param.signeeName != null and param.signeeName!=''">
+                and lds.signee_name like concat('%',#{param.signeeName},'%')
+            </if>
+            <if test="param.sjsigningTimeSection != null and param.sjsigningTimeSection!=''">
+                and lds.sjsigning_time between #{param.sjsigningTimeSection[0]} and #{param.sjsigningTimeSection[1]}
+            </if>
+            <if test="param.signingTimeSection != null and param.signingTimeSection!=''">
+                and lds.signing_time between #{param.signingTimeSection[0]} and #{param.signingTimeSection[1]}
+            </if>
+
+            <if test="param.clientIds != null">
+                and ldr.mall_id in
+                <foreach collection="param.clientIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
     <select id="getByReservationIds" resultType="java.util.Map">
         SELECT
         ldr.reservation_code AS reservationCode,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index 8eb773113..c9b27ddf3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -342,4 +342,5 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 */
     void push0ldSystemSignInfo(Long signingId);
 
+    SignforPageCountVO selectDistributionSignforPageCount( DistributionSignforVO distributionSignfor);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index d8a6c9872..0ba1ec97d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -5110,7 +5110,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 					}
 				}
-				distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName());
+			//	distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName());
 				packageIds.add(parcelListEntity.getId());
 				orderCodes.add(parcelListEntity.getOrderCode());
 				packageCodes.add(parcelListEntity.getOrderPackageCode());
@@ -6159,5 +6159,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 
 
+	}
+
+	@Override
+	public SignforPageCountVO selectDistributionSignforPageCount(DistributionSignforVO distributionSignfor) {
+
+//转换创建时间
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
+		if (null != distributionSignfor.getCreateTime()) {
+			distributionSignfor.setCreateTime_query(sdf.format(distributionSignfor.getCreateTime()));
+		}
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		//取出id
+		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		distributionSignfor.setWarehouseIdList(collect);
+		SignforPageCountVO selectDistributionSignforPageCount= baseMapper.selectDistributionSignforPageCount(distributionSignfor);
+
+
+		return selectDistributionSignforPageCount;
+
+
+
 	}
 }
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml
index 9d3376900..77f3f06b4 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml
@@ -39,4 +39,4 @@ xxl:
       ip: 127.0.0.1
       logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
       logretentiondays: -1
-      port: 17018
+      port: 17019
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/IPanFactoryDataService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/IPanFactoryDataService.java
index 7a24a6fa3..a924c595a 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/IPanFactoryDataService.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/IPanFactoryDataService.java
@@ -16,6 +16,8 @@ public interface IPanFactoryDataService {
 
 	R handleStatusData(OrderStatusDTO orderStatusDTO);
 
+	R hwyHandleStatusData(OrderStatusDTO orderStatusDTO);
+
 	void handleDataToPlatform(String unitNo,String operationTime);
 
 	Long saveData(PanFactoryOrderDTO factoryOrderDTO);
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index fa1cf68ae..dd9b57ea6 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -82,7 +82,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	private final IPanPackageListService packageListService;
 
 	private final PanFactoryProperties panFactoryProperties;
-	private final IOrderStatusLogService panOrderStatusLogService;
 	private final IPanPackageInfoService panPackageInfoService;
 	private final IAdvanceDetailClient advanceDetailClient;
 	private final IWarehouseClient warehouseClient;
@@ -116,7 +115,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient;
 	private final IBasicdataCategoryClient categoryClient;
 
-	private final IOrderCountClient orderCountClient;
+
 	private final BladeRedis redis;
 	private final IRegionFeign regionFeign;
 
@@ -263,9 +262,104 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		orderStatusDTO.setPlantId(plantId);
 		orderStatusDTO.setCurrentWarehouse(currentWarehouse);
 		orderStatusDTO.setDestinationWarehouse(supplyData.get("destinationWarehouse"));
-//		orderStatusDTO.setDestinationWarehouse("南充市");
 		orderStatusDTO.setLogiBillNo(supplyData.get("logiBillNo"));
-//		orderStatusDTO.setLogiBillNo("GZ23060001");
+
+		//修改状态映射
+		orderStatusDTO.setStatus(statusName(orderStatusDTO.getStatus()));
+
+
+		//判断数据是都已存在
+		if (!orderStatusDTO.verifyData()) {
+			log.info("#############handleStatusData: 数据不齐全 orderStatusDTO={}", orderStatusDTO);
+			return Resp.fail(405, "数据不齐全");
+		}
+
+		//拼接参数
+		Map<String, Object> map = new HashMap<>();
+		map.put("payload", JSONObject.toJSONString(orderStatusDTO));
+
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		String s = gson.toJson(map);
+
+		//先获取token
+		String panToken = getPanToken();
+
+		//请求参数
+		log.info("##############handleStatusData: 推送包件状态请求参数 {}", s);
+		//处理逻辑
+		String result = HttpRequest.post(panFactoryProperties.getUrl() + "/hitf/v1/rest/invoke?namespace=HZERO&serverCode=OPEN&interfaceCode=HUITONG_RECEIVE")
+			.header("Authorization", "Bearer " + panToken)
+			.header("Content-Type", "application/json")
+			.body(s).timeout(5 * 1000)
+			.execute().body();
+
+		log.info("##############handleStatusData: 推送包件状态返回参数 {}", result);
+
+		//把结果字符串转为json对象
+		JSONObject jsonObject = JSONObject.parseObject(result);
+		JSONObject payload = jsonObject.getJSONObject("payload");
+		if (!Objects.isNull(payload)) {
+			Integer code = payload.getInteger("code");
+			String message = payload.getString("data");
+			if (code.equals(1)) {
+				log.info("##########handleStatusData: 物流状态传递成功");
+			} else {
+				return Resp.fail(405, message);
+			}
+		} else {
+			return Resp.fail(405, "返回格式有误：" + result);
+		}
+		return Resp.success("SUCCESS");
+	}
+
+
+	/**
+	 * {
+	 *   "payload": "{\"currentWarehouse\":\"广州仓\",
+	 *   \"destinationWarehouse\":\"乐山仓\",
+	 *   \"dispatchNumber\":\"GZGX240510020\",
+	 *   \"distributionContactId\":\"0\",
+	 *   \"logiBillNo\":\"1121813\",
+	 *   \"operationTime\":\"2024-05-10 17:18:40\",
+	 *   \"orderNo\":\"2090032404005LCZ\",
+	 *   \"plantId\":\"3610\",
+	 *   \"status\":\"装车\",
+	 *   \"unitNo\":\"PBBB240427000440\",
+	 *   \"username\":\"朱梓敏\"}"
+	 * @param orderStatusDTO
+	 * @return
+	 */
+	@Override
+	public R hwyHandleStatusData(OrderStatusDTO orderStatusDTO) {
+		String status = orderStatusDTO.getStatus();
+		if ("1".equals(status) || "2".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) {
+			log.info("#############handleStatusData: 当前数据的状态不推送 status={}", status);
+			return Resp.fail(400, "当前数据的状态不推送");
+		}
+
+		//通过包件码查询是否是要推送的订单
+		String unitNo = orderStatusDTO.getUnitNo();//包件码
+		String currentWarehouse = orderStatusDTO.getCurrentWarehouse();
+		QueryWrapper<PanPackageInfo> packageInfoQueryWrapper = new QueryWrapper<>();
+		packageInfoQueryWrapper.eq("unit_no", unitNo);
+		PanPackageInfo one = panPackageInfoService.getOne(packageInfoQueryWrapper);
+		if (Objects.isNull(one)) {
+			log.info("#############handleStatusData: 当前包条码未找到对应数据unitNo={}", unitNo);
+			return Resp.fail(400, "未找到包件数据");
+		}
+		WarehouseWaybillEntity waybillEntityByOrderPackageCode = warehouseWaybillClient.findWaybillEntityByOrderPackageCode(unitNo);
+		String plantId = one.getPlantId();
+
+		//根据仓库ID查询仓库名字
+		currentWarehouse = warehouseClient.selectNameById(Integer.parseInt(currentWarehouse));
+		if (ObjectUtil.isEmpty(currentWarehouse)) {
+			log.info("#############handleStatusData: 数据不齐全 orderStatusDTO={}", orderStatusDTO);
+			return Resp.fail(405, "数据不齐全");
+		}
+		orderStatusDTO.setPlantId(plantId);
+		orderStatusDTO.setCurrentWarehouse(currentWarehouse);
+		orderStatusDTO.setDestinationWarehouse(waybillEntityByOrderPackageCode.getDestinationWarehouseName());
+		orderStatusDTO.setLogiBillNo(waybillEntityByOrderPackageCode.getWaybillNo());
 
 		//修改状态映射
 		orderStatusDTO.setStatus(statusName(orderStatusDTO.getStatus()));
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
index ac48c1622..d9deb2414 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
@@ -17,6 +17,7 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.feign.ITrunklineAdvanceClient;
 import com.logpm.warehouse.feign.*;
 import com.rabbitmq.client.Channel;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
@@ -41,42 +42,12 @@ import java.util.Objects;
 @Slf4j
 @RabbitListener(queues = RabbitConstant.HWY_ORDER_STATUS_QUEUE)
 @Component
+@AllArgsConstructor
 public class HwyOrderStatusHandler {
 
-	@Autowired
-	private IAdvanceClient advanceClient;
-
-	@Autowired
-	private IPanFactoryDataService panFactoryDataService;
-	@Autowired
-	private IMtFactoryDataService mtFactoryDataService;
-	@Autowired
-	private IZbFactoryDataService zbFactoryDataService;
-
-	@Autowired
-	private IOuPaiFactoryService ouPaiFactoryService;
-	@Autowired
-	private IWarehouseTrayTypeClient warehouseTrayTypeClient;
-	@Autowired
-	private IWarehouseUpdownTypeClient updownTypeClient;
-	@Autowired
-	private IWarehouseTaryAllocationClient taryAllocationClient;
-	@Autowired
-	private IBasicdataWarehouseClient basicdataWarehouseClient;
-	@Autowired
-	private IBasicdataTrayClient basicdataTrayClient;
-	@Autowired
-	private ITrayClient trayClient;
-	@Autowired
-	private ITrayScanDesClient trayScanDesClient;
-	@Autowired
-	private ITrayScanClient trayScanClient;
-	@Autowired
-	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
-	@Autowired
-	private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
-
-	private ITrunklineAdvanceClient trunklineAdvanceClient;
+	private final IPanFactoryDataService panFactoryDataService;
+	private final IMtFactoryDataService mtFactoryDataService;
+	private final ITrunklineAdvanceClient trunklineAdvanceClient;
 
 
 	@RabbitHandler
@@ -100,10 +71,9 @@ public class HwyOrderStatusHandler {
 		R r = null;
 		switch (type) {
 			case FactoryConstant.PIANO:
-				r = panFactoryDataService.handleStatusData(orderStatusDTO);
+				r = panFactoryDataService.hwyHandleStatusData(orderStatusDTO);
 				if (r.getCode() == 400 || r.getCode() == 200) {
 					log.info("TAG {} ##################hwyOrderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.PIANO, orderSelfNum);
-//					channel.basicAck(deliveryTag,true);
 				} else {
 					throw new CustomerException(r.getCode(), r.getMsg());
 				}
diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml
index 24fb6db53..8abe5459d 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml
@@ -14,6 +14,7 @@
             create_time between DATE_SUB(NOW(), INTERVAL 7 DAY) AND NOW()
         </where>
     </select>
+
     <select id="advanceEntityOne" resultMap="advanceResultMap">
         select * from ht_advance
         <where>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java
index 46c77f697..4cd8eb541 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/RabbitMqConfiguration.java
@@ -75,24 +75,6 @@ public class RabbitMqConfiguration {
 	}
 
 
-	@Bean
-	public Queue openOrderLoadScanQueue() {
-		return new Queue(RabbitConstant.OPEN_ORDER_LOAD_SCAN_QUEUE, true);
-	}
-	@Bean
-	public CustomExchange openOrderLoadScanExchange() {
-		Map<String, Object> args = Maps.newHashMap();
-		args.put("x-delayed-type", "direct");
-		return new CustomExchange(RabbitConstant.OPEN_ORDER_LOAD_SCAN_EXCHANGE, "x-delayed-message", true, false, args);
-	}
-	@Bean
-	public Binding openOrderLoadScanBinding(Queue openOrderLoadScanQueue, CustomExchange openOrderLoadScanExchange) {
-		return BindingBuilder.bind(openOrderLoadScanQueue).to(openOrderLoadScanExchange).with(RabbitConstant.OPEN_ORDER_LOAD_SCAN_ROUTING).noargs();
-	}
-
-
-
-
 	@Bean
 	public Queue openOrderLoadScanQueue() {
 		return new Queue(RabbitConstant.OPEN_ORDER_LOAD_SCAN_QUEUE, true);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
index dd934d1ca..6fdfa1324 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
@@ -2,6 +2,7 @@ package com.logpm.trunkline.service;
 
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;