From 92fd22c7b9a19f9420cb8289c1d43e2db279639a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 17:47:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..2d41a85 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;
}
@@ -382,6 +384,7 @@
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());
@@ -389,7 +392,9 @@
job.setPlateNumber(param.getPlateNumber());
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());
platformWmsJobMapper.insert(job);
jobList.add(model);
--
Gitblit v1.9.3