From e2ae6b57bb1398391be2050e85a729a7c8682f1f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 11:27:40 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能

---
 src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
index 152c6d1..cf52e3d 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.Mat;
 import com.zy.asrs.entity.MaterialInfo;
 import com.zy.asrs.service.ApiLogService;
@@ -16,12 +17,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,8 +28,8 @@
 @Service
 public class MesMatSyncHandler extends AbstractHandler<String> {
 
-    @Value("${mes.mat-sync.url}")
-    private String url;
+    @Value("${mes.mat-sync.uri}")
+    private String uri;
 
     @Value("${mes.mat-sync.path}")
     private String path;
@@ -44,8 +43,8 @@
     @Transactional
     public ReturnT<String> start() throws IOException {
         boolean success = true;
-        log.info("url:" + url + path);
-        JSONObject jsonObject = doGetJsonData();
+        JSONObject jsonObject = doPostJsonData();
+        log.info("MesMatSync jsonObject: " + jsonObject.toJSONString());
 
         int code = jsonObject.getInteger("code");
 
@@ -66,7 +65,7 @@
     private void saveApiLog(String response, boolean success) {
         apiLogService.save(
                 "鍟嗗搧淇℃伅鍚屾",
-                url + path,
+                uri + path,
                 null,
                 "127.0.0.1",
                 null,
@@ -76,16 +75,24 @@
     }
 
     /*
-    鍙戣捣涓�涓猟oGet璇锋眰
+    鍙戣捣涓�涓姹傛潵鑾峰彇鍟嗗搧淇℃伅
      */
-    private JSONObject doGetJsonData() throws IOException {
+    private JSONObject doPostJsonData() throws IOException {
+
+        Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+        Mat mat = matService.selectOne(new EntityWrapper<Mat>().orderBy("update_time", false));
+        //濡傛灉WMS涓湁mat淇℃伅锛屽垯鑾峰彇鏈�鏂扮殑mat淇敼鏃堕棿锛岀劧鍚庤幏鍙栬鏃堕棿涔嬪悗鎵�鏈夋洿鏂拌繃鐨勯殧鑶滃嵎淇℃伅銆傚鏋滄病鏈塵at淇℃伅锛屽垯鑾峰彇鎵�鏈夐殧鑶滃嵎淇℃伅
+        if(!Cools.isEmpty(mat)){
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            requestParamMap.put("time",sdf.format(mat.getUpdateTime()));
+        }
 
         return JSON.parseObject( new HttpHandler.Builder()
-                .setUri(url)
+                .setUri(uri)
                 .setPath(path)
-                .setParams(MesSyncUtil.getRequestParamMap())
+                .setParams(requestParamMap)
                 .build()
-                .doGet());
+                .doPostWithParam());
     }
 
     /*
@@ -98,7 +105,7 @@
             Mat m = matService.selectByMatnr(data.getItemCode());
             if(m == null){
                 m = new Mat();
-                m.setCreateTime(jsonObject.getDate("createDate"));
+                //m.setCreateTime(jsonObject.getDate("createDate"));
                 matMapping(data,m);
                 matService.insert(m);
             }else {
@@ -114,8 +121,10 @@
     鏄犲皠mat鍜岀墿鏂欐。妗堜俊鎭瓧娈�
      */
     private void matMapping(MaterialInfo data, Mat m){
+        //
+        m.setCreateTime((data.getMdate()));
         //淇敼鏃堕棿 -- 鏇存柊鏃堕棿
-        m.setUpdateTime(data.getMdate());
+        m.setUpdateTime(new Date());
         //鍟嗗搧缂栫爜 -- 鐗╂枡缂栫爜
         m.setMatnr(data.getItemCode());
         //鍟嗗搧鍚嶇О -- 鐗╂枡鍚嶇О

--
Gitblit v1.9.1