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_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
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