feat(all): 金牌工厂订单数据

1 修改金牌回传逻辑

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;
 	/**
 	 * 运单
 	 */

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, "卸车入库"),
 	;
 

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());
 						}
 					}

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<DeliveryNoteMapper,
 				}
 				advanceDetailEntity.setSiteName(IDict.getTextByCode(BusSourceEnums.class, order.getBusSource()));
 				advanceDetailEntity.setSiteCode("");
-				String planQty = orderPackageDTO.getGoodsNum();
-				advanceDetailEntity.setQuantity((StrUtil.isNotBlank(planQty) && NumberUtil.isNumber(planQty)) ? Convert.toInt(planQty) : 0);
+				// String planQty = orderPackageDTO.getGoodsNum();
+				// 包件数量默认 1
+				advanceDetailEntity.setQuantity(1);
+				// advanceDetailEntity.setQuantity((StrUtil.isNotBlank(planQty) && NumberUtil.isNumber(planQty)) ? Convert.toInt(planQty) : 1);
 				advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getExtBoxCode());
 				advanceDetailEntity.setTrainNumber("");
 				advanceDetailEntity.setServiceNum(orderInfo.getOmsExtYsId());