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

add:新增入库业务代码

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2024-10-10 17:24:09 +08:00
parent df8bf461fd
commit d812e2b4fd
59 changed files with 745 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
lms/nladmin-ui/src/views/wms/sch/interactivelog/index.vue
View File

@@ -1,183 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<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">
<el-form-item label="请求名字">
<el-input v-model="form.request_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 370px;" />
</el-form-item>
<el-form-item label="下发任务的请求参数">
<el-input v-model="form.response_param" style="width: 370px;" />
</el-form-item>
<el-form-item label="链路标识">
<el-input v-model="form.acs_trace_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="请求描述">
<el-input v-model="form.request_desc" style="width: 370px;" />
</el-form-item>
<el-form-item label="请求类型">
<el-input v-model="form.request_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否处理完成">
<el-input v-model="form.is_finish" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<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="request_name"
label="请求名字"
:min-width="flexWidth('request_name',crud.data,'请求名字')"
/>
<el-table-column
prop="request_param"
label="生成任务的请求参数"
:min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')"
/>
<el-table-column
prop="response_param"
label="下发任务的请求参数"
:min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')"
/>
<el-table-column
prop="acs_trace_id"
label="链路标识"
:min-width="flexWidth('acs_trace_id',crud.data,'链路标识')"
/>
<el-table-column
prop="request_desc"
label="请求描述"
:min-width="flexWidth('request_desc',crud.data,'请求描述')"
/>
<el-table-column
prop="request_type"
label="请求类型"
:min-width="flexWidth('request_type',crud.data,'请求类型')"
/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column
prop="is_finish"
label="是否处理完成"
:min-width="flexWidth('is_finish',crud.data,'是否处理完成')"
/>
<el-table-column
prop="workshop_code"
label="车间编码"
:min-width="flexWidth('workshop_code',crud.data,'车间编码')"
/>
<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
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudSchBaseAcsandlmsinteractivelog from './schBaseAcsandlmsinteractivelog'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
log_id: null,
request_name: null,
request_param: null,
response_param: null,
acs_trace_id: null,
request_desc: null,
request_type: null,
remark: null,
is_finish: null,
workshop_code: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
update_name: null,
update_time: null
}
export default {
name: 'InteractiveLog',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: 'ACS和LMS交互日志表',
url: 'api/schBaseAcsandlmsinteractivelog',
idField: 'log_id',
sort: 'log_id,desc',
crudMethod: { ...crudSchBaseAcsandlmsinteractivelog }
})
},
data() {
return {
permission: {},
rules: {}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
lms/nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js
View File

@@ -1,27 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/schBaseAcsandlmsinteractivelog',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/schBaseAcsandlmsinteractivelog/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/schBaseAcsandlmsinteractivelog',
method: 'put',
data
})
}
export default { add, edit, del }

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

