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

add 新增需求

Browse Source
This commit is contained in:
zhoujj
2025-10-17 10:19:37 +08:00
parent 7a93ff9cb1
commit 84c6ea5cbd
36 changed files with 514 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/nladmin-ui/src/views/wms/produceScreen/index.vue
View File

@@ -14,6 +14,7 @@
<div v-if="e.type === '0'" class="button" @click="showPop('CACHE', e)">缓存物料</div>
<div v-if="e.type === '0'" class="button" @click="showPop('PALLET', e)">当前托盘</div>
<div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
<div v-if="e.type === '0'" class="button" @click="showPop('DELETE', e)">组盘删除</div>
</div>
</div>
<div v-show="type === 'IN'" class="pop-wraper pop-wraper-2" :class="{'popshow': show, 'pophide': !show}">
@@ -252,6 +253,10 @@
height="100%"
@current-change="handleCurrentChange1"
>
<el-table-column
prop="vehicle_code"
label="托盘编码"
/>
<el-table-column
prop="material_id"
label="图纸查看"
@@ -328,7 +333,7 @@ export default {
value: '',
options: [{ value: 'G01', label: 'G01' }, { value: 'R01', label: 'R01' }, { value: 'R02', label: 'R02' }, { value: 'R03', label: 'R03' }, { value: 'S04', label: 'S04' }, { value: 'S06', label: 'S06' }],
value1: '',
options1: [{ value: '1', label: '货架' }, { value: '2', label: '内部' }, { value: '3', label: '外协' }, { value: '4', label: '内部过道' }, { value: '5', label: '其他加工' }],
options1: [{ value: '1', label: '货架' }, { value: '2', label: '仓库收货区' }, { value: '3', label: '外协' }, { value: '4', label: '内部过道' }, { value: '5', label: '精加工' }],
value2: '',
options2: [],
vcode: '',
@@ -420,6 +425,23 @@ export default {
this.show = true
})
}
else if (type === 'DELETE') {
this.$confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// 用户点击“确定”，执行隐藏操作
this.show = false;
console.log("进入方法")
console.log(this.popData)
crudProduceScreen.deletevehiclemessage( this.popData.device_code )
}).catch(() => {
// 用户点击“取消”，不执行任何操作
console.log('用户取消了操作');
});
this.show = true
}
},
handleCurrentChange(val) {
this.imgSrc = ''

14
lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
View File

@@ -111,7 +111,7 @@ export function loginOut(data) {
export function selectMaterialAndJpg(code) {
return request({
url: 'api/handheld/selectMaterialAndJpg?pointCode=' + code,
method: 'get'
method: 'post'
})
}
@@ -124,6 +124,14 @@ export function selectCacheTask(data) {
})
}
export default {
authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg, selectCacheTask
//15.组盘删除
export function deletevehiclemessage(code) {
return request({
url: 'api/handheld/deletevehiclemessage?pointCode=' + code,
method: 'post'
})
}
export default {
authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, getPointVehicle, loginOut, selectMaterialAndJpg, selectCacheTask, deletevehiclemessage
}

73
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -161,7 +161,7 @@
title="创建任务"
:visible.sync="dialogVisible"
width="350px"
:style="{ 'max-height': '80vh', overflowY: 'auto' }"
:style="{ 'max-height': '40vh', overflowY: 'auto' }"
@close="resetForm"
>
<el-form ref="taskForm" :model="newTask" width="200px">
@@ -189,6 +189,38 @@
<el-button type="primary" @click="submitTask">确 定</el-button>
</span>
</el-dialog>
<el-dialog
title="修改下道工序"
:visible.sync="dialogVisible2"
width="350px"
:style="{ 'max-height': '40vh', overflowY: 'auto' }"
@close="resetForm1"
>
<el-form ref="taskForm" :model="newTask1" width="200px">
<el-form-item label="下道工序" :rules="[{ required: true, message: '请输入下道工序', trigger: 'blur' }]">
<el-select
v-model="newTask1.region_name"
size="mini"
placeholder="下道工序"
class="filter-item"
style="width: 240px;"
clearable
filterable
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible2 = false">取 消</el-button>
<el-button type="primary" @click="submitFix">确 定</el-button>
</span>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
@@ -236,7 +268,7 @@
<el-table-column prop="daybetween" label="入库天数" :min-width="flexWidth('daybetween',crud.data,'入库天数')" />
<el-table-column v-if="false" prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column v-if="false" prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column v-permission="[]" label="操作" width="240px" align="center" fixed="right">
<!-- <template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -252,6 +284,14 @@
>
创建任务
</el-button>
<el-button
v-if="!!scope.row.has_work && scope.row.theLocation != null"
type="text"
icon="el-icon-plus"
@click="fixnextstyle(scope.row)"
>
修改下道工序
</el-button>
</template>
</el-table-column>
</el-table>
@@ -352,10 +392,16 @@ export default {
workOrderDialog: false,
dialogVisible: false,
dialogVisible1: false,
dialogVisible2: false,
newTask: {
point_code2: '',
vehicle_code: '',
point_code1: ''
},
newTask1: {
region_code: '',
region_name: '',
vehicle_code: ''
},
errGif: errGif,
materialFile: ''
@@ -435,10 +481,18 @@ export default {
this.newTask.vehicle_code = tree.vehicle_code
this.dialogVisible = true // 打开对话框
},
fixnextstyle(tree) {
this.newTask1.vehicle_code = tree.vehicle_code
this.dialogVisible2 = true // 打开对话框
},
resetForm() {
// 在对话框关闭时重置表单
this.newTask.point_code2 = ''
},
resetForm1() {
// 在对话框关闭时重置表单
this.newTask1.region_name = ''
},
cleanFrom() {
// 在对话框关闭时重置表单
this.newTask.point_code2 = ''
@@ -458,6 +512,21 @@ export default {
console.error('表单验证失败')
}
})
},
submitFix() {
this.$refs.taskForm.validate((valid) => {
if (valid) {
crudSchBaseVehiclematerialgroup.fixnextstyle(this.newTask1).then(res => {
console.log(res)
this.$notify({ type: 'success', message: '修改下道工序成功！' })
this.dialogVisible2 = false // 只在成功后关闭对话框
}).catch(error => {
console.error('修改下道工序失败:', error)
})
} else {
console.error('表单验证失败')
}
})
}
}
}

