From 98df979bc0bf8f9c897da1e9308ed05404749451 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 17 七月 2023 13:08:24 +0800
Subject: [PATCH] mes 接口调整
---
src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java | 9 +++------
src/main/java/com/zy/asrs/entity/MaterialInfo.java | 4 +++-
src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java | 3 ++-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MaterialInfo.java b/src/main/java/com/zy/asrs/entity/MaterialInfo.java
index 2674285..2daef22 100644
--- a/src/main/java/com/zy/asrs/entity/MaterialInfo.java
+++ b/src/main/java/com/zy/asrs/entity/MaterialInfo.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -47,4 +46,7 @@
//鍘�
private BigDecimal thickness;
+
+ //鏁版嵁鏂板鎴栦慨鏀圭姸鎬�
+ private String type;
}
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..7b80152 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
@@ -16,14 +16,9 @@
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.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Slf4j
@Service
@@ -98,7 +93,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,6 +109,8 @@
鏄犲皠mat鍜岀墿鏂欐。妗堜俊鎭瓧娈�
*/
private void matMapping(MaterialInfo data, Mat m){
+ //
+ m.setCreateTime((data.getMdate()));
//淇敼鏃堕棿 -- 鏇存柊鏃堕棿
m.setUpdateTime(data.getMdate());
//鍟嗗搧缂栫爜 -- 鐗╂枡缂栫爜
diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
index a974216..2e819a7 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
@@ -17,7 +17,6 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MesSyncUtil;
-import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,6 +164,8 @@
o.setOrderTime(jsonData.getString("orderTime"));
//鍗曟嵁绫诲瀷
DocType docType = docTypeService.selectOrAdd(jsonData.getString("orderType"), Boolean.TRUE);
+ //鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
+ jsonData.getString("storage");
o.setDocType(docType.getDocId());
o.setCreateTime(new Date());
o.setUpdateTime(new Date());
--
Gitblit v1.9.1