From dfff03020fbb9124346ee8310f80ca15f140f356 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 31 Oct 2024 22:12:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=87=91=E7=89=8C=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改金牌回传逻辑 --- .../jinpai/entity/FactoryNodePushEntity.java | 10 ++++++++++ .../logpm/factorydata/jinpai/enums/NodeNeedEnums.java | 1 + .../factorydata/jinpai/mq/NodeDataPushListener.java | 9 +++++++-- .../jinpai/service/impl/DeliveryNoteServiceImpl.java | 6 ++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java index 29e9cc511..ee897e756 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java @@ -50,11 +50,21 @@ public class FactoryNodePushEntity extends BaseEntity { */ @ApiModelProperty(name = "预留5", notes = "") private String reserve5; + /** + * 类型（仓配stock/干线carrier） + */ + @ApiModelProperty(name = "类型（仓配stock/干线carrier）", notes = "") + private String type; /** * 订单号 */ @ApiModelProperty(name = "订单号", notes = "") private String orderCode; + /** + * 仓库 + */ + @ApiModelProperty(name = "仓库", notes = "") + private String warehouse; /** * 运单 */ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java index cc2d200fc..89b5d939d 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/NodeNeedEnums.java @@ -21,6 +21,7 @@ public enum NodeNeedEnums implements Serializable { * 包件入库 */ // END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"), UNLOAD_INCOMING_WAREHOUSE(105010, "卸车入库"), ; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java index ad47cb057..552580866 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java @@ -214,6 +214,8 @@ public class NodeDataPushListener { // 保存推送记录 factoryNodePushService.save(FactoryNodePushEntity.builder() .orderCode(orderCode) + .type(arriveFor) + .warehouse(StrUtil.equals(arriveFor, "stock") ? filterDatum.getWarehouseName() : null) .node(FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString()) .content(JSONUtil.toJsonStr(js)) .packageCode(packageCode) @@ -269,6 +271,9 @@ public class NodeDataPushListener { // 保存推送记录 factoryNodePushService.save(FactoryNodePushEntity.builder() .orderCode(sendOrderCode) + .type(arriveFor) + // 仓配数据记录仓库 + .warehouse(StrUtil.equals(arriveFor, "stock") ? filterDatum.getWarehouseName() : null) .transportNo(transportNo) .node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString()) .content(JSONUtil.toJsonStr(js)) @@ -294,8 +299,8 @@ public class NodeDataPushListener { .exchange(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH_DELAYED) .routingKey(FactoryDataConstants.Mq.RoutingKeys.JP_NODE_DATA_PUSH) .message(JSONUtil.toJsonStr(nodePushMsg, HutoolConfigUtil.jsonConfigByDataTimeFormat())) - // 3-10秒随机 - .delay(1000 * RandomUtil.randomInt(3, 11)) + // 30-109秒随机 + .delay(1000 * RandomUtil.randomInt(30, 110)) .build()); } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java index f263e0c9c..6e04e5095 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java @@ -479,8 +479,10 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl