Merge branch 'dev' into pre-production

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

@@ -214,6 +214,7 @@ public class NodeDataPushListener {
 						.senderCode(mtPushDataDTO.getSenderCode())
 						.orderCode(pushData.getOrderCode())
 						.warehouseCode(mtPushDataDTO.getWarehouseCode())
+						.outWarehouseType(mtPushDataDTO.getOutWarehouseType())
 						.operatingWarehouseName(warehouse)
 						.packageCode(pushData.getPackageCode())
 						.operatingTime(operatorTime)

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/vo/SignForVO.java

@@ -31,6 +31,10 @@ public class SignForVO implements Serializable {
 	@JsonProperty("订单编号")
 	private String orderCode;
 
+	@ApiModelProperty("工厂出库方式")
+	@JsonProperty("工厂出库方式")
+	private String outWarehouseType;
+
 	@ApiModelProperty("包条码")
 	@JsonProperty("包条码")
 	private String packageCode;