From af3434a79c2a096105668273cfa27c09eacf6ff1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 09:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 4aed3c4..fb0e58e 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
@@ -221,11 +221,13 @@
job.setCreateDate(new Date());
job.setIsdeleted(Constants.ZERO);
job.setIsNew(Constants.ONE);
+ job.setStatus(Constants.ONE);
job.setCarryBillCode(param.getCarrierBillCode());
job.setIocode(param.getIoCode());
job.setCarrierName(param.getCarrierName());
+ job.setDriverName(param.getDriverName());
job.setPlateNumber(param.getPlateNumber());
- job.setType(Constants.ONE);
+ job.setType(Constants.ZERO);
job.setIoCreatedate(param.getCreateDate());
job.setJobId(model.getId());
job.setDriverPhone(param.getDriverPhone());
@@ -291,7 +293,7 @@
job.setDriverName(param.getDriverName());
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
dealCarPlatformAndDriverInfo(job,0);
- platformJobMapper.insert(job);
+// platformJobMapper.insert(job);
return job;
}
@@ -315,7 +317,7 @@
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
- .eq(PlatformGroup::getType,Constants.ONE)
+ .eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
job.setPlatformGroupId(group!=null?group.getId():null);
Member driver = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
@@ -330,7 +332,6 @@
job.setCompanyId(driver.getCompanyId());
job.setCompanyNamePath(driver.getCompanyNamePath());
}
-
platformJobMapper.insert(job);
}
@@ -382,15 +383,20 @@
job = new PlatformWmsJob();
job.setCreateDate(new Date());
job.setIsdeleted(Constants.ZERO);
+ job.setStatus(Constants.ZERO);
job.setIsNew(Constants.ONE);
job.setCarryBillCode(param.getCarrierBillCode());
job.setIocode(param.getIoCode());
job.setCarrierName(param.getCarrierName());
job.setPlateNumber(param.getPlateNumber());
+ job.setDriverName(param.getDriverName());
job.setType(Constants.ONE);
job.setIoCreatedate(param.getCreateDate());
- job.setJobId(job.getId());
+ job.setJobId(model.getId());
+ job.setRepertotyAddress(param.getRepertotyAddress());
+ job.setContractNum(param.getContractNum());
job.setDriverPhone(param.getDriverPhone());
+ job.setDriverName(param.getDriverName());
platformWmsJobMapper.insert(job);
jobList.add(model);
}
--
Gitblit v1.9.3