admin/.env.development
@@ -2,6 +2,6 @@ NODE_ENV = 'development' VUE_APP_API_URL = 'http://localhost:10010' # VUE_APP_API_URL = 'http://192.168.0.101:10010' # VUE_APP_API_URL = 'http://192.168.0.103:10010' VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
@@ -8,8 +8,8 @@ <el-form-item label="手机号" prop="phone"> <el-input v-model="searchForm.phone" placeholder="请输入手机号" @keypress.enter.native="search"></el-input> </el-form-item> <el-form-item label="组织名称" prop="companyName"> <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input> <el-form-item label="公司名称" prop="companyName"> <el-input v-model="searchForm.companyName" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input> </el-form-item> <el-form-item label="身份证号" prop="idcardNo"> <el-input v-model="searchForm.idcardNo" placeholder="请输入身份证号" @keypress.enter.native="search"></el-input> @@ -54,7 +54,7 @@ </template> </el-table-column> <el-table-column prop="idcardDecode" label="身份证号" width="150px"></el-table-column> <el-table-column prop="visitCompanyName" label="组织" min-width="100px"></el-table-column> <el-table-column prop="visitCompanyName" label="公司" min-width="100px"></el-table-column> <el-table-column prop="visitTimes" label="拜访次数" min-width="100px"></el-table-column> <el-table-column prop="lastVisitDate" label="最后拜访时间" min-width="100px"></el-table-column> </el-table> admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -50,8 +50,9 @@ <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip /> <el-table-column label="操作" align="center" fixed="right" min-width="100" show-overflow-tooltip> <template v-slot="scope"> <el-button type="text" v-permissions="['business:platformbooks:detail']" <el-button v-if="scope.row.status == 6" type="text" v-permissions="['business:platformbooks:detail']" @click="handleAuth(scope.row)">离园授权</el-button> <span v-else>-</span> </template> </el-table-column> </el-table> @@ -178,8 +179,8 @@ this.$prompt('备注', '离园授权', { confirmButtonText: '确定', cancelButtonText: '取消', }).then(({ remark }) => { platformPowerLevel({ jobId: row.id, remark }).then(res => { }).then(({ value }) => { platformPowerLevel({ jobId: row.id, remark: value }).then(res => { Message.success('离园授权成功') this.getList() }) admin/src/views/platform/index.vue
@@ -314,6 +314,12 @@ this.$nextTick(() => { this.$refs.PlatformQueuingRef.isShowModal = true this.$refs.PlatformQueuingRef.callType = callType this.$refs.PlatformQueuingRef.carCodeFront = '' this.$refs.PlatformQueuingRef.pagination = { total: 0, pageSize: 10, page: 1 } this.$refs.PlatformQueuingRef.activePlat = { ...item } this.$refs.PlatformQueuingRef.getList() this.$refs.PlatformQueuingRef.title = item.name admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@ <span></span> </div> </div> <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all> <el-table v-if="activeGroup.type == 2" class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all> <el-table-column type="index" label="序号" width="80" /> <el-table-column label="车牌号" width="130"> <template slot-scope="{ row }"> @@ -33,13 +33,9 @@ </div> </template> </el-table-column> <el-table-column v-if="activeGroup.type == 2" prop="contractNum" label="合同单号" min-width="120" /> <template v-else> <el-table-column prop="carrierName" label="运输公司" min-width="120" /> <el-table-column prop="billCode" label="运单号" min-width="120" /> </template> <el-table-column prop="contractNum" label="合同单号" min-width="120" /> <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" /> <el-table-column prop="driverName" label="驾驶员" min-width="130"> <el-table-column label="驾驶员" min-width="130"> <template slot-scope="{ row }"> <span class="mr10">{{ row.driverName }}</span> <span>{{ row.drivierPhone }}</span> @@ -48,12 +44,38 @@ <el-table-column prop="signDate" label="签到时间" min-width="150" /> <el-table-column label="操作" align="center" width="100" fixed="right"> <template slot-scope="{ row }"> <el-button v-if="activeGroup.type != 2" type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">运单详情</el-button> <el-button v-if="activeGroup.type == 2" type="text" @click="subDetail(row)">预约详情</el-button> </template> </el-table-column> </el-table> <el-table v-else class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all> <el-table-column type="index" label="序号" width="80" /> <el-table-column label="车牌号" width="130"> <template slot-scope="{ row }"> <div class="plate_id"> <span>{{ row.carCodeFront.slice(0, 1) }}</span> <span>{{ row.carCodeFront.slice(1, 2) }}</span> <span>·</span> <span>{{ row.carCodeFront.slice(2) }}</span> </div> </template> </el-table-column> <el-table-column prop="carrierName" label="运输公司" min-width="120" /> <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" /> <el-table-column label="驾驶员" min-width="130"> <template slot-scope="{ row }"> <span class="mr10">{{ row.driverName }}</span> <span>{{ row.drivierPhone }}</span> </template> </el-table-column> <el-table-column prop="signDate" label="签到时间" min-width="150" /> <el-table-column label="操作" align="center" width="100" fixed="right"> <template slot-scope="{ row }"> <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">运单详情</el-button> </template> </el-table-column> </el-table> <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" /> <!-- --> admin/src/views/statistics/platformRecord.vue
@@ -26,7 +26,7 @@ import QueryForm from '@/components/common/QueryForm' import dayjs from 'dayjs' import duration from 'dayjs/plugin/duration' dayjs.extend(duration); dayjs.extend(duration) import { platformJobPage, getPlatformGroupList } from '@/api' export default { components: { @@ -106,6 +106,7 @@ beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null, beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null, }, sorts: [{ direction: 'DESC', property: 'START_DATE' }], capacity: pagination.pageSize, page: page || pagination.page, }).then(res => { @@ -114,7 +115,7 @@ this.list.forEach(item => { item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟' item.taskOrigin = 'WMS获取' item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒'); item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒') }) this.pagination.total = res.total || 0 }, () => { server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -994,7 +994,7 @@ if (!bookings.getCreator().equals(businessOverDTO.getUserId())) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行取消"); } if (System.currentTimeMillis() > bookings.getStartTime().getTime()) { if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议已开始,无法进行取消"); } if(bookings.getStatus().equals(MeetConstants.ONE)){ server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
@@ -149,7 +149,7 @@ RoomTime s = list.get(i); s.setIsUse(false); s.setIsChoose(false); String now = format.format(roomTime.getYudingDate())+" "+s.getStartTime()+":00"; String now = format.format(roomTime.getYudingDate())+" "+s.getEndTime()+":00"; try { Date com=format1.parse(now); if(flag){ server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -415,7 +415,7 @@ @TableField(exist = false) private String queryType; @ApiModelProperty(value = "电子锁状态：0=未上锁 1=不分上锁 2=全部上锁") @ApiModelProperty(value = "电子锁状态：0=未上锁 1=部分上锁 2=全部上锁") @TableField(exist = false) private Integer lockStatus;
@@ -361,12 +361,30 @@ List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda() .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO) .eq(PlatformWmsDetail::getJobId,platformJob.getId())); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){ platformJob.setTotalNum( platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add) ); platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList); platformJob.setPlatformWmsJob(platformWmsJob); if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh) || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)){ Integer unLockCount = platformWmsDetailList.stream().filter(i->Constants.equalsInteger(i.getLockStatus(),Constants.ZERO)).collect(Collectors.toList()).size(); if(Constants.equalsInteger(unLockCount,Constants.ZERO)){ platformJob.setLockStatus(Constants.TWO); //全部上锁 }else if(Constants.equalsInteger(unLockCount,platformWmsDetailList.size())){ platformJob.setLockStatus(Constants.ZERO); //未上锁 }else{ platformJob.setLockStatus(Constants.ONE); //部分上锁 } } } } } @@ -408,7 +426,7 @@ platformJob.setWaitTime(waitTime); } }else{ platformJob.setWaitTime("等待叫号"); platformJob.setWaitTime("预计等待：-小时-分钟"); } }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey()) || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){ @@ -430,7 +448,6 @@ .ne(PlatformLog::getParam3,Constants.ZERO+"") .orderByDesc(PlatformLog::getCreateDate)); platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum)); } } @@ -463,7 +480,6 @@ //查询前方排队数量 this.queryWaitNum(platformJob); } driverHomeVO.setPlatformJobList(platformJobList);
@@ -107,6 +107,7 @@ public List<PlatformReason> findList(PlatformReason platformReason) { QueryWrapper<PlatformReason> wrapper = new QueryWrapper<>(platformReason); wrapper.eq("isdeleted",Constants.ZERO); wrapper.eq("STATUS",Constants.ZERO); wrapper.orderByAsc("SORTNUM"); return platformReasonMapper.selectList(wrapper); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
@@ -158,6 +158,7 @@ IPage<PlatformWaterGas> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<PlatformWaterGas> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.lambda().eq(PlatformWaterGas::getIsdeleted, Constants.ZERO); if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(PlatformWaterGas::getId, pageWrap.getModel().getId()); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
@@ -22,6 +22,7 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private InterfaceLogService interfaceLogService;
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
