From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 137 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 37 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..03f044d 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
@@ -11,6 +11,7 @@
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.core.wms.model.response.WmsCarInParkDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
@@ -28,6 +29,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;
@@ -83,7 +85,6 @@
@Override
public WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job) {
if(StringUtils.isBlank(job.getBillCode()) || StringUtils.isBlank(job.getPlatformWmsCode())){
-
return null;
}
int type = 0;
@@ -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
@@ -292,9 +321,9 @@
entity.setJobId(job.getJobId());
entity.setContractNum(param.getContractNum());
entity.setWmsJobId(job.getId());
- entity.setIoQty(d.getIoQty());
entity.setStatus(Constants.ZERO);
- entity.setRate(d.getRate());
+ entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
+ entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
entity.setMaterialName(d.getMaterialName());
entity.setInRepertotyCode(d.getInRepertotyCode());
iocodeList.add(d.getIoCode());
@@ -347,7 +376,6 @@
wxPlatNotice.sendWmsTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,job,
WxPlatConstants.platformJobContent.platformJobNewJob,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(driver.getOpenid().split(","))
);
}
@@ -385,6 +413,7 @@
Constants.PlatformJobStatus.IN_WAIT.getKey()+","+
Constants.PlatformJobStatus.CALLED.getKey()+","+
Constants.PlatformJobStatus.TRANSFERING.getKey()+","+
+ Constants.PlatformJobStatus.OVER_NUMBER.getKey()+","+
Constants.PlatformJobStatus.EXCEPTION.getKey()+","+
Constants.PlatformJobStatus.WORKING.getKey()+")) as jobNum")
.lambda()
@@ -416,6 +445,7 @@
}
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsVirtual,Constants.ZERO)//闈炶櫄鎷熸湀鍙�
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
.eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
@@ -527,11 +557,13 @@
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
entity.setContractNum(param.getContractNum());
- entity.setIoQty(d.getIoQty());
- entity.setRepertotyAddress(job.getRepertotyAddress());
+ entity.setRepertotyAddress(param.getRepertotyAddress());
entity.setWmsJobId(job.getId());
entity.setStatus(Constants.ZERO);
- entity.setRate(d.getRate());
+ entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
+ entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
+// entity.setIoQty(d.getIoQty());
+// entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
iocodeList.add(d.getIoCode());
details.add(entity);
@@ -628,8 +660,7 @@
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,job,
- WxPlatConstants.platformJobContent.platformJobCancel,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ WxPlatConstants.platformJobContent.platformJobCancel,
Arrays.asList(driver.getOpenid().split(","))
);
}
@@ -709,7 +740,6 @@
wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,job,
WxPlatConstants.platformJobContent.platformJobCancel,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(driver.getOpenid().split(","))
);
}
@@ -816,4 +846,37 @@
response.getData().add(rData);
return response;
}
+
+
+ @Override
+ public WmsBaseResponse<List<WmsCarInParkDataResponse>> getCarInPark(WmsBaseRequest<String> param) {
+ try {
+ WmsBaseResponse<List<WmsCarInParkDataResponse>> wmsBaseResponse = new WmsBaseResponse();
+ List<Retention> retentionList = retentionMapper.selectList(new QueryWrapper<Retention>().lambda()
+ .eq(Retention::getIsdeleted,Constants.ZERO)
+ .in(Retention::getCarNo,param.getData()));
+ List list = new ArrayList<>();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(retentionList)){
+ for (String carNo:param.getData()) {
+ WmsCarInParkDataResponse wmsCarInParkDataResponse = new WmsCarInParkDataResponse();
+ wmsCarInParkDataResponse.setCarNo(carNo);
+ List<Retention> retentions = retentionList.stream().filter(i->i.getCarNo().equals(carNo)).collect(Collectors.toList());
+ wmsCarInParkDataResponse.setInPark(retentions.size()>Constants.ZERO?true:false);
+ if(wmsCarInParkDataResponse.getInPark()){
+ wmsCarInParkDataResponse.setEventDate(retentions.get(Constants.ZERO).getEventDate());
+ }
+ list.add(wmsCarInParkDataResponse);
+ }
+
+ }
+ wmsBaseResponse.setSuccess(true);
+ wmsBaseResponse.setMessage("鑾峰彇鎴愬姛");
+ wmsBaseResponse.setData(list);
+ return wmsBaseResponse;
+ }catch (Exception e){
+ log.error("銆怶MS銆戝嚭搴撳彇娑堥�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
+ }
+ }
+
}
--
Gitblit v1.9.3