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

add: 手持生箔呼叫空辊、下料

Browse Source
This commit is contained in:
liyongde
2024-08-07 18:52:39 +08:00
parent 9a8395f4b6
commit 01bd8257af
53 changed files with 828 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
View File

@@ -229,7 +229,7 @@
<el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
<el-table-column prop="realstart_time" label="开始时间" :min-width="flexWidth('realstart_time',crud.data,'开始时间')" />
<el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量', 30)" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />

20
lms2/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -191,7 +191,7 @@
</el-form-item>
<el-form-item :label="$t('Point.dialog.workshop_code')">
<el-select
v-model="form.workshop_code"
v-model="form.product_area"
:placeholder="$t('common.Please_select')"
style="width: 370px;"
>
@@ -307,9 +307,9 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column
prop="workshop_code"
prop="product_area"
:label="$t('Point.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('Point.table.workshop_code'))"
:min-width="flexWidth('product_area',crud.data,$t('Point.table.workshop_code'))"
/>
<el-table-column
prop="point_code"
@@ -471,13 +471,13 @@ import PointDialog from '@/views/wms/sch/point/PointDialog.vue'
import i18n from '@/i18n'
const defaultForm = {
point_id: null,
point_code: null,
point_name: null,
region_code: null,
region_name: null,
point_type: null,
point_status: null,
can_material_type: null,
can_vehicle_type: null,
vehicle_max_qty: null,
vehicle_type: null,
@@ -491,11 +491,11 @@ const defaultForm = {
out_order_seq: null,
in_empty_seq: null,
out_empty_seq: null,
parent_point_code: null,
device_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
workshop_code: null,
product_area: null,
is_auto: 'true',
remark: null,
is_used: 'true',
@@ -510,8 +510,8 @@ export default {
return CRUD({
title: i18n.t('Point.title'),
url: 'api/schBasePoint',
idField: 'point_code',
sort: 'point_code,desc',
idField: 'point_id',
sort: 'point_id,desc',
crudMethod: { ...crudSchBasePoint },
optShow: {
add: true,
@@ -587,8 +587,8 @@ export default {
return true
},
[CRUD.HOOK.beforeToCU]() {
this.form.is_has_workder = this.form.is_has_workder.toString()
this.form.is_auto = this.form.is_auto.toString()
this.form.is_has_workder = this.form.is_has_workder ? this.form.is_has_workder.toString() : 'false'
this.form.is_auto = this.form.is_auto ? this.form.is_auto.toString() : 'false'
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_code) {

14
lms2/nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -10,7 +10,7 @@
>
<el-form-item :label="$t('TaskConfig.dialog.workshop_code')">
<el-select
v-model="query.workshop_code"
v-model="query.product_area"
clearable
size="mini"
:placeholder="$t('TaskConfig.dialog.workshop_code')"
@@ -57,7 +57,7 @@
>
<el-form-item :label="$t('TaskConfig.dialog.workshop_code')">
<el-select
v-model="form.workshop_code"
v-model="form.product_area"
:placeholder="$t('common.Please_select')"
style="width: 240px;"
>
@@ -265,9 +265,9 @@
:min-width="flexWidth('next_region_pre',crud.data,$t('TaskConfig.table.next_region_pre'))"
/>
<el-table-column
prop="workshop_code"
prop="product_area"
:label="$t('TaskConfig.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('TaskConfig.table.workshop_code'))"
:min-width="flexWidth('product_area',crud.data,$t('TaskConfig.table.workshop_code'))"
/>
<el-table-column
prop="remark"
@@ -335,8 +335,8 @@ const defaultForm = {
task_type: null,
task_type_id: null,
priority: null,
task_create_max_num: 999,
task_issue_max_num: 999,
task_create_max_num: 1,
task_issue_max_num: 1,
is_auto_issue: true,
start_region_str: null,
next_region_str: null,
@@ -356,7 +356,7 @@ const defaultForm = {
unfinish_notify_time: null,
sql_param: null,
route_plan_code: null,
workshop_code: null,
product_area: null,
task_direction: null,
remark: null,
is_used: true,

21
lms2/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -155,7 +155,7 @@
<el-input v-model="form.response_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
<el-input v-model="form.product_area" style="width: 240px;" />
</el-form-item>
<el-form-item label="额外组盘信息">
<el-input v-model="form.ext_group_data" style="width: 240px;" />
@@ -182,6 +182,11 @@
type="selection"
width="55"
/>
<el-table-column
prop="task_id"
label="ID"
:min-width="flexWidth('task_id',crud.data,'任务id')"
/>
<el-table-column
prop="task_code"
:label="$t('Task.table.code')"
@@ -208,7 +213,7 @@
<el-table-column
prop="task_status"
:label="$t('Task.table.task_status')"
:min-width="flexWidth('task_status',crud.data,$t('Task.table.task_status'))"
:min-width="flexWidth('task_status',crud.data,$t('Task.table.task_status'), 20)"
>
<template slot-scope="scope">
{{ getStatusName(scope.row.task_status) }}
@@ -286,7 +291,7 @@
:label="$t('Task.table.handle_class')"
:min-width="flexWidth('handle_class',crud.data,$t('Task.table.handle_class'))"
/>
<el-table-column v-if="false" prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
<el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
<el-table-column
v-if="false"
prop="task_group_id"
@@ -337,9 +342,9 @@
:min-width="flexWidth('response_param',crud.data,$t('Task.table.response_param'))"
/>
<el-table-column
prop="workshop_code"
prop="product_area"
:label="$t('Task.table.workshop_code')"
:min-width="flexWidth('workshop_code',crud.data,$t('Task.table.workshop_code'))"
:min-width="flexWidth('workshop_code',crud.data,$t('Task.table.product_area'))"
/>
<el-table-column
v-if="false"
@@ -377,14 +382,14 @@
<el-button
type="text"
icon="el-icon-success"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
:disabled="scope.row.task_status==='07' || scope.row.task_status==='08'"
@click="doOperate(scope.row, 'a')"
>{{ $t('Task.table.complete') }}
</el-button>
<el-button
type="text"
icon="el-icon-error"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
:disabled="scope.row.task_status==='07' || scope.row.task_status==='08'"
@click="doOperate(scope.row, 'b')"
>{{ $t('common.Cancel') }}
</el-button>
@@ -430,7 +435,7 @@ const defaultForm = {
acs_trace_id: null,
request_param: null,
response_param: null,
workshop_code: null,
product_area: null,
ext_group_data: null,
remark: null,
is_delete: false

8
lms2/nladmin-ui/src/views/wms/sch/task/locale/zh.js
View File

@@ -20,10 +20,10 @@ export default {
'task_status': '任务状态',
'remark': '提示信息',
'config_code': '配置编码',
'point_code1': '起点1',
'point_code2': '终点1',
'point_code3': '起点2',
'point_code4': '终点2',
'point_code1': '取货点1',
'point_code2': '放货点1',
'point_code3': '取货点2',
'point_code4': '放货点2',
'vehicle_type': '载具类型',
'vehicle_qty': '载具数量',
'priority': '优先级',