From f78656b3aff688567b0e8ff2e83646014ec098eb Mon Sep 17 00:00:00 2001
From: ny <9623679+cy_lzc_admin@user.noreply.gitee.com>
Date: 星期四, 12 十二月 2024 15:32:27 +0800
Subject: [PATCH] 物料业务数据分发功能更新
---
src/main/java/com/itstyle/quartz/web/JobController.java | 4 ++--
src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java | 12 +++++++++---
src/main/java/com/itstyle/mdm/utils/MdmUtils.java | 6 +++---
src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java | 2 +-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
index 0ea7e0c..174854d 100644
--- a/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
+++ b/src/main/java/com/itstyle/mdm/enumwrap/MdmEnum.java
@@ -18,7 +18,7 @@
MDM_LADGPS_MATERIAL_DICTIONARY("灞�鍩熺墿鏂欒瘝鍏哥紪鐮佹暟鎹幏鍙�","/api/V1/ztwo/getWLCDCodes"),
/**
- * 灞�鍩熺墿鏂欒瘝鍏哥紪鐮�
+ * 灞�鍩熺墿鏂欎笟鍔＄紪鐮佹暟鎹幏鍙�
*/
MDM_MATERIAL_DICTIONARY("鐗╂枡涓氬姟缂栫爜鏁版嵁鑾峰彇","/api/V1/zbusiness/getWLYWCodes"),
diff --git a/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java b/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
index f84d827..dfb52a9 100644
--- a/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
+++ b/src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java
@@ -1,6 +1,7 @@
package com.itstyle.mdm.service.impl;
+import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -59,16 +60,21 @@
continue;
}
jsonObj.put("renewstatus","update");
- newJsonArray.add(jsonObj);
+ //wms闇�姹傦細杩囨护浠惰瑙勬牸涓虹┖鐨勬暟鎹�
+ if(!StringUtils.isEmpty(jsonObj.getString("specification"))){
+ newJsonArray.add(jsonObj);
+ }
//鏁版嵁瀛樺湪鍙樺寲
dynamicQuery.update(mdm);//鏇存柊鏁版嵁
}
}else {
jsonObj.put("renewstatus","new");
- newJsonArray.add(jsonObj);
+ //wms闇�姹傦細杩囨护浠惰瑙勬牸涓虹┖鐨勬暟鎹�
+ if(!StringUtils.isEmpty(jsonObj.getString("specification"))){
+ newJsonArray.add(jsonObj);
+ }
//璇存槑璇ユ暟鎹负鏂版暟鎹�
mdmData.setUuid(UUID.randomUUID().toString());
- System.out.println(mdmData.toString());
dynamicQuery.save(mdmData);
}
}
diff --git a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
index e63158f..959426d 100644
--- a/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
+++ b/src/main/java/com/itstyle/mdm/utils/MdmUtils.java
@@ -51,7 +51,8 @@
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 +74,7 @@
"}");*/
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
+ System.out.println("鍝嶅簲鍙傛暟鍒嗗彂锛�"+toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
distributeDataToSys(toString,name);
}
@@ -118,7 +119,6 @@
"}");
//杩斿洖json鏍煎紡鍙傛暟
String toString = returnJson.toString();
- System.out.println(toString);
//鍒嗗彂澧為噺鏁版嵁鑷冲紓鏋勭郴缁�
distributeDataToSys(toString,name);
}
diff --git a/src/main/java/com/itstyle/quartz/web/JobController.java b/src/main/java/com/itstyle/quartz/web/JobController.java
index 544afc8..1495180 100644
--- a/src/main/java/com/itstyle/quartz/web/JobController.java
+++ b/src/main/java/com/itstyle/quartz/web/JobController.java
@@ -103,8 +103,8 @@
scheduler.unscheduleJob(triggerKey);
// 鍒犻櫎浠诲姟
scheduler.deleteJob(JobKey.jobKey(quartz.getJobName(), quartz.getJobGroup()));
- System.out.println("removeJob:"+JobKey.jobKey(quartz.getJobName()));
- } catch (Exception e) {
+
+ } catch (Exception e) {
e.printStackTrace();
return Result.error();
}
--
Gitblit v1.8.0