| admin/src/views/business/internalMember.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/relativeMember.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/platform/LogisticsRecord/waybill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/README.md | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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> 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> 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> 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 & 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() 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());
