From 83e0034ab5f729afeb2c25e328d63fda31ff01e1 Mon Sep 17 00:00:00 2001
From: dbs <email0099@163.com>
Date: 星期四, 12 十二月 2024 15:45:57 +0800
Subject: [PATCH] 新增MES处理,分发系统名字特定---》MES系统

---
 src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

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 cec9ff3..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;
@@ -29,7 +30,7 @@
 
     @Override
     @Transactional
-    public JSONArray saveMdmData(JSONArray recordArray) {
+    public JSONArray saveMdmData(JSONArray recordArray,String name) {
         JSONArray newJsonArray = new JSONArray();
         int size = recordArray.size();
         Object[] params = new  Object[]{};
@@ -38,12 +39,12 @@
             for (int i = 0; i < size; i++) {
                 String json = recordArray.get(i).toString();
                 JSONObject jsonObj = JSON.parseObject(json);
-                String id = jsonObj.getString("id");
+                String id = jsonObj.getString("tgctwoclasscode");
                 String tgcoriginalcode = jsonObj.getString("tgcoriginalcode");
                 String updatedat = jsonObj.getString("updatedat");
                 String updatetime = jsonObj.getString("updatetime");
                 mdmData = new MdmData();
-                mdmData.setType("灞�鍩熺墿鏂欏悕绉扮紪鐮佹暟鎹幏鍙�");
+                mdmData.setType(name);
                 mdmData.setId(id);
                 mdmData.setTgcoriginalCode(tgcoriginalcode);
                 mdmData.setUpdatedat(updatedat);
@@ -59,6 +60,60 @@
                             continue;
                         }
                         jsonObj.put("renewstatus","update");
+                        //wms闇�姹傦細杩囨护浠惰瑙勬牸涓虹┖鐨勬暟鎹�
+                        if(!StringUtils.isEmpty(jsonObj.getString("specification"))){
+                            newJsonArray.add(jsonObj);
+                        }
+                        //鏁版嵁瀛樺湪鍙樺寲
+                        dynamicQuery.update(mdm);//鏇存柊鏁版嵁
+                    }
+                }else {
+                    jsonObj.put("renewstatus","new");
+                    //wms闇�姹傦細杩囨护浠惰瑙勬牸涓虹┖鐨勬暟鎹�
+                    if(!StringUtils.isEmpty(jsonObj.getString("specification"))){
+                        newJsonArray.add(jsonObj);
+                    }
+                    //璇存槑璇ユ暟鎹负鏂版暟鎹�
+                    mdmData.setUuid(UUID.randomUUID().toString());
+                    dynamicQuery.save(mdmData);
+                }
+            }
+        }
+        return newJsonArray;
+    }
+
+    @Override
+    @Transactional
+    public JSONArray saveMdmUnitData(JSONArray recordArray, String name) {
+        JSONArray newJsonArray = new JSONArray();
+        int size = recordArray.size();
+        Object[] params = new  Object[]{};
+        MdmData mdmData = null;
+        if(size != 0){
+            for (int i = 0; i < size; i++) {
+                String json = recordArray.get(i).toString();
+                JSONObject jsonObj = JSON.parseObject(json);
+                String id = jsonObj.getString("code");
+                String tgcoriginalcode = jsonObj.getString("originalcode");
+                //String updatedat = jsonObj.getString("updatedat");
+                String updatetime = jsonObj.getString("updatetime");
+                mdmData = new MdmData();
+                mdmData.setType(name);
+                mdmData.setId(id);
+                mdmData.setTgcoriginalCode(tgcoriginalcode);
+                mdmData.setUpdatedat("");
+                mdmData.setUpdatetime(updatetime);
+                String countSql = "SELECT mdm.uuid,mdm.id,mdm.tgcoriginalCode,mdm.updatedat,mdm.updatetime FROM mdm_data AS mdm where mdm.tgcoriginalCode='"+tgcoriginalcode+"' ";
+                List<MdmData> list = dynamicQuery.nativeQueryList(MdmData.class,countSql,params);
+                if(list.size()>0){
+                    //璇存槑瀛樺湪鏁版嵁
+                    for (MdmData mdm : list) {
+                        String updatetime1 = mdm.getUpdatetime();
+                        if(updatetime1.equals(updatetime)){
+                            //鏁版嵁鏃犲彉鍖�
+                            continue;
+                        }
+                        jsonObj.put("renewstatus","update");
                         newJsonArray.add(jsonObj);
                         //鏁版嵁瀛樺湪鍙樺寲
                         dynamicQuery.update(mdm);//鏇存柊鏁版嵁

--
Gitblit v1.8.0