@@ -3,29 +3,6 @@
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-dialog
title="选择异常出库原因"
:visible.sync="reasonDialogVisible"
width="30%"
:before-close="closeReasonDialog"
>
<el-form ref="reasonForm" :model="reasonForm" label-width="80px">
<el-form-item label="原因" prop="reason">
<el-select v-model="reasonForm.reason" placeholder="请选择异常出库原因">
<el-option
v-for="item in dict.reason"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="closeReasonDialog">取消</el-button>
<el-button type="primary" @click="submitReason">确认</el-button>
</div>
</el-dialog>
<el-form
:inline="true"
class="demo-form-inline"
@@ -78,22 +55,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="工单状态">
<el-select
v-model="query.status"
clearable
size="mini"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.work_order_two_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-switch
v-model="query.lock_type"
@@ -175,10 +136,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code" disabled >
<el-form-item label="点位编码" prop="point_code" disabled>
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name" disabled >
<el-form-item label="点位名称" prop="point_name" disabled>
<el-input v-model="form.point_name" style="width: 370px;" />
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
@@ -196,9 +157,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="父类编码" prop="vehicle_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
</el-form-item>
<el-form-item label="物料类型" prop="vehicle_type">
<el-input v-model="form.vehicle_type" style="width: 370px;" />
</el-form-item>
@@ -211,11 +169,8 @@
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
</el-form-item>
<el-form-item label="是否更新组盘托盘号">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="是否自动">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">{{ item.label }}</el-radio>
<el-form-item label="是否存储货位">
<el-input v-model="form.is_storage" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
@@ -243,13 +198,11 @@
</template>
</el-table-column>
<el-table-column prop="ing_task_code" label="当前任务编码" :min-width="flexWidth('ing_task_code',crud.data,'当前任务编码')" />
<el-table-column prop="moname" label="工单编号" :min-width="flexWidth('moname',crud.data,'工单编号')" />
<el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
<el-table-column prop="row_num" label="排" :min-width="flexWidth('row_num',crud.data,'排')" />
<el-table-column prop="col_num" label="列" :min-width="flexWidth('col_num',crud.data,'列')" />
<el-table-column prop="layer_num" label="层" :min-width="flexWidth('layer_num',crud.data,'层')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
<el-table-column prop="point_height" label="货位高度" :min-width="flexWidth('point_height',crud.data,'货位高度')" />
<el-table-column prop="is_storage" label="是否存储货位" :min-width="flexWidth('is_storage',crud.data,'是否存储货位')">
<template slot-scope="scope">
{{ scope.row.is_auto?'是':'否' }}
</template>
@@ -268,16 +221,8 @@
style="display: inline"
:data="scope.row"
:permission="permission"
:is-visiable-del="false"
/>
<el-button
v-if="showQtyButton(scope.row.vehicle_qty,scope.row.region_code)"
size="mini"
type="text"
icon="el-icon-view"
@click="openReasonDialog(scope.row)"
>
异常出库
</el-button>
</template>
</el-table-column>
</el-table>
@@ -285,7 +230,6 @@
<pagination />
</div>
<ViewDialog ref="viewDialog" />
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" />
</div>
</template>
@@ -299,7 +243,6 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue'
import PointDialog from '@/views/wms/sch/point/PointDialog.vue'
const defaultForm = {
point_code: null,
@@ -308,8 +251,6 @@ const defaultForm = {
region_name: null,
point_type: null,
point_status: null,
can_material_type: null,
can_vehicle_type: null,
vehicle_max_qty: null,
vehicle_type: null,
vehicle_code: null,
@@ -320,22 +261,16 @@ const defaultForm = {
layer_num: null,
in_order_seq: null,
out_order_seq: null,
in_empty_seq: null,
out_empty_seq: null,
parent_point_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'false',
workshop_code: null,
is_auto: 'true',
remark: null,
is_used: 'true',
can_vehicle_types: null
is_used: 'true'
}
export default {
name: 'SchBasePoint',
dicts: ['vehicle_type', 'TrueOrFalse', 'reason', 'work_order_two_status'],
components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
dicts: ['vehicle_type', 'TrueOrFalse', 'reason'],
components: { ViewDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -377,9 +312,6 @@ export default {
region_code: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
]
}, reasonDialogVisible: false,
reasonForm: {
reason: ''
},
workShopList: [],
regionList: [],
@@ -400,10 +332,10 @@ export default {
return true
},
[CRUD.HOOK.beforeToCU]() {
console.log('1beforeToCU'+this.form.is_has_workder.toString())
console.log('1beforeToCU' + this.form.is_has_workder.toString())
this.form.is_has_workder = 'false'
this.form.is_auto = this.form.is_auto.toString()
console.log('2beforeToCU'+this.form.is_has_workder)
console.log('2beforeToCU' + this.form.is_has_workder)
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_code) {
@@ -417,18 +349,15 @@ export default {
const status = row.status
if (column.property === 'status') {
if (status == '0') {
if (status === '0') {
return 'background: #FFBA00'
} else if (status == '1') {
} else if (status === '1') {
return 'background: #13ce66'
}else if (status == '2') {
} else if (status === '2') {
return 'background: #13ce66'
}
}
},
format_work_order_two_status(row, column) {
return this.dict.label.work_order_two_status[row.status]
},
getWorkShopList() { // 获取车间列表
crudMdBaseWorkShop.getWorkShopList().then(res => {
this.workShopList = res
@@ -466,8 +395,7 @@ export default {
}
})
},
regionChange(item){
//console.log('当前选中', item)
regionChange(item) {
this.form.region_name = item.region_name
},
changeUsed(data, flag) { // 更改启用状态
@@ -479,62 +407,17 @@ export default {
this.crud.toQuery()
})
},
showQtyButton(vehicle_qty, region_code) {
if (vehicle_qty === 1 && (region_code === 'YL' || region_code === 'YLHC')) {
return true
}
return false
},
toView(row) {
if (row) {
this.$refs.viewDialog.setParentData(row)
}
},
tableChanged(row) {
this.form.parent_point_code = row.map(point => point.point_code).join(',')
},
getParentPoint() {
this.pointDialog = true
},
handleClear() {
this.crud.query.region_code = null
this.crud.query.point_type = null
this.crud.query.point_status = null
this.hand()
},
openReasonDialog(row) {
// 打开选择原因的对话框
this.reasonDialogVisible = true
// 这里可以将row存储到data中，以便在提交时使用
this.selectedRow = row
},
closeReasonDialog() {
// 关闭选择原因的对话框
this.reasonDialogVisible = false
this.$refs['reasonForm'].resetFields()
},
submitReason() {
// 提交选择的原因到后端接口
const data = {
reason: this.reasonForm.reason,
device_code: this.selectedRow.point_code
}
// 调用后端接口提交数据
// 这里假设使用axios库发送POST请求
this.$axios
.post('/api/schBasePoint/outbound', data)
.then(response => {
// 处理后端返回的数据
//console.log('提交成功', response)
this.$message.success('提交成功')
this.closeReasonDialog()
})
.catch(error => {
// 处理错误情况
console.error('提交失败,废包材位有货', error)
this.$message.error('提交失败,废包材位有货')
})
},
mysubmit() {
// 弹出输入回温时间和回温模式的对话框
this.$confirm('当前货位信息发生变更，请确认货位信息与实际一致', '提示', {