From 96006558b06accde22774a816432c6fff78adb2e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 18:43:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
index b526e8e..811c2c4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
@@ -14,6 +14,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
+import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
@@ -53,7 +54,7 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/inboundNotice")
- public WmsBaseResponse inboundNotice(@RequestBody List<WmsInboundNoticeRequest> param) {
+ public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {
int success = Constants.ZERO;
WmsBaseResponse result =null;
@@ -77,7 +78,7 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/outboundNotice")
- public WmsBaseResponse outboundNotice(@RequestBody List<WmsOutboundNoticeRequest> param) {
+ public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
int success = Constants.ZERO;
WmsBaseResponse result =null;
try {
@@ -99,7 +100,7 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/cancelInbound")
- public WmsBaseResponse cancelInbound(@RequestBody List<WmsActionNoticeRequest> param) {
+ public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
int success = Constants.ZERO;
WmsBaseResponse result =null;
try {
@@ -120,7 +121,7 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/cancelOutbound")
- public WmsBaseResponse cancelOutbound(@RequestBody List<WmsActionNoticeRequest> param) {
+ public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
int success = Constants.ZERO;
WmsBaseResponse result =null;
try {
@@ -141,7 +142,7 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
@PostMapping("/push/doneTask")
- public WmsBaseResponse doneTask(@RequestBody List<WmsActionNoticeRequest> param) {
+ public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
int success = Constants.ZERO;
WmsBaseResponse result =null;
try {
--
Gitblit v1.9.3