From 45eba96821e886b5ae738e30af5332d27589c7b3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 14 九月 2024 14:37:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 360 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 205 insertions(+), 155 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 0096a70..9dac51d 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
@@ -192,75 +192,80 @@
@Override
@Transactional
public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list) {
- if(list ==null || list.getData()==null|| list.getData().size() ==0){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
- }
- List<PlatformJob> jobList = new ArrayList<>();
- List<PlatformWmsDetail> details = new ArrayList<>();
- List<String> iocodeList = new ArrayList<>();
- for(WmsInboundNoticeRequest param : list.getData()){
- if(StringUtils.isBlank(param.getIoCode()) ||
- StringUtils.isBlank(param.getCarrierBillCode())||
- StringUtils.isBlank(param.getPlateNumber())||
- StringUtils.isBlank(param.getDriverPhone())){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
+ try{
+ if(list ==null || list.getData()==null|| list.getData().size() ==0){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
- //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
- PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
- .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
- .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
- .last("limit 1" ));
-
- if(job == null){
-
- PlatformJob model =dealJobBizInbound(param);
- job = new PlatformWmsJob();
- job.setCreateDate(new Date());
- job.setIsdeleted(Constants.ZERO);
- job.setIsNew(Constants.ONE);
- job.setCarryBillCode(param.getCarrierBillCode());
- job.setIocode(param.getIoCode());
- job.setCarrierName(param.getCarrierName());
- job.setPlateNumber(param.getPlateNumber());
- job.setType(Constants.ONE);
- job.setIoCreatedate(param.getCreateDate());
- job.setJobId(model.getId());
- job.setDriverPhone(param.getDriverPhone());
- platformWmsJobMapper.insert(job);
- jobList.add(model);
- }
- if(param.getDetails()!=null && param.getDetails().size()>0){
- for(WmsInboundDetailRequest d :param.getDetails()){
- PlatformWmsDetail entity = new PlatformWmsDetail();
- entity.setCreateDate(new Date());
- entity.setIsdeleted(Constants.ZERO);
- entity.setIocode(d.getIoCode());
- entity.setJobId(job.getJobId());
- entity.setWmsJobId(job.getId());
- entity.setIoQty(d.getIoQty());
- entity.setStatus(Constants.ZERO);
- entity.setRate(d.getRate());
- entity.setMaterialName(d.getMaterialName());
- entity.setInRepertotyCode(d.getInRepertotyCode());
- iocodeList.add(d.getIoCode());
- details.add(entity);
+ List<PlatformJob> jobList = new ArrayList<>();
+ List<PlatformWmsDetail> details = new ArrayList<>();
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsInboundNoticeRequest param : list.getData()){
+ if(StringUtils.isBlank(param.getIoCode()) ||
+ StringUtils.isBlank(param.getCarrierBillCode())||
+ StringUtils.isBlank(param.getPlateNumber())||
+ StringUtils.isBlank(param.getDriverPhone())){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
}
- if(job.getIsNew() == 1&& iocodeList.size()>0){
- //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
- platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
- .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
- .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
- .eq(PlatformWmsDetail::getJobId,job.getJobId())
- .in(PlatformWmsDetail::getIocode,iocodeList)
- );
+ //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+ PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+ .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ .last("limit 1" ));
+
+ if(job == null){
+
+ PlatformJob model =dealJobBizInbound(param);
+ job = new PlatformWmsJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setIsNew(Constants.ONE);
+ job.setCarryBillCode(param.getCarrierBillCode());
+ job.setIocode(param.getIoCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setPlateNumber(param.getPlateNumber());
+ job.setType(Constants.ONE);
+ job.setIoCreatedate(param.getCreateDate());
+ job.setJobId(model.getId());
+ job.setDriverPhone(param.getDriverPhone());
+ platformWmsJobMapper.insert(job);
+ jobList.add(model);
+ }
+ if(param.getDetails()!=null && param.getDetails().size()>0){
+ for(WmsInboundDetailRequest d :param.getDetails()){
+ PlatformWmsDetail entity = new PlatformWmsDetail();
+ entity.setCreateDate(new Date());
+ entity.setIsdeleted(Constants.ZERO);
+ entity.setIocode(d.getIoCode());
+ entity.setJobId(job.getJobId());
+ entity.setWmsJobId(job.getId());
+ entity.setIoQty(d.getIoQty());
+ entity.setStatus(Constants.ZERO);
+ entity.setRate(d.getRate());
+ entity.setMaterialName(d.getMaterialName());
+ entity.setInRepertotyCode(d.getInRepertotyCode());
+ iocodeList.add(d.getIoCode());
+ details.add(entity);
+ }
+ if(job.getIsNew() != 1&& iocodeList.size()>0){
+ //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getWmsJobId,job.getId())
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ );
+ }
}
}
- }
- if(details.size()>0){
- platformWmsDetailMapper.insert(details);
- }
- if(jobList.size()>0){
- startEndNoticeToDriver(jobList);
+ if(details.size()>0){
+ platformWmsDetailMapper.insert(details);
+ }
+ if(jobList.size()>0){
+ startEndNoticeToDriver(jobList);
+ }
+ }catch (Exception e){
+ log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
}
return returnSuccessReuslt(null);
}
@@ -331,8 +336,6 @@
platformJobMapper.insert(job);
return job;
}
-
-
/**
* 鍑哄簱閫氱煡浠诲姟涓氬姟澶勭悊
* @param list 鍙傛暟
@@ -340,73 +343,80 @@
*/
@Override
public WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list) {
- if(list ==null ||list.getData()==null || list.getData().size() ==0){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
- }
- List<PlatformJob> jobList = new ArrayList<>();
- List<PlatformWmsDetail> details = new ArrayList<>();
- List<String> iocodeList = new ArrayList<>();
- for(WmsOutboundNoticeRequest param : list.getData()){
- if(StringUtils.isBlank(param.getIoCode()) ||
- StringUtils.isBlank(param.getCarrierBillCode())||
- StringUtils.isBlank(param.getPlateNumber())||
- StringUtils.isBlank(param.getDriverPhone())){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
- }
- //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
- PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
- .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
- .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
- .last("limit 1" ));
- if(job == null){
- PlatformJob model =dealJobBizOutbound(param);
- job = new PlatformWmsJob();
- job.setCreateDate(new Date());
- job.setIsdeleted(Constants.ZERO);
- job.setIsNew(Constants.ONE);
- job.setCarryBillCode(param.getCarrierBillCode());
- job.setIocode(param.getIoCode());
- job.setCarrierName(param.getCarrierName());
- job.setPlateNumber(param.getPlateNumber());
- job.setType(Constants.ONE);
- job.setIoCreatedate(param.getCreateDate());
- job.setJobId(job.getId());
- job.setDriverPhone(param.getDriverPhone());
- platformWmsJobMapper.insert(job);
- jobList.add(model);
+ try{
+ if(list ==null ||list.getData()==null || list.getData().size() ==0){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
- if(param.getDetails()!=null && param.getDetails().size()>0){
- for(WmsOutboundDetailRequest d :param.getDetails()){
- PlatformWmsDetail entity = new PlatformWmsDetail();
- entity.setCreateDate(new Date());
- entity.setIsdeleted(Constants.ZERO);
- entity.setIocode(d.getIoCode());
- entity.setJobId(job.getJobId());
- entity.setWmsJobId(job.getId());
- entity.setIoQty(d.getIoQty());
- entity.setStatus(Constants.ZERO);
- entity.setRate(d.getRate());
- entity.setMaterialName(d.getMaterialName());
- iocodeList.add(d.getIoCode());
- details.add(entity);
+ List<PlatformJob> jobList = new ArrayList<>();
+ List<PlatformWmsDetail> details = new ArrayList<>();
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsOutboundNoticeRequest param : list.getData()){
+ if(StringUtils.isBlank(param.getIoCode()) ||
+ StringUtils.isBlank(param.getCarrierBillCode())||
+ StringUtils.isBlank(param.getPlateNumber())||
+ StringUtils.isBlank(param.getDriverPhone())){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
}
- if(job.getIsNew() == 1&& iocodeList.size()>0){
- //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
- platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
- .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
- .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
- .eq(PlatformWmsDetail::getJobId,job.getJobId())
- .in(PlatformWmsDetail::getIocode,iocodeList)
- );
+ //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+ PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+ .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ .last("limit 1" ));
+
+ if(job == null){
+ PlatformJob model =dealJobBizOutbound(param);
+ job = new PlatformWmsJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setIsNew(Constants.ONE);
+ job.setCarryBillCode(param.getCarrierBillCode());
+ job.setIocode(param.getIoCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setPlateNumber(param.getPlateNumber());
+ job.setType(Constants.ONE);
+ job.setIoCreatedate(param.getCreateDate());
+ job.setJobId(job.getId());
+ job.setDriverPhone(param.getDriverPhone());
+ platformWmsJobMapper.insert(job);
+ jobList.add(model);
+ }
+ if(param.getDetails()!=null && param.getDetails().size()>0){
+ for(WmsOutboundDetailRequest d :param.getDetails()){
+ PlatformWmsDetail entity = new PlatformWmsDetail();
+ entity.setCreateDate(new Date());
+ entity.setIsdeleted(Constants.ZERO);
+ entity.setIocode(d.getIoCode());
+ entity.setJobId(job.getJobId());
+ entity.setWmsJobId(job.getId());
+ entity.setIoQty(d.getIoQty());
+ entity.setWmsJobId(job.getId());
+ entity.setStatus(Constants.ZERO);
+ entity.setRate(d.getRate());
+ entity.setMaterialName(d.getMaterialName());
+ iocodeList.add(d.getIoCode());
+ details.add(entity);
+ }
+ if(job.getIsNew() != 1 && iocodeList.size()>0){
+ //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getWmsJobId,job.getId())
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ );
+ }
}
}
- }
- if(details.size()>0){
- platformWmsDetailMapper.insert(details);
- }
- if(jobList.size()>0){
- startEndNoticeToDriver(jobList);
+ if(details.size()>0){
+ platformWmsDetailMapper.insert(details);
+ }
+ if(jobList.size()>0){
+ startEndNoticeToDriver(jobList);
+ }
+ }catch (Exception e){
+ log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
}
return returnSuccessReuslt(null);
}
@@ -417,9 +427,28 @@
*/
@Override
public WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
- //TODO-------------------澶勭悊鍏ュ簱鍙栨秷閫氱煡涓氬姟--------------------
- if(list ==null||list.getData()==null || list.getData().size() ==0){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ //-----------------澶勭悊鍏ュ簱鍙栨秷閫氱煡涓氬姟--------------------
+ try {
+ if(list ==null||list.getData()==null || list.getData().size() ==0 || list.getData().get(0).getIoCode() == null){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list.getData()){
+ if(StringUtils.isNotBlank(param.getIoCode())){
+ iocodeList.add(param.getIoCode());
+ }
+ }
+ if(iocodeList.size() ==0 ){
+ return returnFailReuslt("璇锋眰鍙傛暟iocode涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.TWO)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+ }catch (Exception e){
+ log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
}
return returnSuccessReuslt(null);
}
@@ -430,18 +459,28 @@
*/
@Override
public WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
- if(list ==null||list.getData()==null || list.getData().size() ==0){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ try {
+ if(list ==null||list.getData()==null || list.getData().size() ==0 ){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list.getData()){
+ if(StringUtils.isNotBlank(param.getIoCode())){
+ iocodeList.add(param.getIoCode());
+ }
+ }
+ if(iocodeList.size() ==0 ){
+ return returnFailReuslt("璇锋眰鍙傛暟iocode涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.TWO)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+ }catch (Exception e){
+ log.error("銆怶MS銆戝嚭搴撳彇娑堥�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
}
- List<String> iocodeList = new ArrayList<>();
- for(WmsActionNoticeRequest param :list.getData()){
- 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);
}
/**
@@ -451,19 +490,28 @@
*/
@Override
public WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list) {
- if(list ==null||list.getData()==null || list.getData().size() ==0){
- return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ try {
+ if(list ==null||list.getData()==null || list.getData().size() ==0){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list.getData()){
+ if(StringUtils.isNotBlank(param.getIoCode())){
+ iocodeList.add(param.getIoCode());
+ }
+ }
+ if(iocodeList.size() ==0 ){
+ return returnFailReuslt("璇锋眰鍙傛暟iocode涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.ONE)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+ }catch (Exception e){
+ log.error("銆怶MS銆戜綔涓氬畬鎴愰�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
+ return returnFailReuslt("涓氬姟澶勭悊寮傚父");
}
- List<String> iocodeList = new ArrayList<>();
- for(WmsActionNoticeRequest param :list.getData()){
- 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);
}
@@ -475,6 +523,7 @@
private WmsBaseResponse returnFailReuslt(String msg) {
WmsBaseResponse response = new WmsBaseResponse();
+ response.setCode(-1);
response.setData(new ArrayList<>());
WmsBaseDataResponse rData = new WmsBaseDataResponse();
rData.setMsgDescr(msg);
@@ -491,6 +540,7 @@
private WmsBaseResponse returnSuccessReuslt(String msg) {
WmsBaseResponse response = new WmsBaseResponse();
+ response.setCode(1);
response.setData(new ArrayList<>());
WmsBaseDataResponse rData = new WmsBaseDataResponse();
rData.setMsgDescr(StringUtils.defaultString(msg,"鎿嶄綔鎴愬姛"));
--
Gitblit v1.9.3