From 1dd50af78c0ecfc4f44a51c900db0e7b1720e504 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 19 七月 2023 16:37:01 +0800
Subject: [PATCH] #接口调用完善
---
src/main/java/com/zy/asrs/controller/OpenController.java | 10 +++++-----
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | 5 +++--
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 690fb42..77075c9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -203,7 +203,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.labellerComplete(param);
- return R.ok();
+ return R.ok(param);
}
/**
@@ -216,7 +216,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.labellerMat(param);
- return R.ok();
+ return R.ok(param);
}
/**
@@ -229,7 +229,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.palletizingComplete(param);
- return R.ok();
+ return R.ok(param);
}
@@ -243,7 +243,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.singleUnstackingComplete(param);
- return R.ok();
+ return R.ok(param);
}
/**
@@ -256,7 +256,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.singleMountUnstackingComplete(param);
- return R.ok();
+ return R.ok(param);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
index 4f2aa7b..a77d4cf 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
@@ -11,10 +11,10 @@
private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
- private List<PalletizingCompleteParam.MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+ private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
@Data
- public class MatList{
+ public static class MatList{
private String matnr;// 鏄� 瀛楃涓� 鐗╂枡缂栫爜
private String maktx;// 鏄� 瀛楃涓� 鐗╂枡鍚嶇О
private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
index 965333a..36c0906 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -4,15 +4,16 @@
import java.util.List;
+@Data
public class SingleMountUnstackingCompleteParam {
private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
private String palletizingNo;// 鏄� 瀛楃涓� 鎷嗗灈浣嶇紪鍙�
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
- private List<SingleMountUnstackingCompleteParam.MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+ private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
@Data
- public class MatList{
+ public static class MatList{
private String position;// 鏄� 瀛楃涓� 鏈ㄧ鐮佸灈浣嶇疆
private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 65145a6..b0aad34 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -547,7 +547,6 @@
@Transactional
public void labellerComplete(LabellerCompleteParam param) {
-
}
@Override
@Transactional
--
Gitblit v1.9.1