From dc5b54657495c06234bb4332af0ca40c5c0b8b18 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:11:12 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 86f8137..d7064fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -6,14 +6,8 @@
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.dao.business.CarsMapper;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformWmsDetailMapper;
-import com.doumee.dao.business.PlatformWmsJobMapper;
-import com.doumee.dao.business.model.Cars;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.dao.business.model.PlatformWmsDetail;
-import com.doumee.dao.business.model.PlatformWmsJob;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.WmsService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +27,8 @@
public class WmsServiceImpl implements WmsService {
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
@Autowired
private CarsMapper carsMapper;
@Autowired
@@ -68,6 +64,7 @@
.last("limit 1" ));
if(job == null){
+
PlatformJob model =dealJobBizInbound(param);
job = new PlatformWmsJob();
job.setCreateDate(new Date());
@@ -90,7 +87,8 @@
entity.setCreateDate(new Date());
entity.setIsdeleted(Constants.ZERO);
entity.setIocode(d.getIoCode());
- entity.setJobId(job.getId());
+ entity.setJobId(job.getJobId());
+ entity.setWmsJobId(job.getId());
entity.setIoQty(d.getIoQty());
entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
@@ -131,6 +129,7 @@
job.setIsdeleted(Constants.ZERO);
job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+ //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
.select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
Constants.PlatformJobStatus.LEAVED+")) as jobNum")
@@ -146,6 +145,11 @@
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
}
}
+ PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,Constants.ONE)
+ .last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
+ job.setPlatformGroupId(group!=null?group.getId():null);
platformJobMapper.insert(job);
return job;
}
@@ -155,6 +159,7 @@
job.setIsdeleted(Constants.ZERO);
job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+ //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
.select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
Constants.PlatformJobStatus.LEAVED+")) as jobNum")
@@ -170,6 +175,11 @@
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
}
}
+ PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
+ .eq(PlatformGroup::getType,Constants.ZERO)
+ .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
+ job.setPlatformGroupId(group!=null?group.getId():null);
platformJobMapper.insert(job);
return job;
}
@@ -213,7 +223,7 @@
job.setPlateNumber(param.getPlateNumber());
job.setType(Constants.ONE);
job.setIoCreatedate(param.getCreateDate());
- job.setJobId(model.getId());
+ job.setJobId(job.getId());
job.setDriverPhone(param.getDriverPhone());
platformWmsJobMapper.insert(job);
jobList.add(model);
@@ -224,7 +234,8 @@
entity.setCreateDate(new Date());
entity.setIsdeleted(Constants.ZERO);
entity.setIocode(d.getIoCode());
- entity.setJobId(job.getId());
+ entity.setJobId(job.getJobId());
+ entity.setWmsJobId(job.getId());
entity.setIoQty(d.getIoQty());
entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
--
Gitblit v1.9.3