From 11847062f896ad4a596cf18233babe7944727893 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 10:04:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a24b405..58ca066 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -64,12 +64,16 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param1.getMatList())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+
List<Map<String, Object>> result = new ArrayList<>();
@@ -79,8 +83,8 @@
Map<String, Object> map = new HashMap<>();
map.put("matnr", detlDto2.getMatnr());
map.put("maktx", detlDto2.getMaktx());
- map.put("owner", detlDto2.getOwner());
- map.put("batch", detlDto2.getBatch());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
result.add(map);
}
}
@@ -129,6 +133,9 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[FormId]涓嶈兘涓虹┖");
}
@@ -144,8 +151,8 @@
Map<String, Object> map = new HashMap<>();
map.put("matnr", detlDto2.getMatnr());
map.put("maktx", detlDto2.getMaktx());
- map.put("owner", detlDto2.getOwner());
- map.put("batch", detlDto2.getBatch());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
result.add(map);
}
}
--
Gitblit v1.9.1