Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AuthPushJob.java

@@ -84,6 +84,7 @@ public class AuthPushJob {
 			String content = factoryNodePushEntity.getContent();
 			JSONObject entries = JSONUtil.parseObj(content);
 			entries.set("passSite", entries.getStr("endSite"));
+			entries.set("sendSite", entries.getStr("endSite"));
 			String url = jinPaiProperties.getOldSystemHost() + jinPaiProperties.getOldSystemArrivedUrl();
 			log.info("字段缺失重新推送：{}", JSONUtil.toJsonStr(entries));
 			String result = HttpUtil.post(url, JSONUtil.toJsonStr(entries));

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

@@ -250,7 +250,11 @@ public class NodeDataPushListener {
 								js.set("doType", 32);
 								js.set("doLocation", "");
 								js.set("doTime", entries.getStr("operatorTime"));
-								js.set("sendSite", filterDatum.getWaybillStartWarehouse());
+								if (StrUtil.isNotEmpty(filterDatum.getWaybillStartWarehouse())) {
+									js.set("sendSite", filterDatum.getWaybillStartWarehouse());
+								} else {
+									js.set("sendSite", filterDatum.getWarehouseName());
+								}
 								js.set("endSite", filterDatum.getWarehouseName());
 								if (StrUtil.isNotEmpty(filterDatum.getDestinationWarehouse())) {
 									js.set("passSite", filterDatum.getDestinationWarehouse());