From b882510e16aad7e84d1f50c58831b54ebb5bae22 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 三月 2025 17:19:16 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 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 17f07a1..fc38bc6 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.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;
@@ -72,6 +73,8 @@
private RetentionMapper retentionMapper;
@Autowired
private WxNoticeConfigMapper wxNoticeConfigMapper;
+ @Autowired
+ private PlatformLogMapper platformLogMapper;
/**
* 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊
* @param job 鍙傛暟
@@ -145,10 +148,10 @@
* @return
*/
@Override
- public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
+ 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
@@ -214,6 +217,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);
@@ -241,6 +245,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()){
@@ -276,6 +281,7 @@
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();
@@ -306,6 +312,7 @@
if(details.size()>0){
platformWmsDetailMapper.insert(details);
}
+ list.setJobIdList(jobIdList);
if(jobList.size()>0){
startEndNoticeToDriver(jobList);
}
@@ -344,8 +351,6 @@
}
}
}
-
-
}
}
@@ -370,8 +375,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)
@@ -380,8 +393,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());
@@ -416,6 +431,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) {
@@ -482,10 +513,9 @@
job.setContractNum(param.getContractNum());
job.setDriverPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
-// job.setOrigin(Constants.ONE);
platformWmsJobMapper.insert(job);
}
- jobIdList.add(job.getId());
+ jobIdList.add(job.getJobId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsOutboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -494,6 +524,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());
@@ -518,8 +549,8 @@
if(details.size()>0){
platformWmsDetailMapper.insert(details);
}
+ list.setJobIdList(jobIdList);
if(jobList.size()>0){
- list.setJobIdList(jobIdList);
startEndNoticeToDriver(jobList);
}
}catch (Exception e){
@@ -709,14 +740,13 @@
.eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
if(details!=null && details.size()>0){
for(PlatformWmsDetail d :details){
- num.add(Constants.formatBigdecimal(d.getIoQty()));
+ num = num.add(Constants.formatBigdecimal(d.getIoQty()));
}
- platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
- .set(PlatformJob::getTotalNum,num)
- .eq(PlatformJob::getOrigin, Constants.ZERO)
- .eq(PlatformJob::getId, jobId));
}
-
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getTotalNum,num)
+ .eq(PlatformJob::getOrigin, Constants.ONE)
+ .eq(PlatformJob::getId, jobId));
}
}
/**
--
Gitblit v1.9.3