From 0bedfead3ffe6d2251d7428d772de0a4df6b5201 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 21 七月 2025 15:52:49 +0800
Subject: [PATCH] 1.向mes查询物料 2.入库上报mes
---
src/main/java/com/zy/asrs/controller/MatController.java | 5 +++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 51a04b9..9c1dea6 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -136,7 +136,8 @@
JSONObject jsonString3 = JSON.parseObject(sqlyujujg.get(0).toString());
//娣诲姞鐗╂枡妗ｆ
Mat mat1=new Mat();
- mat1.setMatnr(jsonString3.getString("鐢熶骇鎵瑰彿"));
+ mat1.setTagId(1L);
+ mat1.setMatnr(jsonString3.getString("鏉＄爜"));
mat1.setMaktx(jsonString3.getString("浜у搧鍚嶇О"));
mat1.setSpecs(jsonString3.getString("浜у搧瑙勬牸"));
mat1.setUnit(jsonString3.getString("鍗曚綅"));
@@ -164,7 +165,7 @@
url+"/"+cxaddress,
null,
"127.0.0.1",
- JSON.toJSONString(map),
+ JSON.toJSONString(CanShuJi),
response,
success
);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index ad589df..b550a2c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -165,7 +165,7 @@
List<LinkedHashMap<String,Object>> Baocuncanshus1 = new ArrayList<LinkedHashMap<String,Object>>();
LinkedHashMap<String,Object> Baocuncanshu1=new LinkedHashMap<String,Object>();
- Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getBatch());//鍞竴鐮�
+ Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getMatnr());//鍞竴鐮�
Baocuncanshus1.add(Baocuncanshu1);
Caozuojihe1.put("Baocuncanshu",Baocuncanshus1);
--
Gitblit v1.9.1