From c7e5d4db02fb3eeedafb3b292a88a0c946ea7cfa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 九月 2024 16:15:18 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java | 103 +++++++++++++++++++++++++++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java | 11 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsBaseRequest.java | 7 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundNoticeRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundNoticeRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 34 +++++------
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java | 11 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformRequest.java | 2
8 files changed, 125 insertions(+), 47 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 {
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
index 828af42..25e0b13 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
@@ -1,16 +1,20 @@
package com.doumee.cloud.admin;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.exception.BusinessException;
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;
import com.doumee.service.business.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +29,7 @@
*/
@Api(tags = "WMS骞冲彴鏁版嵁鎺ㄩ�佹帴鍙�")
@RestController
+@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/wms")
public class WmsPushCloudController extends BaseController {
@@ -34,42 +39,110 @@
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/inboundNotice")
- @LoginNoRequired
- public WmsBaseResponse inboundNotice(@RequestBody List<WmsInboundNoticeRequest> param) {
- WmsBaseResponse result = wmsService.inboundNotice(param);
+ public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {
+
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.inboundNotice(param);
+ }catch (BusinessException e){
+ log.error("銆怌MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怌MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/inboundNotice", "鎺ㄩ�佸叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
+ }
+
return result;
}
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/outboundNotice")
- @LoginNoRequired
- public WmsBaseResponse outboundNotice(@RequestBody List<WmsOutboundNoticeRequest> param) {
- WmsBaseResponse result = wmsService.outboundNotice(param);
+ public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.outboundNotice(param);
+ }catch (BusinessException e){
+ log.error("銆怌MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怌MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/outboundNotice", "鎺ㄩ�佸嚭搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),success
+ , JSONObject.toJSONString(result),Constants.ONE);
+ }
+
return result;
}
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/cancelInbound")
- @LoginNoRequired
- public WmsBaseResponse cancelInbound(@RequestBody List<WmsActionNoticeRequest> param) {
- WmsBaseResponse result = wmsService.cancelInbound(param);
+ public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.cancelInbound(param);
+ }catch (BusinessException e){
+ log.error("銆怌MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怌MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/cancelInbound", "鎺ㄩ�佸彇娑堝叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
+ }
return result;
}
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/cancelOutbound")
- @LoginNoRequired
- public WmsBaseResponse cancelOutbound(@RequestBody List<WmsActionNoticeRequest> param) {
- WmsBaseResponse result = wmsService.cancelOutbound(param);
+ public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.cancelOutbound(param);
+ }catch (BusinessException e){
+ log.error("銆怌MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怌MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "鎺ㄩ�佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
+ JSONObject.toJSONString(param), success, JSONObject.toJSONString(result),Constants.ONE);
+ }
return result;
}
@PreventRepeat
@ApiOperation("銆怌MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
@PostMapping("/push/doneTask")
- @LoginNoRequired
- public WmsBaseResponse doneTask(@RequestBody List<WmsActionNoticeRequest> param) {
- WmsBaseResponse result = wmsService.doneTask(param);
+ public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.doneTask(param);
+ }catch (BusinessException e){
+ log.error("銆怌MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怌MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/doneTask", "鎺ㄩ�佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
+ }
return result;
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsBaseRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsBaseRequest.java
index 397ef9f..498350c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsBaseRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsBaseRequest.java
@@ -4,12 +4,17 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/23 14:03
*/
@Data
@ApiModel("wms璇锋眰鍏叡鍙傛暟")
-public class WmsBaseRequest {
+public class WmsBaseRequest<T> {
+
+ @ApiModelProperty(value = "data" )
+ private List<T> data;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundNoticeRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundNoticeRequest.java
index d677f9c..34652fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundNoticeRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundNoticeRequest.java
@@ -12,7 +12,7 @@
*/
@Data
@ApiModel("WMS鍏ュ簱閫氱煡鍗曟帹閫佽姹備俊鎭�")
-public class WmsInboundNoticeRequest extends WmsBaseRequest {
+public class WmsInboundNoticeRequest {
@ApiModelProperty(value = "鍏ュ簱閫氱煡鍗曞彿" ,example = "1")
private String ioCode;
@ApiModelProperty(value = "杞︾墝鍙�" ,example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformRequest.java
index 36ba227..844a276 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOrderPlatformRequest.java
@@ -12,7 +12,7 @@
*/
@Data
@ApiModel("WMS鍑哄叆搴撲綔涓氬崟缁戝畾鏈堝彴淇℃伅瀵硅薄")
-public class WmsOrderPlatformRequest extends WmsBaseRequest {
+public class WmsOrderPlatformRequest {
@ApiModelProperty(value = "鍗曞彿鏁版嵁瀵硅薄" )
private List<WmsOrderPlatformInfoRequest> data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundNoticeRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundNoticeRequest.java
index 5e7e3e4..8ee8809 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundNoticeRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundNoticeRequest.java
@@ -12,7 +12,7 @@
*/
@Data
@ApiModel("WMS鍑哄簱閫氱煡鍗曟帹閫佽姹備俊鎭�")
-public class WmsOutboundNoticeRequest extends WmsBaseRequest {
+public class WmsOutboundNoticeRequest {
@ApiModelProperty(value = "鍑哄簱閫氱煡鍗曞彿" ,example = "1")
private String ioCode;
@ApiModelProperty(value = "鏀惰揣鍦�" ,example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java
index ebd0ed7..7f96f9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java
@@ -1,6 +1,7 @@
package com.doumee.service.business;
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;
@@ -27,33 +28,33 @@
* @param list 鍙傛暟
* @return WmsBaseResponse
*/
- WmsBaseResponse inboundNotice(List<WmsInboundNoticeRequest> list);
+ WmsBaseResponse inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list);
/**
* 鍑哄簱鍗曟壒閲忛�氱煡
* @param list 鍙傛暟
* @return WmsBaseResponse
*/
- WmsBaseResponse outboundNotice(List<WmsOutboundNoticeRequest> list);
+ WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list);
/**
* 鍙栨秷鍏ュ簱鍗曢�氱煡
* @param list 鍙傛暟
* @return WmsBaseResponse
*/
- WmsBaseResponse cancelInbound(List<WmsActionNoticeRequest> list);
+ WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list);
/**
* 鍙栨秷鍑哄簱鍗曢�氱煡
* @param list 鍙傛暟
* @return WmsBaseResponse
*/
- WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list);
+ WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list);
/**
* 鍑哄叆搴撲綔涓氬畬鎴愰�氱煡
* @param list 鍙傛暟
* @return WmsBaseResponse
*/
- WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list);
+ WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index b8ee494..0096a70 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -191,14 +191,14 @@
*/
@Override
@Transactional
- public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(List<WmsInboundNoticeRequest> list) {
- if(list ==null || list.size() ==0){
+ public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list) {
+ if(list ==null || list.getData()==null|| list.getData().size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<PlatformJob> jobList = new ArrayList<>();
List<PlatformWmsDetail> details = new ArrayList<>();
List<String> iocodeList = new ArrayList<>();
- for(WmsInboundNoticeRequest param : list){
+ for(WmsInboundNoticeRequest param : list.getData()){
if(StringUtils.isBlank(param.getIoCode()) ||
StringUtils.isBlank(param.getCarrierBillCode())||
StringUtils.isBlank(param.getPlateNumber())||
@@ -280,7 +280,7 @@
//鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
.select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
- Constants.PlatformJobStatus.LEAVED+")) as jobNum")
+ Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -310,7 +310,7 @@
//鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
.select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
- Constants.PlatformJobStatus.LEAVED+")) as jobNum")
+ Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -339,14 +339,14 @@
* @return
*/
@Override
- public WmsBaseResponse outboundNotice(List<WmsOutboundNoticeRequest> list) {
- if(list ==null || list.size() ==0){
+ public WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list) {
+ if(list ==null ||list.getData()==null || list.getData().size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<PlatformJob> jobList = new ArrayList<>();
List<PlatformWmsDetail> details = new ArrayList<>();
List<String> iocodeList = new ArrayList<>();
- for(WmsOutboundNoticeRequest param : list){
+ for(WmsOutboundNoticeRequest param : list.getData()){
if(StringUtils.isBlank(param.getIoCode()) ||
StringUtils.isBlank(param.getCarrierBillCode())||
StringUtils.isBlank(param.getPlateNumber())||
@@ -416,13 +416,11 @@
* @return
*/
@Override
- public WmsBaseResponse cancelInbound(List<WmsActionNoticeRequest> list) {
+ public WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
//TODO-------------------澶勭悊鍏ュ簱鍙栨秷閫氱煡涓氬姟--------------------
- if(list ==null || list.size() ==0){
+ if(list ==null||list.getData()==null || list.getData().size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
-
-
return returnSuccessReuslt(null);
}
/**
@@ -431,12 +429,12 @@
* @return
*/
@Override
- public WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list) {
- if(list ==null || list.size() ==0){
+ public WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
+ if(list ==null||list.getData()==null || list.getData().size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<String> iocodeList = new ArrayList<>();
- for(WmsActionNoticeRequest param :list){
+ for(WmsActionNoticeRequest param :list.getData()){
iocodeList.add(param.getIoCode());
}
//鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
@@ -452,12 +450,12 @@
* @return
*/
@Override
- public WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list) {
- if(list ==null || list.size() ==0){
+ public WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list) {
+ if(list ==null||list.getData()==null || list.getData().size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<String> iocodeList = new ArrayList<>();
- for(WmsActionNoticeRequest param :list){
+ for(WmsActionNoticeRequest param :list.getData()){
iocodeList.add(param.getIoCode());
}
//鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
--
Gitblit v1.9.3