From 21ffb032824db3c392f63d318d36efee33326b80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:17:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 9301a87..b5f6916 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,14 +11,15 @@
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.WmsBaseDataResponse;
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;
@@ -242,6 +243,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()){
@@ -277,6 +279,7 @@
platformWmsJobMapper.insert(job);
jobList.add(model);
}
+ jobIdList.add(job.getId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsInboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -308,6 +311,7 @@
platformWmsDetailMapper.insert(details);
}
if(jobList.size()>0){
+ list.setJobIdList(jobIdList);
startEndNoticeToDriver(jobList);
}
}catch (Exception e){
@@ -369,8 +373,16 @@
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.EXCEPTION.getKey()+","+
+ Constants.PlatformJobStatus.WORKING.getKey()+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -379,8 +391,10 @@
//濡傛灉鏄嚜鏈夌墿娴佽溅
job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣
job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍�
- if(retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE)
- .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO && 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());
@@ -493,6 +507,7 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
+ entity.setContractNum(param.getContractNum());
entity.setIoQty(d.getIoQty());
entity.setRepertotyAddress(job.getRepertotyAddress());
entity.setWmsJobId(job.getId());
--
Gitblit v1.9.3