From 03af32fb651a4a8046a6380dad84d20d731a9ffe Mon Sep 17 00:00:00 2001
From: dbs <email0099@163.com>
Date: 星期一, 23 十二月 2024 14:21:18 +0800
Subject: [PATCH] 修改组成MES的格式
---
src/main/java/com/itstyle/mdm/utils/MdmUtils.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
index e63158f..4c43192 100644
--- a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
+++ b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
@@ -50,8 +50,10 @@
String records = httpClientResult.getContent();
records = records.replaceAll("\\p{Z}", "");
JSONObject jsonObj = JSON.parseObject(records);
+
records = jsonObj.getString("records");
- records = records.replaceAll("unit","unitName");
+ records = records.replaceAll("attri2","unitName");
+ records = records.replaceAll("brand","supplierName");
records = records.replaceAll("jzgg","specification");
records = records.replaceAll("model","specificationDisplayName");
records = records.replaceAll("namecn","code");
@@ -73,7 +75,7 @@
"}");*/
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
+ System.out.println("鍝嶅簲鍙傛暟鍒嗗彂锛�"+toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
distributeDataToSys(toString,name);
}
@@ -118,7 +120,6 @@
"}");
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
distributeDataToSys(toString,name);
}
@@ -144,7 +145,17 @@
String uuid = UUID.randomUUID().toString();
try {
//鏁版嵁鍒嗗彂
- httpClientResult = MdmApiUtils.doPostJson(address, jsonParam);
+ if("MES绯荤粺".equals(sysName)){
+ //澶勭悊json涓篗ES绯荤粺鎯宠鐨勬牸寮�
+ jsonParam=MdmApiUtils.getMesJson(jsonParam);
+ //鎷兼帴webservice
+ String xmlStr=MdmApiUtils.getMesSoapBody(jsonParam);
+ //璇锋眰webservice
+ httpClientResult = MdmApiUtils.doPostXmlJson(address, xmlStr);
+ }else{
+ httpClientResult = MdmApiUtils.doPostJson(address, jsonParam);
+ }
+
//鍝嶅簲缁撴灉
String content = httpClientResult.getContent();
int code = httpClientResult.getCode();
--
Gitblit v1.8.0