From 9b276fecad68c5d5483bfb29a2eaf203f4bb371b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 14 十月 2025 18:12:13 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 362 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 320 insertions(+), 42 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 d02db23..e93d5ea 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
@@ -7,21 +7,36 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.core.utils.SmsConstants;
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.WmsInventoryDataResponse;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.service.business.impl.SmsEmailServiceImpl;
+import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
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;
+import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* WMS骞冲彴瀵规帴Service瀹炵幇
@@ -40,6 +55,8 @@
@Autowired
private MemberMapper memberMapper;
@Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@@ -47,7 +64,18 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private WmsInterfaceLogMapper wmsInterfaceLogMapper;
-
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private EmayService emayService;
+ @Autowired
+ private RetentionMapper retentionMapper;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
+ @Autowired
+ private PlatformLogMapper platformLogMapper;
/**
* 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊
* @param job 鍙傛暟
@@ -56,7 +84,6 @@
@Override
public WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job) {
if(StringUtils.isBlank(job.getBillCode()) || StringUtils.isBlank(job.getPlatformWmsCode())){
-
return null;
}
int type = 0;
@@ -71,43 +98,88 @@
}else{
return null;
}
- WmsOrderPlatformRequest param = new WmsOrderPlatformRequest();
- param.setData(new ArrayList<>());
- WmsOrderPlatformInfoRequest o = new WmsOrderPlatformInfoRequest();
- o.setCarrierBillCode(job.getBillCode());
- o.setRailwayNo(job.getPlatformWmsCode());
- param.getData().add(o);
- String url = type == 0?systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():systemDictDataBiz.queryByCode(Constants.WSM_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());
- 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浣滀笟鍗曞垎閰嶆湀鍙版垚鍔�");
- }else{
- //濡傛灉澶辫触
- update.setWmsSendStatus(Constants.TWO);
- update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙板け璐�:"+(response!=null?JSONObject.toJSONString(response):"鎺ュ彛璋冪敤澶辫触"));
- }
- platformJobMapper.updateById(update);
+ 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);
+ }
+
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
*/
@Override
- public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
- String url = systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
+ public WmsBaseResponse<WmsBaseDataResponse> getInventoryList(){
+ String url = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
String name = "銆怶MS銆戝簱瀛樻煡璇�" ;
- WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
+ WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
if(response!=null
&& response.getData() !=null
&& response.getData().size()>0
@@ -173,6 +245,7 @@
return result;
}catch (Exception e){
success = 1;
+ e.printStackTrace();
log.error("銆�"+name+"銆�================澶辫触===="+ JSONObject.toJSONString(param));
}finally {
saveInterfaceLog(url,name,param,success,res,Constants.ZERO);
@@ -182,9 +255,9 @@
}
private static void logResult(WmsBaseResponse<WmsBaseDataResponse> res,String name) {
if(StringUtils.equals(res.getData().get(0).getSuccess(), WmsBaseResponse.CODE_SUCCESS)){
- log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+res);
+ log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+ JSONObject.toJSONString(res));
}else{
- log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ res);
+ log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ JSONObject.toJSONString(res));
}
}
/**
@@ -200,6 +273,7 @@
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<PlatformJob> jobList = new ArrayList<>();
+ List<Integer> jobIdList = new ArrayList<>();
List<PlatformWmsDetail> details = new ArrayList<>();
List<String> iocodeList = new ArrayList<>();
for(WmsInboundNoticeRequest param : list.getData()){
@@ -222,6 +296,7 @@
job.setIsdeleted(Constants.ZERO);
job.setIsNew(Constants.ONE);
job.setStatus(Constants.ONE);
+ job.setContractNum(param.getContractNum());
job.setCarryBillCode(param.getCarrierBillCode());
job.setIocode(param.getIoCode());
job.setCarrierName(param.getCarrierName());
@@ -229,11 +304,13 @@
job.setPlateNumber(param.getPlateNumber());
job.setType(Constants.ZERO);
job.setIoCreatedate(param.getCreateDate());
+// job.setOrigin(Constants.ONE);
job.setJobId(model.getId());
job.setDriverPhone(param.getDriverPhone());
platformWmsJobMapper.insert(job);
jobList.add(model);
}
+ jobIdList.add(job.getJobId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsInboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -241,10 +318,11 @@
entity.setIsdeleted(Constants.ZERO);
entity.setIocode(d.getIoCode());
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());
@@ -264,6 +342,7 @@
if(details.size()>0){
platformWmsDetailMapper.insert(details);
}
+ list.setJobIdList(jobIdList);
if(jobList.size()>0){
startEndNoticeToDriver(jobList);
}
@@ -274,9 +353,33 @@
return returnSuccessReuslt(null);
}
+
private void startEndNoticeToDriver(List<PlatformJob> jobList) {
for(PlatformJob job : jobList){
- //-----TODO-----------浠诲悍锛屽彂閫佸徃鏈哄叕浼楀彿鍜岀煭淇￠�氱煡
+ //鐭俊閫氱煡
+ if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,job.getId(),
+ SmsConstants.platformJobContent.platformJobNewJob,null,null
+ );
+ //鏌ヨ鍙告満淇℃伅 鍙戦�佸叕浼楀彿閫氱煡
+ if(Objects.nonNull(job.getDriverId())){
+ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobNewJob,
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
+ }
}
}
@@ -291,6 +394,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
dealCarPlatformAndDriverInfo(job,0);
// platformJobMapper.insert(job);
@@ -300,8 +404,17 @@
private void dealCarPlatformAndDriverInfo(PlatformJob job,int type) {
//鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
- .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' and b.status in("+
- Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' " +
+ "and b.status in("+
+ Constants.PlatformJobStatus.WART_SIGN_IN.getKey()+","+
+ Constants.PlatformJobStatus.WART_SIGN_IN.getKey()+","+
+ Constants.PlatformJobStatus.WAIT_CALL.getKey()+","+
+ 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()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -310,12 +423,28 @@
//濡傛灉鏄嚜鏈夌墿娴佽溅
job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣
job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍�
- if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
+ if(job.getType() ==Constants.platformJobType.zyczh
+ && retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE)
+ .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO
+ && car.getJobNum() == 0){
//濡傛灉杞﹁締鍦ㄥ洯
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
+ 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()
+ .eq(PlatformGroup::getIsVirtual,Constants.ZERO)//闈炶櫄鎷熸湀鍙�
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
.eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
@@ -333,6 +462,22 @@
job.setCompanyNamePath(driver.getCompanyNamePath());
}
platformJobMapper.insert(job);
+ if(car !=null){
+ //瀛樺偍鎿嶄綔鏃ュ織
+ PlatformLog platformLog = new PlatformLog();
+ platformLog.setIsdeleted(Constants.ZERO);
+ platformLog.setCreateDate(new Date());
+ platformLog.setJobId(job.getId());
+ platformLog.setObjType(Constants.PlatformJobLogType.SIGN.getKey());
+ platformLog.setContent("鑷姩绛惧埌");
+ platformLog.setParam4(job.getCarCodeFront());
+ platformLog.setAfterContent(JSONObject.toJSONString(job));
+ platformLog.setObjId(job.getId().toString());
+ platformLog.setParam3("0");
+ platformLogMapper.insert(platformLog);
+ }
+
+
}
private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {
@@ -346,6 +491,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
dealCarPlatformAndDriverInfo(job,1);
return job;
@@ -363,6 +509,7 @@
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<PlatformJob> jobList = new ArrayList<>();
+ List<Integer> jobIdList = new ArrayList<>();
List<PlatformWmsDetail> details = new ArrayList<>();
List<String> iocodeList = new ArrayList<>();
for(WmsOutboundNoticeRequest param : list.getData()){
@@ -398,8 +545,8 @@
job.setDriverPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
platformWmsJobMapper.insert(job);
- jobList.add(model);
}
+ jobIdList.add(job.getJobId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsOutboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -408,10 +555,14 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
- entity.setIoQty(d.getIoQty());
+ entity.setContractNum(param.getContractNum());
+ 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);
@@ -425,11 +576,13 @@
.in(PlatformWmsDetail::getIocode,iocodeList)
);
}
+ jobIdList.add(job.getId());
}
}
if(details.size()>0){
platformWmsDetailMapper.insert(details);
}
+ list.setJobIdList(jobIdList);
if(jobList.size()>0){
startEndNoticeToDriver(jobList);
}
@@ -465,6 +618,57 @@
.set(PlatformWmsDetail::getStatus,Constants.TWO)
.in(PlatformWmsDetail::getIocode,iocodeList)
.eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+
+ platformWmsJobMapper.update(null,new UpdateWrapper<PlatformWmsJob>().lambda()
+ .set(PlatformWmsJob::getStatus,Constants.TWO)
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO));
+
+ List<PlatformWmsJob> platformWmsJob = platformWmsJobMapper.selectList(new QueryWrapper<PlatformWmsJob>().lambda()
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsJob)){
+ List<Integer> jobIds = platformWmsJob.stream().filter(i->Objects.nonNull(i.getJobId())).map(i->i.getJobId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIds)){
+ Set<Integer> setJobIds = new HashSet<>(jobIds);
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>()
+ .lambda()
+ .set(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .in(PlatformJob::getId,setJobIds)
+ );
+
+ for (Integer jobId:setJobIds
+ ) {
+ //鐭俊閫氱煡
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,jobId,
+ SmsConstants.platformJobContent.platformJobStopJob,null,null
+ );
+ //鍏紬鍙烽�氱煡鍙告満 浠诲姟鍙栨秷
+ PlatformJob job = platformJobMapper.selectById(jobId);
+ if(Objects.nonNull(job)){
+
+ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
+
+ }
+ }
+ }
+
}catch (Exception e){
log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
return returnFailReuslt("涓氬姟澶勭悊寮傚父");
@@ -496,6 +700,54 @@
.set(PlatformWmsDetail::getStatus,Constants.TWO)
.in(PlatformWmsDetail::getIocode,iocodeList)
.eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+
+ platformWmsJobMapper.update(null,new UpdateWrapper<PlatformWmsJob>().lambda()
+ .set(PlatformWmsJob::getStatus,Constants.TWO)
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO));
+
+ List<PlatformWmsJob> platformWmsJob = platformWmsJobMapper.selectList(new QueryWrapper<PlatformWmsJob>().lambda()
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsJob)){
+ List<Integer> jobIds = platformWmsJob.stream().filter(i->Objects.nonNull(i.getJobId())).map(i->i.getJobId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIds)){
+ Set<Integer> setJobIds = new HashSet<>(jobIds);
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>()
+ .lambda()
+ .set(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .in(PlatformJob::getId,setJobIds)
+ );
+ for (Integer jobId:setJobIds
+ ) {
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,jobId,
+ SmsConstants.platformJobContent.platformJobStopJob,null,null
+ );
+
+ //鍏紬鍙烽�氱煡鍙告満 浠诲姟鍙栨秷
+ PlatformJob job = platformJobMapper.selectById(jobId);
+ if(Objects.nonNull(job)){ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
+ }
+ }
+ }
+
+
}catch (Exception e){
log.error("銆怶MS銆戝嚭搴撳彇娑堥�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
return returnFailReuslt("涓氬姟澶勭悊寮傚父");
@@ -503,6 +755,32 @@
return returnSuccessReuslt(null);
}
/**
+ * 澶勭悊浣滀笟琛屾暟鎹殑杩愯緭鎬婚噺淇℃伅
+ * @param jobList 鍙傛暟
+ * @return
+ */
+ @Override
+ public void computjobTotalNum(List<Integer> jobList) {
+ if(jobList==null || jobList.size()==0){
+ return;
+ }
+ for(Integer jobId : jobList){
+ BigDecimal num = new BigDecimal(0);
+ List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList( new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getJobId,jobId)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+ if(details!=null && details.size()>0){
+ for(PlatformWmsDetail d :details){
+ num = num.add(Constants.formatBigdecimal(d.getIoQty()));
+ }
+ }
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getTotalNum,num)
+ .eq(PlatformJob::getOrigin, Constants.ONE)
+ .eq(PlatformJob::getId, jobId));
+ }
+ }
+ /**
* 浣滀笟瀹屾垚閫氱煡浠诲姟涓氬姟澶勭悊
* @param list 鍙傛暟
* @return
--
Gitblit v1.9.3