From 26ee9f01a9c27a671f8d39f42e4e19c5c3e7c6b5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 22 八月 2024 15:00:11 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 2560fdc..54652e2 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());
@@ -92,6 +89,7 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getId());
entity.setIoQty(d.getIoQty());
+ entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
entity.setInRepertotyCode(d.getInRepertotyCode());
@@ -130,8 +128,10 @@
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()) as jobNum")
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+ Constants.PlatformJobStatus.LEAVED+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -144,6 +144,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;
}
@@ -153,8 +158,10 @@
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()) as jobNum")
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+ Constants.PlatformJobStatus.LEAVED+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -167,6 +174,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;
}
@@ -223,6 +235,7 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getId());
entity.setIoQty(d.getIoQty());
+ entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
iocodeList.add(d.getIoCode());
@@ -269,11 +282,18 @@
*/
@Override
public WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list) {
- //TODO-------------------澶勭悊鍑哄簱鍙栨秷閫氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
-
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list){
+ iocodeList.add(param.getIoCode());
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.TWO)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
return returnSuccessReuslt(null);
}
/**
@@ -283,10 +303,18 @@
*/
@Override
public WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list) {
- //TODO-------------------澶勭悊鍑哄叆搴撲綔涓氬畬鎴愰�氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list){
+ iocodeList.add(param.getIoCode());
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.ONE)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
return returnSuccessReuslt(null);
}
--
Gitblit v1.9.3