root/rongLiHongFeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init project

Browse Source
This commit is contained in:
ldj_willow
2022-10-28 11:13:14 +08:00
parent 2a241c2858
commit f89e0ae819
69 changed files with 3011 additions and 2340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-ui/src/api/wms/sch/point.js
View File

@@ -60,4 +60,12 @@ export function changeUsed(data) {
})
}
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed }
export function changeLock(data) {
return request({
url: 'api/point/changeLock',
method: 'post',
data: data
})
}
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }

50
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -31,23 +31,6 @@
class="filter-item"
/>
</el-form-item>
<el-form-item label="工单类型">
<el-select
v-model="query.order_type_scode"
style="width: 200px"
clearable
filterable
placeholder="请选择"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.pdm_workorder_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label=" 工单状态">
<el-select
v-model="order_status"
@@ -135,16 +118,6 @@
width="1200px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="工单类型" prop="order_type_scode">
<el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
<el-option
v-for="item in dict.pdm_workorder_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产日期" prop="produce_date">
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
@@ -195,6 +168,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工单状态">
<el-select
v-model="form.order_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.pdm_workorder_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属工序">
<el-select
v-model="form.workorder_procedure"
@@ -286,11 +275,6 @@
{{ dict.label.is_or_not[scope.row.is_needmove] }}
</template>
</el-table-column>
<el-table-column prop="order_type_scode" label="工单类型">
<template slot-scope="scope">
{{ dict.label.pdm_workorder_type[scope.row.order_type_scode] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_optname" label="修改人" />
@@ -364,7 +348,7 @@ export default {
name: 'Produceshiftorder',
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['pdm_workorder_status', 'is_used', 'pdm_workorder_type', 'is_or_not', 'vehicle_type', 'workorder_procedure'],
dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure'],
cruds() {
return CRUD({
title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc',

103
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -7,7 +7,7 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
@@ -69,22 +69,51 @@
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
v-model="query.lock_type"
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
<el-input
v-model="query.block_num"
clearable
size="mini"
placeholder="锁定类型"
class="filter-item"
placeholder="块"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="排">
<el-input
v-model="query.row_num"
clearable
size="mini"
placeholder="排"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="列">
<el-input
v-model="query.col_num"
clearable
size="mini"
placeholder="列"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="层">
<el-input
v-model="query.layer_num"
clearable
size="mini"
placeholder="层"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-switch
v-model="query.lock_type"
active-value="2"
inactive-value="1"
active-color="#409EFF"
inactive-color="#C0CCDA"
@change="hand"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<el-form-item label="是否启用">
@@ -104,6 +133,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 0"
slot="right"
class="filter-item"
size="mini"
@@ -115,15 +145,40 @@
启用
</el-button>
<el-button
v-if="crud.query.is_used == 1"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 0)"
>
禁用
</el-button>
<el-button
v-if="crud.query.lock_type == 1"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 2)"
>
锁定
</el-button>
<el-button
v-if="crud.query.lock_type == 2"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 0)"
@click="changeLock(crud.selections, 1)"
>
禁用
解锁
</el-button>
</crudOperation>
<!--表单组件-->
@@ -240,7 +295,7 @@
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used=='1' ? '是' : '否' }}
@@ -339,6 +394,11 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_id) {
this.getPointStatusAndTypeList(this.form.region_id)
}
},
hand(value) {
this.crud.toQuery()
},
@@ -389,6 +449,15 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
changeLock(data, flag) { // 更改锁定状态
const param = {}
param.data = data
param.lock_type = flag
crudPoint.changeLock(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}

46
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -113,42 +113,59 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="point_code1" label="点位1" width="85" />
<el-table-column prop="point1_region_name" label="区域1" width="85" />
<el-table-column prop="point_code2" label="点位2" width="85" />
<el-table-column prop="point_code1" label="点位1" width="100" />
<el-table-column prop="point1_region_name" label="区域1" width="100" />
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
label="操作"
width="120px"
width="160px"
align="center"
>
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-upload"
@click="doOperate(scope.row, 'd')"
@click="doOperate(scope.row, 'c')"
>下发</el-button>
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
>完成</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
</el-table>
@@ -188,7 +205,7 @@ import crudClassstandard from '@/api/wms/basedata/classstandard'
export default {
name: 'Task',
dicts: [],
dicts: ['acs_task_type', 'vehicle_type'],
components: {
pagination, crudOperation, rrOperation, Treeselect, udOperation
},
@@ -303,13 +320,10 @@ export default {
case 'b':// 取消
method_name = 'cancel'
break
case 'c':// 拉回
method_name = 'pullBack'
case 'c':// 下发
method_name = 'immediateNotifyAcs'
break
case 'd':// 下发
method_name = 'renotifyAcs'
break
case 'e':// 详情
case 'd':// 详情
method_name = 'view'
break
}

8
lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
View File

@@ -109,15 +109,13 @@
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120" />
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

71
lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
View File

@@ -50,23 +50,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="query.vehicle_type"
@@ -126,29 +109,25 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-sort"
:disabled="crud.selections.length === 0"
@click="outInventory(crud.selections)"
>
出库
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="standing_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="form.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="托盘类型">
<el-select
v-model="form.vehicle_type"
@@ -193,19 +172,9 @@
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" />
<el-table-column prop="instorage_time" label="入库时间" />
<el-table-column prop="ext_code" label="外部编码" />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
{{ dict.label.sch_point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
@@ -236,6 +205,7 @@
</template>
<script>
import crudStructivt from '../structivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -287,6 +257,13 @@ export default {
},
hand(value) {
this.crud.toQuery()
},
outInventory(values) {
console.log(values)
crudStructivt.outInventory(values).then(res => {
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

34
lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
View File

@@ -52,7 +52,19 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-position"
:disabled="crud.selections.length === 0"
@click="makeTask(crud.selections)"
>
生成任务
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
@@ -109,15 +121,13 @@
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120" />
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -153,6 +163,10 @@ export default {
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
query: {
io_type: '2',
io_region: "'CPQYA01'"
},
crudMethod: { ...crudBill }
})
},
@@ -175,9 +189,13 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.io_type = '2'
this.query.io_region = "'CPQYA01'"
return true
},
makeTask(values) {
crudBill.makeTask(values).then(res => {
this.crud.notify('生成任务成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

10
lms/nladmin-ui/src/views/wms/st/regionio.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function makeTask(data) {
return request({
url: 'api/regionio/makeTask',
method: 'post',
data: data
})
}
export default { add, edit, del, makeTask }

10
lms/nladmin-ui/src/views/wms/st/structivt.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function outInventory(data) {
return request({
url: 'api/structivt/outInventory',
method: 'post',
data: data
})
}
export default { add, edit, del, outInventory }

38
lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
View File

@@ -50,23 +50,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="query.vehicle_type"
@@ -133,22 +116,6 @@
<el-form-item label="点位编码" prop="standing_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="form.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="托盘类型">
<el-select
v-model="form.vehicle_type"
@@ -196,9 +163,8 @@
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" />
<el-table-column prop="instorage_time" label="入库时间" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="lock_type" label="锁定类型">
<template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }}

8
lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
View File

@@ -109,15 +109,13 @@
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120" />
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation