From e93b1dddf4f99f83d05688baceeb59cacdd82ec8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 17:29:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 68245b6..de82cf4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -23,8 +23,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.util.*;
+import java.util.stream.Collectors;
/**
* WMS骞冲彴瀵规帴Service瀹炵幇
@@ -100,17 +102,21 @@
update.setWmsSendNum(job.getWmsSendNum() + 1);
}
update.setWmsSendPlatformCode(job.getPlatformWmsCode());
+ Boolean success = false;
if(response!=null && response.getData() !=null
&& response.getData().size()>0 && StringUtils.equals(response.getData().get(0).getSuccess(),WmsBaseResponse.CODE_SUCCESS)){
//濡傛灉鎴愬姛
update.setWmsSendStatus(Constants.ONE);
update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙版垚鍔�");
+ success = true;
}else{
//濡傛灉澶辫触
update.setWmsSendStatus(Constants.TWO);
update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙板け璐�:"+(response!=null?JSONObject.toJSONString(response):"鎺ュ彛璋冪敤澶辫触"));
}
platformJobMapper.updateById(update);
+ this.saveInterfaceLog(url, name,JSONObject.toJSONString(param),
+ success?Constants.ZERO:Constants.ONE, update.getWmsSendInfo(),Constants.ZERO);
return response;
}
@@ -340,6 +346,13 @@
job.setArriveDate(new Date());
job.setSingType(Constants.TWO);
job.setSignDate(new Date());
+ List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
+ if(CollectionUtils.isEmpty(signList)){
+ job.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ job.setSignNum(maxNumber + Constants.ONE);
+ }
}
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
--
Gitblit v1.9.3