liuxy/HuaYuJingMiLmsTwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：项目搭建

Browse Source
This commit is contained in:
liuxy
2026-08-18 16:25:44 +08:00
parent b0dff536ee
commit a56541a1e9
33 changed files with 1691 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LMS/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -26,7 +26,7 @@ export default {
},
data() {
return {
title: '华东制药LMS系统',
title: '华誉精密LMS系统',
logo: Logo,
title_param: 'platform'
}

108
LMS/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -110,16 +110,16 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="print"
>
打印
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="success"-->
<!-- icon="el-icon-printer"-->
<!-- size="mini"-->
<!-- @click="print"-->
<!-- >-->
<!-- 打印-->
<!-- </el-button>-->
<el-button
v-if="crud.query.is_used == 'false'"
slot="right"
@@ -168,28 +168,28 @@
>
解锁
</el-button>
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length !== 1"
@click="getConfirm"
>
放货完成
</el-button>
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length !== 1"
@click="putConfirm"
>
取货完成
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- icon="el-icon-circle-close"-->
<!-- :disabled="crud.selections.length !== 1"-->
<!-- @click="getConfirm"-->
<!-- >-->
<!-- 放货完成-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- icon="el-icon-circle-close"-->
<!-- :disabled="crud.selections.length !== 1"-->
<!-- @click="putConfirm"-->
<!-- >-->
<!-- 取货完成-->
<!-- </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="540px">
@@ -224,7 +224,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="入库库区">
<!-- <el-form-item label="入库库区">
<el-select
v-model="form.in_sect"
placeholder="请选择"
@@ -236,8 +236,8 @@
:value="item.sect_code"
/>
</el-select>
</el-form-item>
<el-form-item label="出库库区">
</el-form-item>-->
<!-- <el-form-item label="出库库区">
<el-select
v-model="form.out_sect"
placeholder="请选择"
@@ -249,7 +249,7 @@
:value="item.sect_code"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
@@ -287,9 +287,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="父类编码" prop="vehicle_code">
<!-- <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>-->
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
@@ -306,7 +306,7 @@
<el-form-item v-if="form.point_status === '1'" label="在执行任务标识" prop="ing_task_code">
<el-input v-model="form.ing_task_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="可放载具类型" prop="can_vehicle_types">
<!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
<el-option
v-for="item in dict.vehicle_type"
@@ -315,16 +315,16 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<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-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-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>
</el-form-item>-->
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
@@ -344,27 +344,29 @@
<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_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
<el-table-column prop="storagevehicle_type" label="载具类型" :min-width="flexWidth('storagevehicle_type',crud.data,'载具类型', 30)">
<!-- <el-table-column prop="storagevehicle_type" label="载具类型" :min-width="flexWidth('storagevehicle_type',crud.data,'载具类型', 30)">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="material_id" label="物料料号" :min-width="flexWidth('material_id',crud.data,'物料料号')" />
<!-- <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'载具数量')" />-->
<el-table-column prop="material_pcsn" label="物料批次" :min-width="flexWidth('material_pcsn',crud.data,'物料批次')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="unit_name" label="计量单位" :min-width="flexWidth('unit_name',crud.data,'计量单位')" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'载具数量')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'载具数量')" />
<el-table-column prop="material_qty" label="物料重量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<!-- <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
{{ scope.row.is_has_workder?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
</el-table-column>-->
<!-- <el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
<template slot-scope="scope">
{{ scope.row.is_auto?'是':'否' }}
</template>
</el-table-column>
</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">

12
LMS/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -85,12 +85,15 @@
<el-form-item label="点位状态说明">
<el-input v-model="form.point_status_explain" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否有工单">
<el-form-item label="所属楼层">
<el-input-number v-model="form.belong_floor" :precision="0" :controls="false" :min="1" style="width: 370px" />
</el-form-item>
<!-- <el-form-item label="是否有工单">
<el-radio-group v-model="form.is_has_workder" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item>-->
<el-form-item label="备注" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
</el-form-item>
@@ -107,11 +110,12 @@
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<el-table-column prop="belong_floor" label="所属楼层" :min-width="flexWidth('belong_floor',crud.data,'所属楼层')" />
<!-- <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
{{scope.row.is_has_workder?'是':'否'}}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="order_seq" label="顺序号" :min-width="flexWidth('order_seq',crud.data,'顺序号')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />

22
LMS/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -191,11 +191,11 @@
{{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
<!-- <el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
<template slot-scope="scope">
{{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
</template>
</el-table-column>
</el-table-column>-->
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
<template slot-scope="scope">
@@ -213,8 +213,10 @@
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />-->
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_id" label="物料料号" :min-width="flexWidth('material_id',crud.data,'物料料号')" />
<el-table-column prop="material_pcsn" label="物料批次" :min-width="flexWidth('material_pcsn',crud.data,'物料批次')" />
<el-table-column prop="material_qty" label="物料重量" :min-width="flexWidth('material_qty',crud.data,'物料重量')" />
<el-table-column prop="unit_name" label="单位" :min-width="flexWidth('unit_name',crud.data,'单位')" />
<el-table-column v-if="false" prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
<el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
@@ -232,7 +234,7 @@
</el-table-column>-->
<!-- <el-table-column prop="acs_trace_id" label="链路标识" :min-width="flexWidth('acs_trace_id',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="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',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,'修改人')" />
@@ -256,6 +258,12 @@
@click="doOperate(scope.row, 'b')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
>取消</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="returnTaskMes(scope.row)"
:disabled="scope.row.task_status !== '5'"
>回传</el-button>
</template>
</el-table-column>
</el-table>
@@ -406,6 +414,12 @@ export default {
console.log(err.response.data.message)
})
},
returnTaskMes(row) {
crudSchBaseTask.returnTaskMes(row).then(res => {
this.crud.notify('回传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
down() {
if (this.currentRow !== null) {
const data = this.crud.query

10
LMS/nladmin-ui/src/views/wms/sch/task/task.js
View File

@@ -39,4 +39,12 @@ export function operation(data) {
})
}
export default { add, edit, del, getTaskStatusList, operation}
export function returnTaskMes(data) {
return request({
url: 'api/schBaseTask/returnTaskMes',
method: 'post',
data
})
}
export default { add, edit, del, getTaskStatusList, operation, returnTaskMes }