feat(all): 修改金牌回传问题

1 修改金牌回传问题

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/PushOrderDetailEntity.java

@@ -30,6 +30,8 @@ public class PushOrderDetailEntity extends BaseEntity {
 	private String transportType;
 	@ApiModelProperty(name = "发站")
 	private String sendSite;
+	@ApiModelProperty(name = "与金牌交付的唯一标识")
+	private String shipNo;
 	@ApiModelProperty(name = "到站")
 	private String endSite;
 	@ApiModelProperty(name = "收货联系人名称")

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

@@ -2,11 +2,9 @@ package com.logpm.factorydata.jinpai.mq;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
@@ -102,9 +100,10 @@ public class NodeDataPushListener {
 			}
 			for (String sendOrderCode : orderCodes) {
 				// 先从新系统查，如果查不到，去老系统查一次
-				List<PushOrderDetailEntity> orderDetailEntities = pushOrderDetailService.list(Wrappers.<PushOrderDetailEntity>lambdaQuery()
-					.in(PushOrderDetailEntity::getCustomItemNo, sendOrderCode)
-				);
+				List<PushOrderDetailEntity> orderDetailEntities = null;
+				// List<PushOrderDetailEntity> orderDetailEntities = pushOrderDetailService.list(Wrappers.<PushOrderDetailEntity>lambdaQuery()
+				// 	.in(PushOrderDetailEntity::getCustomItemNo, sendOrderCode)
+				// );
 				Boolean flag = Boolean.FALSE;
 				if (CollUtil.isEmpty(orderDetailEntities)) {
 					// 去老系统查
@@ -194,7 +193,7 @@ public class NodeDataPushListener {
 							js.set("endSite", mainJson.getStr("warehouseName"));
 							js.set("passSite", mainJson.getStr("acceptWarehouseName"));
 							js.set("doRemark", "");
-							js.set("reqSn", (RandomUtil.randomLong(19, 19) - RandomUtil.randomLong(19) + RandomUtil.randomLong(19)) + "");
+							js.set("reqSn", pushOrderDetailEntity.getShipNo());
 							js.set("syscode", "huitong");
 							js.set("carNo", mainJson.getStr("carNumber"));
 							js.set("carHangNo", "");
@@ -255,7 +254,7 @@ public class NodeDataPushListener {
 							js.set("transportNo", pushOrderEntityMap.get(pushData.getOrderCode()).getTransportNo());
 							js.set("doTime", entries.getStr("operatorTime"));
 							js.set("syscode", "huitong");
-							js.set("reqSn", UUID.randomUUID());
+							js.set("reqSn", detailEntityMap.get(pushData.getOrderCode()).getShipNo());
 							js.set("arriveFor", arriveFor);
 							JSONObject detailJson = new JSONObject();
 							detailJson.set(pushData.getPackageCode(), 1);