From e9a48b3968947dbd072325cf3a61df5e34542143 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 17:43:32 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 27 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 5e7173a..06f8197 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
@@ -28,6 +28,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -98,51 +99,79 @@
}else{
return null;
}
- WmsOrderPlatformRequest param = new WmsOrderPlatformRequest();
- param.setData(new ArrayList<>());
-
List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
.eq(PlatformWmsDetail::getJobId,job.getId())
.eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
);
+ String url = type == 0?systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():
+ systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
+ String name = type ==0?"銆怶MS銆戝叆搴撲綔涓氬崟鍒嗛厤鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑鍒嗛厤鏈堝彴";
+// int sendSuccess = 0;
+// int sendError = 0;
+ List<String> errorMassge = new ArrayList<>();
+ List<String> successMassge = new ArrayList<>();
+ WmsBaseResponse<WmsBaseDataResponse> response = null;
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
for (PlatformWmsDetail platformWmsDetail:platformWmsDetailList) {
if(StringUtils.isNotBlank(platformWmsDetail.getIocode())){
+ //鍙鐞嗘湭鍙戦�佺殑璇锋眰
+ WmsOrderPlatformRequest param = new WmsOrderPlatformRequest();
+ param.setData(new ArrayList<>());
WmsOrderPlatformInfoRequest o = new WmsOrderPlatformInfoRequest();
o.setCarrierBillCode(platformWmsDetail.getIocode());
o.setRailwayNo(job.getPlatformWmsCode());
param.getData().add(o);
+ response = sendHttpRequest(url,name,JSONObject.toJSONString(param),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
+ if(response!=null && response.getData() !=null
+ && response.getData().size()>0 && StringUtils.equals(response.getData().get(0).getSuccess(),WmsBaseResponse.CODE_SUCCESS)){
+ //濡傛灉鎴愬姛
+ successMassge.add(o.getRailwayNo());
+ }else{
+ //濡傛灉澶辫触
+ errorMassge.add(o.getRailwayNo());
+ }
}
}
}
+ if(successMassge.size()>0 || errorMassge.size()>0){
+ PlatformJob update = new PlatformJob();
+ update.setId(job.getId());
+ update.setWmsSendDate(new Date());
+ if(Objects.isNull(job.getWmsSendNum())){
+ job.setWmsSendNum(1);
+ }else{
+ update.setWmsSendNum(job.getWmsSendNum() + 1);
+ }
+ update.setWmsSendPlatformCode(job.getPlatformWmsCode());
+ if(successMassge.size()>0 && errorMassge.size() ==0){
+ //濡傛灉鎴愬姛
+ update.setWmsSendStatus(Constants.ONE);
+ }else if(successMassge.size()==0 && errorMassge.size() >1){
+ //濡傛灉澶辫触
+ update.setWmsSendStatus(Constants.TWO);
+ }
+ Map<String ,Object> info= new HashMap<>();
+ info.put("success", successMassge);
+ info.put("error", errorMassge);
+ update.setWmsSendInfo(JSONObject.toJSONString(info));
+ platformJobMapper.updateById(update);
+ }
- String url = type == 0?systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():
- systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
- String name = type ==0?"銆怶MS銆戝叆搴撲綔涓氬崟鍒嗛厤鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑鍒嗛厤鏈堝彴";
- WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(param),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
- PlatformJob update = new PlatformJob();
- update.setId(job.getId());
- update.setWmsSendDate(new Date());
- if(Objects.isNull(job.getWmsSendNum())){
- job.setWmsSendNum(1);
- }else{
- update.setWmsSendNum(job.getWmsSendNum() + 1);
- }
- update.setWmsSendPlatformCode(job.getPlatformWmsCode());
- 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浣滀笟鍗曞垎閰嶆湀鍙版垚鍔�"+response.getData().get(0).getMsgDescr());
- }else{
- //濡傛灉澶辫触
- update.setWmsSendStatus(Constants.TWO);
- update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙板け璐�:"+(response!=null?JSONObject.toJSONString(response):"鎺ュ彛璋冪敤澶辫触"));
- }
- platformJobMapper.updateById(update);
return response;
}
+
+ private boolean notSendedCode(String iocode, List<String> doneIoCode) {
+ if(doneIoCode!=null){
+ for(String s : doneIoCode){
+ if(StringUtils.equals(iocode,s)){
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
/**
* 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊
* @return
--
Gitblit v1.9.3