feat(all): 索菲亚工厂订单数据

1 修改索菲亚工厂订单客户名称电话按老系统逻辑调整

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

@@ -70,8 +70,15 @@ public class NodeDataPushListener {
 				JSONObject jsons = new JSONObject();
 				List<JSONObject> packages = new ArrayList<>();
 				for (PushData pushData : content) {
+					String packageCode = pushData.getPackageCode();
+					// 新系统自动生成的包条码，不用回传
+					if (StrUtil.isNotEmpty(packageCode) && packageCode.startsWith("HT")) {
+						if (packageCode.length() == 22) {
+							continue;
+						}
+					}
 					JSONObject js = new JSONObject();
-					js.set("paNo", pushData.getPackageCode());
+					js.set("paNo", packageCode);
 					js.set("subinventoryCode", "");
 					js.set("locatorCode", "");
 					js.set("updateDate", DateUtil.now());
@@ -97,6 +104,13 @@ public class NodeDataPushListener {
 				JSONObject jsons = new JSONObject();
 				List<String> packages = new ArrayList<>();
 				for (PushData pushData : content) {
+					String packageCode = pushData.getPackageCode();
+					// 新系统自动生成的包条码，不用回传
+					if (StrUtil.isNotEmpty(packageCode) && packageCode.startsWith("HT")) {
+						if (packageCode.length() == 22) {
+							continue;
+						}
+					}
 					packages.add(pushData.getPackageCode());
 				}
 				if (StrUtil.isNotEmpty(main)) {

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java

@@ -171,8 +171,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceEntity.setDealerName(orderPackageDTO.getDealerName());
 				advanceEntity.setStoreCode(orderPackageDTO.getDealerNo());
 				advanceEntity.setStoreName(orderPackageDTO.getDealerName());
-				advanceEntity.setCustomerName(orderInfoVO.getReceiver());
-				advanceEntity.setCustomerPhone(orderInfoVO.getReceiveTel());
+				advanceEntity.setCustomerName(orderInfoVO.getReceiver() + " 转 " + orderInfoVO.getConnectName());
+				advanceEntity.setCustomerPhone(orderInfoVO.getConnectPhone());
 				advanceEntity.setCustomerAddress(orderInfoVO.getReceiveAddr());
 				// 封装包件
 				TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();