From b200a67474c0cde5fe8d6ce7dd4d604675de2129 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 九月 2025 17:08:20 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 224 +++++++++++++++++++++++++++++++++----
admin/src/components/business/OperaPlatformWindow.vue | 12 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 37 +++---
admin/src/views/platform/set/index.vue | 14 ++
server/doc/月台自动加号数据库变动脚本.md | 3
admin/src/api/platform/index.js | 4
admin/src/views/platform/platform.vue | 17 ++
7 files changed, 264 insertions(+), 47 deletions(-)
diff --git a/admin/src/api/platform/index.js b/admin/src/api/platform/index.js
index c663d9c..4e07a6e 100644
--- a/admin/src/api/platform/index.js
+++ b/admin/src/api/platform/index.js
@@ -135,6 +135,10 @@
export function dealJobFinish (data) {
return request.post('/visitsAdmin/cloudService/business/platformJob/dealJobFinish', data)
}
+// 鏇存崲鏈堝彴缁�
+export function changPlatformGroup (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformJob/changPlatformGroup', data)
+}
// 鎭㈠浣滀笟
export function restoreWork (data) {
return request.post('/visitsAdmin/cloudService/business/platformJob/restoreWork', data)
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index ea0d065..d8d4ff0 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -14,6 +14,12 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏈堝彴绫诲瀷" prop="type" >
+ <el-radio-group v-model="form.type" >
+ <el-radio :label="0">鏁存墭鐩�</el-radio>
+ <el-radio :label="1">鏁ｄ欢</el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item label="骞挎挱璁惧锛�" prop="broadcastIds">
<el-select v-model="form.broadcastIds" multiple>
<el-option v-for="item in broadcastList" :key="item.id" :label="item.name" :value="item.id">
@@ -31,6 +37,9 @@
</el-form-item>
<el-form-item label="鍚屾椂浣滀笟鏁伴噺锛�" prop="workingNum">
<el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�" v-trim />
+ </el-form-item>
+ <el-form-item label="鍚屾椂鍑嗗浣滀笟鏁伴噺锛�" prop="callReadyNum">
+ <el-input type="number" v-model="form.callReadyNum" placeholder="璇疯緭鍏ュ悓鏃跺噯澶囦綔涓氭暟閲�" v-trim />
</el-form-item>
<el-form-item label="鏈堝彴浣滀笟鏁堢巼(涓囨敮/灏忔椂)锛�" prop="workRate">
<el-input type="number" v-model="form.workRate" placeholder="璇疯緭鍏ユ湀鍙颁綔涓氭晥鐜�(涓囨敮/灏忔椂)" v-trim />
@@ -67,6 +76,7 @@
form: {
id: null,
ledIds: null,
+ type:0,
broadcastIds: null,
name: '',
code: '',
@@ -74,6 +84,7 @@
startTime: '',
endTime: '',
workingNum: 1,
+ 鍚屾椂浣滀笟鏁伴噺: 0,
ledContent: '',
workRate: '',
stayTimeoutAlarmTime: '',
@@ -83,6 +94,7 @@
// 楠岃瘉瑙勫垯
rules: {
workingNum: [{ required: true, validator: numRuleGtZero, message: '璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�,蹇呴』澶т簬0! ', trigger: 'blur' }],
+ type: [{ required: true, message: '鏈堝彴绫诲瀷涓嶈兘涓虹┖锛�', trigger: 'blur' }],
sortnum: [{ required: true, message: '鎺掑簭鐮佷笉鑳戒负绌猴紒', trigger: 'blur' }]
}
}
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index f40ad7f..b80fc18 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -23,11 +23,16 @@
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺锛堜竾鏀級" min-width="130" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
<!-- <el-table-column prop="carCodeBack" label="杞︾墝鍚庣収鍙�" min-width="100" show-overflow-tooltip /> -->
- <el-table-column prop="taskOrigin" label="浠诲姟鏉ユ簮" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="origin" label="浠诲姟鏉ユ簮" min-width="100" show-overflow-tooltip >
+ <template v-slot="scope">
+ <span v-if="scope.row.origin == 1">WMS鑾峰彇</span>
+ <span v-else>鑷缓浠诲姟</span>
+ </template>
+ </el-table-column>
<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>
@@ -39,6 +44,17 @@
<span v-if="scope.row.type == '2'">澶栧崗杞﹀嵏璐�</span>
<span v-if="scope.row.type == '3'">澶栧崗杞﹁璐�</span>
<span v-if="scope.row.type == '4'">甯傚叕鍙稿鍗忚溅鍗歌揣</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="platformGroupName" label="浣滀笟鏈堝彴缁�" min-width="150" show-overflow-tooltip >
+ <template v-slot="scope">
+ <div style="display: flex;align-items: center;align-content: center;width: 100%">
+ <div style="max-width: 100px;display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-wrap: break-word;">{{scope.row.platformGroupName||'-'}}</div>
+ <el-button type="text" style="font-size: 10px;color: red;margin-top: 5px;margin-left: 10px " @click="changeGroup(scope.row)" v-if="[0,1,2].includes(scope.row.status)">鏇存崲</el-button>
+ </div>
</template>
</el-table-column>
<el-table-column prop="ioCreatedate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
@@ -62,20 +78,68 @@
<!-- -->
<!-- -->
<WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
+ <el-dialog append-to-body title="鏇存崲鏈堝彴缁�" style="text-align: center" class="dialogCl" :visible.sync="showChangeGroup" width="480px" top="10%">
+ <div class="head" v-if="showChangeGroup && curRow">
+ <div class="plate" v-if="curRow.carCodeFront">
+ <span>{{ curRow.carCodeFront.slice(0, 1) }}</span>
+ <span>{{ curRow.carCodeFront.slice(1, 2) }}</span>
+ <span>路</span>
+ <span>{{ curRow.carCodeFront.slice(2) }}</span>
+ </div>
+ <div class="list">
+ <div class="item">
+ <span>杩愯緭鍗曞彿锛�</span>
+ <span>{{ curRow.billCode }}</span>
+ </div>
+ <div class="item">
+ <span>鎬昏繍杈撻噺锛�</span>
+ <span>{{ curRow.totalNum }}涓囨敮</span>
+ </div>
+ <div class="item">
+ <span>椹鹃┒鍛橈細</span>
+ <span>{{ curRow.driverName }} {{ curRow.drivierPhone }}</span>
+ </div>
+ <div class="item">
+ <span>褰撳墠鏈堝彴缁勶細</span>
+ <span>{{ curRow.platformGroupName }}</span>
+ </div>
+ </div>
+ </div>
+ <el-form :model="groupForm" ref="form" >
+ <el-form-item label="閫夋嫨鏈堝彴缁�" prop="platformGroupId" required>
+ <el-select v-model="groupForm.platformGroupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍 ">
+ <el-option v-for="item in rowGroupList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="showChangeGroup = false">鍙栨秷</el-button>
+ <el-button type="primary" :loading="dealing" @click="changeGroupDo">纭畾</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage, platformJobExport, platformJobDel, dealJobFinish ,updateTotalNum} from '@/api'
+import {
+ platformJobPage,
+ platformJobExport,
+ platformJobDel,
+ dealJobFinish,
+ updateTotalNum,
+ changPlatformGroup
+} from '@/api'
import { statusMap } from '../config'
-import WaybillDetailRef from "../components/WaybillDetail.vue"
+import WaybillDetailRef from '../components/WaybillDetail.vue'
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import BaseComputHeight from '@/components/base/BaseComputHeight'
+import { allList } from '@/api/platform/platformGroup'
export default {
extends: BaseComputHeight,
components: {
@@ -85,10 +149,15 @@
GlobalWindow,
UploadFaceImg
},
- data() {
+ data () {
return {
+ groupList: [],
+ rowGroupList: [],
+ dealing:false,
statusMap,
+ curRow:null,
isShowDetail: false,
+ showChangeGroup: false,
exLoading: false,
updateLoading: false,
loading: false,
@@ -104,6 +173,11 @@
createDateEnd: ''
},
list: [],
+ groupForm:{
+ id:null,
+ platformGroupId:null,
+ platformGroupName:null
+ },
queryFormConfig: {
formItems: [
{
@@ -143,7 +217,7 @@
{ value: 9, label: '宸叉巿鏉冪鍥�' },
// { value: 10, label: '宸茬鍥�' },
{ value: 11, label: '宸茶繃鍙�' },
- { value: 12, label: '宸插彇娑�' },
+ { value: 12, label: '宸插彇娑�' }
]
},
{
@@ -175,18 +249,25 @@
ids: []
}
},
- created() {
+ created () {
this.changeRadio('0')
this.$nextTick(() => {
this.$refs.QueryForm.zkBtn()
})
+ this.loadGroupList()
},
methods: {
- handleSelectionChange(ids) {
+ loadGroupList () {
+ allList({})
+ .then(res => {
+ this.groupList = res || []
+ })
+ },
+ handleSelectionChange (ids) {
this.ids = ids.map(item => item.id)
},
- complete(ids) {
- var that = this;
+ complete (ids) {
+ var that = this
if (ids.length === 0) {
return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
}
@@ -201,31 +282,72 @@
})
}).catch(() => {
- });
+ })
},
- changeRadio(day) {
+ changeGroupDo () {
+ var that = this
+ if (!this.groupForm.id || !this.groupForm.platformGroupId) {
+ return this.$message.warning('璇烽�夋嫨鏈堝彴缁�')
+ }
+ changPlatformGroup(this.groupForm)
+ .then(res => {
+ that.showChangeGroup=false
+ that.getList()
+ })
+ },
+ changeGroup (row) {
+ this.groupForm.id = null
+ this.groupForm.platformGroupName = null
+ this.groupForm.platformGroupId = null
+ this.rowGroupList = []
+ this.curRow=null
+ var type = 0
+ if (row.type === 0 || row.type === 2) {
+ // 瀹夋嘲鐗╂祦鍗歌揣
+ type = 0
+ } else if (row.type === 1 || row.type === 3) {
+ // 瀹夋嘲鐗╂祦瑁呰揣
+ type = 1
+ } else if (row.type === 4) {
+ // 甯傚叕鍙稿鍗忚溅鍗歌揣
+ type = 2
+ } else {
+ return this.$message.warning('浣滀笟浠诲姟绫诲瀷鏈夎锛屼笉鏀寔鏈堝彴缁勫垏鎹紒')
+ }
+ this.curRow =row
+ this.groupForm.id = row.id
+ this.groupForm.platformGroupName = row.platformGroupName
+ this.groupForm.platformGroupId = row.platformGroupId
+ this.groupList.forEach(item => {
+ if (item.type === type) {
+ this.rowGroupList.push(item)
+ }
+ })
+ this.showChangeGroup = true
+ },
+ changeRadio (day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
this.filters.createDateStart = arr[0]
this.filters.createDateEnd = arr[1]
this.getList(1)
},
- changeForm(str) {
- if(this.filters.createDateStart > this.filters.createDateEnd){
+ changeForm (str) {
+ if (this.filters.createDateStart > this.filters.createDateEnd) {
this.filters.createDateStart = this.filters.createDateEnd
return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
this.getList()
},
- getList(page) {
+ getList (page) {
const { pagination, filters } = this
this.loading = true
platformJobPage({
model: {
...filters,
jobType: '0'
- },
+ },
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: page || pagination.page
}).then(res => {
this.loading = false
this.list = res.records || []
@@ -238,7 +360,7 @@
this.loading = false
})
},
- handleDel(row) {
+ handleDel (row) {
this.$dialog.deleteConfirm('纭鍒犻櫎鍚楋紵').then(() => {
platformJobDel(row.id).then(res => {
Message.success('鍒犻櫎鎴愬姛')
@@ -246,7 +368,7 @@
})
})
},
- handleEx() {
+ handleEx () {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -271,8 +393,8 @@
})
})
},
- updateTotalNum() {
- this.$dialog.actionConfirm('纭杩涜璇ユ搷浣滃悧锛�','鎿嶄綔鎻愮ず')
+ updateTotalNum () {
+ this.$dialog.actionConfirm('纭杩涜璇ユ搷浣滃悧锛�', '鎿嶄綔鎻愮ず')
.then(() => {
this.updateLoading = true
updateTotalNum('')
@@ -284,13 +406,13 @@
})
})
},
- clear() {
+ clear () {
this.pagination.page = 1
this.filters = {}
this.getList(0)
// this.changeRadio('0')
},
- handleDetail(row) {
+ handleDetail (row) {
this.isShowDetail = true
this.$nextTick(() => {
this.$refs.WaybillDetailRef.isShowModal = true
@@ -298,7 +420,7 @@
this.$refs.WaybillDetailRef.getDetail()
})
},
- handleSizeChange(capacity) {
+ handleSizeChange (capacity) {
this.pagination.pageSize = capacity
this.getList()
}
@@ -312,4 +434,56 @@
color: #000000;
margin-bottom: 15px;
}
+.head {
+ font-size: 12px;
+ color: #282828;
+ background: rgba(39, 155, 170, 0.05);
+ border-radius: 4px;
+ border: 1px solid #dfe2e8;
+ padding: 16px;
+ margin-bottom: 30px;
+ .plate {
+ display: flex;
+ font-weight: 600;
+ height: 30px;
+ line-height: 30px;
+ font-size: 15px;
+ color: #111111;
+ background-color: #fff;
+ border-radius: 4px;
+ border: 1px solid #2080f7;
+ padding-right: 4px;
+ width:120px;
+ span {
+ &:nth-of-type(1) {
+ background: #2080f7;
+ padding: 0 8px;
+ color: #fff;
+ }
+
+ &:nth-of-type(2) {
+ padding-left: 4px;
+ }
+ }
+ }
+
+ .list {
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 16px;
+
+ .item {
+ text-align: justify;
+ width: 50%;
+ margin-bottom: 8px;
+ span {
+ &:nth-child(1) {
+ color: #666666;
+ }
+ }
+ }
+ }
+}
+
+
</style>
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index 9548d14..f68914c 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -14,6 +14,12 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏈堝彴绫诲瀷" @change="search" clearable>
+ <el-option label="鏁存墭鐩�" :value="0"></el-option>
+ <el-option label="鏁ｄ欢" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
<!-- <section> -->
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -34,9 +40,17 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="鏈堝彴鍚嶇О" fixed min-width="100px"></el-table-column>
<el-table-column prop="code" label="鏈堝彴缂栫爜" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="type" label="鏈堝彴绫诲瀷" min-width="100px">
+ <template scope="{row}">
+ <span v-if="row.type == 0" class="green">鏁存墭鐩�</span>
+ <span v-else-if="row.type == 1" class="red">鏁ｄ欢</span>
+ <span v-else class="grey">-</span>
+ </template>
+ </el-table-column>
<el-table-column prop="groupName" label="鎵�灞炴湀鍙扮粍" fixed min-width="150px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="90px"></el-table-column>
- <el-table-column prop="workingNum" label="鍚屾椂鍙彿杞﹁締鏁�" min-width="120px"></el-table-column>
+ <el-table-column prop="workingNum" label="鍚屾椂浣滀笟鏁伴噺" min-width="120px"></el-table-column>
+ <el-table-column prop="callReadyNum" label="鍚屾椂鍑嗗浣滀笟鏁伴噺" min-width="120px"></el-table-column>
<el-table-column prop="stayTimeoutAlarmTime" label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(鍒嗛挓锛�" min-width="180px">
<template scope="{row}">{{ row.stayTimeoutAlarmTime ? (row.stayTimeoutAlarmTime) : '-' }}</template>
</el-table-column>
@@ -100,6 +114,7 @@
working1: false,
searchForm: {
name: '',
+ type:null,
groupId: null
}
}
diff --git a/admin/src/views/platform/set/index.vue b/admin/src/views/platform/set/index.vue
index cc42f4a..6d59b5c 100644
--- a/admin/src/views/platform/set/index.vue
+++ b/admin/src/views/platform/set/index.vue
@@ -25,7 +25,13 @@
</el-table-column>
<el-table-column
prop="workingNum"
- label="鍚屾椂浣滀笟杞﹁締鏁�"
+ label="鍚屾椂浣滀笟鏁伴噺"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="callReadyNum"
+ label="鍚屾椂鍑嗗杞﹁締鏁�"
min-width="100"
show-overflow-tooltip
/>
@@ -116,10 +122,14 @@
format="HH:mm"
/>
</el-form-item>
- <el-form-item label="鍚屾椂浣滀笟杞﹁締鏁�">
+ <el-form-item label="鍚屾椂浣滀笟鏁伴噺">
<el-input v-model="param.workingNum" class="w300"></el-input>
<span class="ml10">涓�</span>
</el-form-item>
+ <el-form-item label="鍚屾椂鍑嗗浣滀笟鏁伴噺">
+ <el-input v-model="param.callReadyNum" class="w300"></el-input>
+ <span class="ml10">涓�</span>
+ </el-form-item>
<el-form-item label="鍋滅暀瓒呮椂鎶ヨ鏃堕棿">
<el-input
v-model="param.alermTime"
diff --git "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md" "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
index acae40f..d27091e 100644
--- "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
+++ "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
@@ -8,7 +8,8 @@
ADD COLUMN `AUTO_CALL_END_TIME` varchar(100) NULL COMMENT '鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�' AFTER `AUTO_CALL_START_TIME`;
ALTER TABLE `antaiwuliu`.`platform`
-ADD COLUMN `TYPE` int NULL COMMENT '绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢' AFTER `LED_CONTENT`;
+ADD COLUMN `TYPE` int NULL COMMENT '绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢' AFTER `LED_CONTENT`,
+ADD COLUMN `CALL_READY_NUM` varchar(100) NULL COMMENT '鍚屾椂鍑嗗浣滀笟鏁伴噺' AFTER `TYPE`;
ALTER TABLE `antaiwuliu`.`platform_job`
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 4f1a23d..48cd55f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -32,7 +32,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index = 12, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
+ // @ExcelColumn(name="鍒涘缓鏃堕棿",index = 13, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,6 +44,7 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
private Integer isdeleted;
@ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1")
+ @ExcelColumn(name="鐘舵��",index =3,width = 6, valueMapping = "0=鑷缓浣滀笟;1=WMS鑾峰彇;")
private Integer origin;
@ApiModelProperty(value = "鍚嶇О")
@@ -53,7 +54,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
- @ExcelColumn(name="鐘舵��",index =13,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
+ @ExcelColumn(name="鐘舵��",index =10,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
@ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
@@ -73,18 +74,18 @@
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕",index = 4,width = 6)
+ @ExcelColumn(name="鍙告満濮撳悕",index = 5,width = 6)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鐢佃瘽",index = 5,width = 8)
+ @ExcelColumn(name="鍙告満鐢佃瘽",index = 6,width = 8)
private String drivierPhone;
@ApiModelProperty(value = "绛惧埌鏃堕棿")
- @ExcelColumn(name="绛惧埌鏃堕棿",index =7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ // @ExcelColumn(name="绛惧埌鏃堕棿",index =7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌 2鍚庡彴绛惧埌", example = "1")
@@ -109,7 +110,7 @@
private BigDecimal signDistance;
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
- @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =17 ,width = 8)
+ // @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =17 ,width = 8)
private String platformNames;
@ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -128,7 +129,7 @@
private Integer inwaitUserId;
@ApiModelProperty(value = "鍙彿鏃堕棿")
- @ExcelColumn(name="鍙彿鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ // @ExcelColumn(name="鍙彿鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date callDate;
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -138,11 +139,11 @@
private String callInfo;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
- @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ // @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
- @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿",index =10 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ // @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿",index =10 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@@ -196,7 +197,7 @@
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
- @ExcelColumn(name="浣滀笟绫诲瀷",index = 15,width = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
+ @ExcelColumn(name="浣滀笟绫诲瀷",index = 7,width = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
private Integer type;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
@@ -204,7 +205,7 @@
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
- @ExcelColumn(name="鍚庤溅鐗屽彿",index =3 ,width = 5)
+ // @ExcelColumn(name="鍚庤溅鐗屽彿",index =3 ,width = 5)
private String carCodeBack;
@ApiModelProperty(value = "鍙告満鎵�灞為儴闂ㄧ紪鐮�", example = "1")
@@ -239,7 +240,7 @@
private BigDecimal totalNum;
@ApiModelProperty(value = "纭浠诲姟鏃堕棿")
- @ExcelColumn(name="纭鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ // @ExcelColumn(name="纭鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date confirmTaskDate;
@ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
@@ -313,14 +314,14 @@
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@TableField(exist = false)
- @ExcelColumn(name="WMS鍒涘缓鏃堕棿",index =18,width = 10)
+ @ExcelColumn(name="WMS鍒涘缓鏃堕棿",index =9,width = 10)
private String ioCreatedate;
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
private String outUserName;
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍚嶇О", example = "1")
- @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 15,width = 12)
+ @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 11,width = 12)
@TableField(exist = false)
private String editUserName;
@@ -333,7 +334,7 @@
private Integer groupType ;
@ApiModelProperty(value = "鎵胯繍鍟�")
- @ExcelColumn(name="杩愯緭鍏徃",index = 16,width = 10)
+ @ExcelColumn(name="杩愯緭鍏徃",index = 4,width = 10)
@TableField(exist = false)
private String carrierName ;
@@ -355,7 +356,7 @@
private Long workTime;
@ApiModelProperty(value = "浣滀笟鏃堕暱")
@TableField(exist = false)
- @ExcelColumn(name="浣滀笟鏃堕暱",index =11 ,width = 6)
+ // @ExcelColumn(name="浣滀笟鏃堕暱",index =11 ,width = 6)
private String workTimeStr;
@ApiModelProperty(value = "WMS浠诲姟淇℃伅")
@@ -413,7 +414,7 @@
@ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
@TableField(exist = false)
- @ExcelColumn(name="浣滀笟鏈堝彴缁�",index =22,width = 10)
+ @ExcelColumn(name="浣滀笟鏈堝彴缁�",index = 8,width = 10)
private String platformGroupName ;
@ApiModelProperty(value = "鏈堝彴宸ヤ綔鏃堕暱" ,hidden = true)
@@ -433,7 +434,7 @@
private String queryStatusForPower;
@ApiModelProperty(value = "浠诲姟鏉ユ簮")
- @ExcelColumn(name="浠诲姟鏉ユ簮",index =14,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
+ // @ExcelColumn(name="浠诲姟鏉ユ簮",index =14,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
@TableField(exist = false)
private Integer jobForm;
--
Gitblit v1.9.3