From 0a4f2b2a3775c42e3559055d7d8598cbb81cc107 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 九月 2024 18:20:48 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index a82275a..1eea899 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -49,8 +49,8 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鐗╂祦瑁呰揣 1瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�", example = "1")
- @ExcelColumn(name="绫诲瀷 0瀹夋嘲鐗╂祦瑁呰揣 1瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�")
+ @ApiModelProperty(value = "绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�", example = "1")
+ @ExcelColumn(name="绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�")
private Integer type;
@ApiModelProperty(value = "宸ヤ綔寮�濮嬫椂闂�")
@ExcelColumn(name="宸ヤ綔寮�濮嬫椂闂�")
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 4e15f11..80178fc 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
@@ -317,7 +317,7 @@
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
- .eq(PlatformGroup::getType,type==0?Constants.ONE:Constants.ZERO)
+ .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>()
@@ -332,7 +332,6 @@
job.setCompanyId(driver.getCompanyId());
job.setCompanyNamePath(driver.getCompanyNamePath());
}
-
platformJobMapper.insert(job);
}
@@ -390,6 +389,7 @@
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(model.getId());
--
Gitblit v1.9.3