9
lms/nladmin-ui/src/views/wms/sch/group/schBaseVehiclematerialgroup.js
View File

@@ -54,5 +54,12 @@ export function selectMaterialFile(groupId) {
method: 'get'
})
}
export function fixnextstyle(data) {
return request({
url: 'api/schBaseVehiclematerialgroup/fixnextstyle',
method: 'post',
data
})
}
export default { add, edit, del, getGroup, selectByVehicle, createTask, selectMaterialFile }
export default { add, edit, del, getGroup, selectByVehicle, createTask, selectMaterialFile, fixnextstyle }

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

@@ -231,7 +231,7 @@
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<!--<el-form-item label="允许载具类型" prop="can_vehicle_type">
<el-form-item label="允许载具类型" prop="can_vehicle_type">
<el-select
v-model="form.can_vehicle_type"
size="mini"
@@ -246,7 +246,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>-->
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
@@ -298,11 +298,11 @@
<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 v-if="false" prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<!-- <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" /> -->
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<!-- <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" /> -->
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
<!-- <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" /> -->
<el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位类型')">
<template v-slot="scope">
{{ dict.label.point_status[scope.row.point_status] || '未知' }}
@@ -335,16 +335,11 @@
{{ scope.row.is_auto?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
<template slot-scope="scope">
{{ scope.row.is_used?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

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

@@ -99,6 +99,12 @@
<el-form-item label="配置编码">
<el-input v-model="form.config_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="起点">
<el-input v-model="form.startcode_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="终点">
<el-input v-model="form.finishcode_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位1">
<el-input v-model="form.point_code1" style="width: 240px;" />
</el-form-item>
@@ -185,6 +191,8 @@
</el-table-column>
<el-table-column prop="remark" label="提示信息" :min-width="flexWidth('remark',crud.data,'提示信息')" />
<el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
<el-table-column prop="startcode_name" label="起点" :min-width="flexWidth('startcode_name',crud.data,'起点')" />
<el-table-column prop="finishcode_name" label="终点" :min-width="flexWidth('startcode_name',crud.data,'终点')" />
<el-table-column prop="point_code1" label="点位1" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
<el-table-column prop="point_code2" label="点位2" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
<el-table-column prop="request_param" label="请求参数" :min-width="150">
@@ -271,6 +279,8 @@ const defaultForm = {
config_code: null,
point_code1: null,
point_code2: null,
startcode_name: null,
finishcode_name: null,
point_code3: null,
point_code4: null,
start_wait_point: null,