From 7ca424d53d3ce93c4518383f7cded2b84769a395 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 一月 2025 17:40:03 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 7 ++++---
admin/src/views/business/relativeMember.vue | 4 ++--
server/README.md | 6 +++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 6 +++++-
admin/src/views/business/internalMember.vue | 4 ++--
6 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index a5fd7e7..0b2d1f1 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -71,7 +71,7 @@
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="110px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -170,7 +170,7 @@
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
- label="鎿嶄綔" min-width="280" fixed="right">
+ label="鎿嶄綔" min-width="280" >
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 92ed414..98f1b72 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -82,7 +82,7 @@
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="110px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -182,7 +182,7 @@
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
- label="鎿嶄綔" min-width="280" fixed="right">
+ label="鎿嶄綔" min-width="280" >
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 344b30c..c4d2c55 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -22,11 +22,11 @@
<el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="100" show-overflow-tooltip />
<el-table-column prop="driverName" label="鍙告満" min-width="100" show-overflow-tooltip />
<el-table-column prop="drivierPhone" label="鍙告満鐢佃瘽" min-width="100" show-overflow-tooltip />
- <el-table-column prop="wmsContractNum" label="WMS鍚堝悓鍙�" min-width="100" show-overflow-tooltip >
+<!-- <el-table-column prop="wmsContractNum" label="WMS鍚堝悓鍙�" min-width="100" show-overflow-tooltip >
<template v-slot="scope">
<span v-if="scope.row.platformWmsJob">{{ scope.row.platformWmsJob.contractNum }}</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="inTypeTemp" label="浣滀笟绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
<span v-if="scope.row.type == '0'">鑷湁杞﹀嵏璐�</span>
diff --git a/server/README.md b/server/README.md
index fc9ccd0..4cf546a 100644
--- a/server/README.md
+++ b/server/README.md
@@ -21,4 +21,8 @@
#nohup涓嶄骇鐢熸棩蹇楁枃浠跺懡浠わ細
-nohup > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index e5f9d5c..acee3db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -306,7 +306,8 @@
.le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
.isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
.isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
- .exists(StringUtils.isNotBlank(pageWrap.getModel().getWmsContractNum()),"select tt.id from platfrom_wms_detail tt where tt.isdeleted=0 and tt.job_id=t.id");
+ .exists(StringUtils.isNotBlank(pageWrap.getModel().getWmsContractNum()),
+ "select tt.id from platform_wms_detail tt where tt.isdeleted=0 and tt.contract_num='"+pageWrap.getModel().getWmsContractNum()+"' and tt.job_id=t.id");
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -449,9 +450,9 @@
//鏌ヨ鎺掗槦鍦ㄦ垜鍓嶉潰鐨勬暟鎹�
List<PlatformJob> lineUpNum = lineUpAllList.stream().filter(i->Objects.nonNull(i.getSignDate())&&i.getSignDate().getTime()<platformJob.getSignDate().getTime()).collect(Collectors.toList());
platformJob.setLineUpNum(lineUpNum.size());
- BigDecimal sumWorkRate = platformJob.getTotalNum();
+ BigDecimal sumWorkRate = Constants.formatBigdecimal(platformJob.getTotalNum());
for (PlatformJob linePlatformJob:lineUpNum) {
- sumWorkRate = sumWorkRate.add(linePlatformJob.getTotalNum());
+ sumWorkRate = sumWorkRate.add(Constants.formatBigdecimal(linePlatformJob.getTotalNum()));
}
//璁＄畻棰勮绛夊緟鏃堕棿
List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda()
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
index 43c3f82..a38e315 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -106,10 +107,13 @@
Set<String> ioCodeSet = new HashSet<String>(ioCodeList);
List<WmsJobContractVO> wmsJobContractVOList = new ArrayList<>();
for (String ioCode:ioCodeSet) {
+ if(StringUtils.isBlank(ioCode)){
+ continue;
+ }
WmsJobContractVO wmsJobContractVO = new WmsJobContractVO();
wmsJobContractVO.setContractCode(ioCode);
wmsJobContractVO.setPlatformWmsDetailList(
- platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList())
+ platformWmsDetailList.stream().filter(i-> StringUtils.equals(i.getContractNum(),ioCode)).collect(Collectors.toList())
);
if(wmsJobContractVO.getPlatformWmsDetailList()!=null&& wmsJobContractVO.getPlatformWmsDetailList().size()>0){
wmsJobContractVO.setAddress(wmsJobContractVO.getPlatformWmsDetailList().get(0).getRepertotyAddress());
--
Gitblit v1.9.3