mt-fe-group/wms-njlm
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
朱文强
2026-02-04 15:18:17 +08:00
parent 1b4baf3ee0
commit 0ea5ee8fda
14 changed files with 244 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@@ -2,7 +2,7 @@
# @Author: zwq # @Author: zwq
# @Date: 2023-08-17 15:10:53 # @Date: 2023-08-17 15:10:53
# @LastEditors: zwq # @LastEditors: zwq
# @LastEditTime: 2024-12-26 10:55:24 # @LastEditTime: 2025-06-20 10:35:36
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 南京锂膜管理系统
# 南京锂膜管理系统/开发环境 # 南京锂膜管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.129:48081' # VUE_APP_BASE_API = 'http://192.168.1.129:48081'
VUE_APP_BASE_API = 'http://192.168.0.31:48081' VUE_APP_BASE_API = 'http://172.16.32.166:48081'
# VUE_APP_BASE_API = 'http://172.16.32.169:48081' # VUE_APP_BASE_API = 'http://172.16.32.169:48081'
# 路由懒加载 # 路由懒加载

2
.env.prod
View File

@@ -2,7 +2,7 @@
# @Author: zwq # @Author: zwq
# @Date: 2023-08-17 15:10:53 # @Date: 2023-08-17 15:10:53
# @LastEditors: zwq # @LastEditors: zwq
# @LastEditTime: 2024-04-28 11:50:59 # @LastEditTime: 2024-08-21 15:54:58
# @Description: # @Description:
### ###
# 生产环境配置 # 生产环境配置

16
src/api/oth/mainTask.js
View File

@@ -1,3 +1,10 @@
/*
* @Author: zwq
* @Date: 2023-09-07 14:01:22
* @LastEditors: zwq
* @LastEditTime: 2026-01-08 14:54:30
* @Description:
*/
import request from '@/utils/request' import request from '@/utils/request'
// 创建主任务 // 创建主任务
@@ -77,3 +84,12 @@ export function Radd(id) {
method: 'get' method: 'get'
}) })
} }
//上报
export function SBapi(data) {
return request({
url: '/asrs/job-main-task/finish',
method: 'put',
data: data
})
}

1
src/views/asrs/buyRoll/add-or-updata.vue
View File

@@ -204,6 +204,7 @@ const regionArrb = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
export default { export default {
components: { productAttrAdd, SmallTitle }, components: { productAttrAdd, SmallTitle },

3
src/views/asrs/delivery/add-or-updatab.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2025-11-26 11:07:40 * @LastEditTime: 2026-01-26 09:17:43
* @Description: * @Description:
--> -->
<template> <template>
@@ -474,6 +474,7 @@ const regionArr = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
export default { export default {
mixins: [basicAdd], mixins: [basicAdd],

1
src/views/asrs/deliveryHis/indexb.vue
View File

@@ -132,6 +132,7 @@ const regionArr = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
const region = [ const region = [
'', '',

3
src/views/asrs/dockTransfer/indexb.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-02-27 14:43:14 * @Date: 2024-02-27 14:43:14
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-12-26 11:47:45 * @LastEditTime: 2026-01-26 09:15:27
* @Description: * @Description:
--> -->
<template> <template>
@@ -94,6 +94,7 @@ const regionArr = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
export default { export default {
data() { data() {

85
src/views/asrs/jobMainTask/index.vue
View File

@@ -14,7 +14,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="80" :width="130"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@@ -41,7 +41,7 @@ import AddOrUpdate from './add-or-updata';
import basicPage from '../mixins/basic-page'; import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import codeFilter from '../mixins/code-filter'; import codeFilter from '../mixins/code-filter';
import { getMainTaskPage, deleteMainTask } from '@/api/oth/mainTask'; import { getMainTaskPage, deleteMainTask, SBapi } from '@/api/oth/mainTask';
import point from './point'; import point from './point';
const tableProps = [ const tableProps = [
@@ -299,6 +299,23 @@ export default {
if (this.$auth.hasPermi(`asrs:job-main-task:changeXD`)) { if (this.$auth.hasPermi(`asrs:job-main-task:changeXD`)) {
this.tableBtn.push(obj); this.tableBtn.push(obj);
} }
const obj1 = {
type: 'changeSB',
btnName: '上报',
showParam: {
type: '&',
data: [
{
type: 'equal',
name: 'mainTaskState',
value: 6,
},
],
},
};
if (this.$auth.hasPermi(`asrs:job-main-task:changeSB`)) {
this.tableBtn.push(obj1);
}
this.setFormConfig(); this.setFormConfig();
}, },
methods: { methods: {
@@ -341,33 +358,43 @@ export default {
} }
}, },
otherMethods(val) { otherMethods(val) {
this.addOrEditTitle = '变更巷道'; if (val.type == 'changeXD') {
this.addOrUpdateVisible = true; this.addOrEditTitle = '变更巷道';
this.$nextTick(() => { this.addOrUpdateVisible = true;
this.$refs.addOrUpdate.init(val.data.id, val.data.barCode, this.bPage); this.$nextTick(() => {
}); this.$refs.addOrUpdate.init(
// this.$confirm( val.data.id,
// `确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`, val.data.barCode,
// '提示', this.bPage
// { );
// confirmButtonText: '确定', });
// cancelButtonText: '取消', } else {
// type: 'warning', this.$confirm(
// } ` 请确认托盘：[托盘编码${val.data.barCode}] 是否到输送线第三段 ?`,
// ) '提示',
// .then(() => { {
// this.urlOptions.deleteURL(val.data.id).then(({ data }) => { confirmButtonText: '确定',
// this.$message({ cancelButtonText: '取消',
// message: '操作成功', type: 'warning',
// type: 'success', }
// duration: 1500, )
// onClose: () => { .then(() => {
// this.getDataList(); console.log(11111,val.data)
// }, SBapi({id:val.data.id}).then(({ data }) => {
// }); this.$message({
// }); message: '操作成功',
// }) type: 'success',
// .catch(() => {}); duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => {
console.log(222222,val.data)
});
}
}, },
}, },
}; };

87
src/views/asrs/jobMainTask/indexb.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-02-27 15:32:56 * @Date: 2024-02-27 15:32:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2025-08-14 15:56:11 * @LastEditTime: 2026-01-12 09:26:45
* @Description: * @Description:
--> -->
<template> <template>
@@ -21,7 +21,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="80" :width="130"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@@ -48,7 +48,7 @@ import AddOrUpdate from './add-or-updata';
import basicPage from '../mixins/basic-page'; import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import codeFilter from '../mixins/code-filter'; import codeFilter from '../mixins/code-filter';
import { getMainTaskPage, deleteMainTask } from '@/api/oth/mainTask'; import { getMainTaskPage, deleteMainTask,SBapi } from '@/api/oth/mainTask';
import point from './point'; import point from './point';
const tableProps = [ const tableProps = [
@@ -307,6 +307,23 @@ export default {
if (this.$auth.hasPermi(`asrs:job-main-task:changeXDb`)) { if (this.$auth.hasPermi(`asrs:job-main-task:changeXDb`)) {
this.tableBtn.push(obj); this.tableBtn.push(obj);
} }
const obj1 = {
type: 'changeSB',
btnName: '上报',
showParam: {
type: '&',
data: [
{
type: 'equal',
name: 'mainTaskState',
value: 6,
},
],
},
};
if (this.$auth.hasPermi(`asrs:job-main-task:changeSBb`)) {
this.tableBtn.push(obj1);
}
this.listQuery.warehouseId = this.bId; this.listQuery.warehouseId = this.bId;
this.setFormConfig(); this.setFormConfig();
}, },
@@ -350,33 +367,43 @@ export default {
} }
}, },
otherMethods(val) { otherMethods(val) {
this.addOrEditTitle = '变更巷道'; if (val.type == 'changeXD') {
this.addOrUpdateVisible = true; this.addOrEditTitle = '变更巷道';
this.$nextTick(() => { this.addOrUpdateVisible = true;
this.$refs.addOrUpdate.init(val.data.id,val.data.barCode,this.bPage); this.$nextTick(() => {
}); this.$refs.addOrUpdate.init(
// this.$confirm( val.data.id,
// `确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`, val.data.barCode,
// '提示', this.bPage
// { );
// confirmButtonText: '确定', });
// cancelButtonText: '取消', } else {
// type: 'warning', this.$confirm(
// } ` 请确认托盘：[托盘编码${val.data.barCode}] 是否到输送线第三段 ?`,
// ) '提示',
// .then(() => { {
// this.urlOptions.deleteURL(val.data.id).then(({ data }) => { confirmButtonText: '确定',
// this.$message({ cancelButtonText: '取消',
// message: '操作成功', type: 'warning',
// type: 'success', }
// duration: 1500, )
// onClose: () => { .then(() => {
// this.getDataList(); console.log(111112222,val.data)
// }, SBapi({id:val.data.id}).then(({ data }) => {
// }); this.$message({
// }); message: '操作成功',
// }) type: 'success',
// .catch(() => {}); duration: 1500,
onClose: () => {
this.getDataList();
},
});
});
})
.catch(() => {
console.log(222222,val.data)
});
}
}, },
}, },
}; };

119
src/views/asrs/warehouseLineMonitoring/indexb.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-01-17 09:58:41 * @Date: 2024-01-17 09:58:41
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2025-06-20 10:54:21 * @LastEditTime: 2026-01-15 14:17:36
* @Description: * @Description:
--> -->
<template> <template>
@@ -349,42 +349,89 @@
</el-popover> </el-popover>
</div> </div>
</el-row> </el-row>
<el-divider class="divider" content-position="left"> <el-row :gutter="20">
二次分切区 <el-col :span="14">
</el-divider> <el-divider class="divider" content-position="left">
<el-row style="margin-bottom: 10px" type="flex" class="flex-warp"> 二次分切区
<div </el-divider>
class="dashboard-layout-item interval" <el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
v-for="j in wareData.filter((item) => item.region == 28).reverse()"
:key="j.id"
:title="j.lineEdgeLibraryCode">
<el-popover
placement="top-start"
:title="j.lineEdgeLibraryCode"
width="200"
trigger="hover">
<div class="point" />
托盘编码: {{ j.trayCode }}
<br />
<div class="point" />
Agv地码: {{ j.agvGroundCode }}
<br />
<el-button
@click="lState(j.id)"
v-hasPermi="['asrs:warehouse-line-monitoring:change']"
type="text">
改变库位状态
</el-button>
<div <div
slot="reference" class="dashboard-layout-item interval"
class="hoverDiv" v-for="j in wareData
:style="{ .filter((item) => item.region == 28)
cursor: .reverse()"
j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer', :key="j.id"
background: bgColor[j.lineEdgeLibraryState], :title="j.lineEdgeLibraryCode">
}"></div> <el-popover
</el-popover> placement="top-start"
</div> :title="j.lineEdgeLibraryCode"
width="200"
trigger="hover">
<div class="point" />
托盘编码: {{ j.trayCode }}
<br />
<div class="point" />
Agv地码: {{ j.agvGroundCode }}
<br />
<el-button
@click="lState(j.id)"
v-hasPermi="['asrs:warehouse-line-monitoring:change']"
type="text">
改变库位状态
</el-button>
<div
slot="reference"
class="hoverDiv"
:style="{
cursor:
j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
background: bgColor[j.lineEdgeLibraryState],
}"></div>
</el-popover>
</div>
</el-row>
</el-col>
<el-col :span="10">
<el-divider class="divider" content-position="left">
检验区
</el-divider>
<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
<div
class="dashboard-layout-item"
v-for="j in wareData
.filter((item) => item.region == 30)
.reverse()"
:key="j.id"
:title="j.lineEdgeLibraryCode">
<el-popover
placement="top-start"
:title="j.lineEdgeLibraryCode"
width="200"
trigger="hover">
<div class="point" />
托盘编码: {{ j.trayCode }}
<br />
<div class="point" />
Agv地码: {{ j.agvGroundCode }}
<br />
<el-button
@click="lState(j.id)"
v-hasPermi="['asrs:warehouse-line-monitoring:change']"
type="text">
改变库位状态
</el-button>
<div
slot="reference"
class="hoverDiv"
:style="{
cursor:
j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
background: bgColor[j.lineEdgeLibraryState],
}"></div>
</el-popover>
</div>
</el-row>
</el-col>
</el-row> </el-row>
<el-divider class="divider" content-position="left">涂覆区</el-divider> <el-divider class="divider" content-position="left">涂覆区</el-divider>
<div v-for="i in 8" :key="i + 'C'"> <div v-for="i in 8" :key="i + 'C'">

1
src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
View File

@@ -246,6 +246,7 @@ const regionArrb = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
export default { export default {
components: { productAttrAdd, SmallTitle }, components: { productAttrAdd, SmallTitle },

3
src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-12-26 14:38:40 * @LastEditTime: 2026-01-26 09:17:33
* @Description: * @Description:
--> -->
<template> <template>
@@ -135,6 +135,7 @@ const regionArrb = [
{ name: '手动包装区', id: 23 }, { name: '手动包装区', id: 23 },
{ name: '一次分拣区', id: 22 }, { name: '一次分拣区', id: 22 },
{ name: '二次分拣区', id: 20 }, { name: '二次分拣区', id: 20 },
{ name: '检验区域', id: 30 },
]; ];
export default { export default {
mixins: [basicAdd], mixins: [basicAdd],

18
src/views/wcsAlarm/index.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-04-22 09:48:26 * @Date: 2024-04-22 09:48:26
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-04-22 10:35:01 * @LastEditTime: 2026-01-12 09:05:00
* @Description: * @Description:
--> -->
<template> <template>
@@ -71,6 +71,22 @@ const stackerArr = [
name: 'DDJ4', name: 'DDJ4',
id: 4, id: 4,
}, },
{
name: 'DDJ5',
id: 5,
},
{
name: 'DDJ6',
id: 6,
},
{
name: 'DDJ7',
id: 7,
},
{
name: 'DDJ8',
id: 8,
},
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage],

6
src/views/wcsAlarm/real1.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-05-21 14:25:27 * @Date: 2024-05-21 14:25:27
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2025-12-31 09:58:18 * @LastEditTime: 2026-01-15 14:09:03
* @Description: * @Description:
--> -->
<template> <template>
@@ -33,7 +33,7 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-divider content-position="left">1-2巷道输送线报警信息</el-divider> <el-divider content-position="left">5-6巷道输送线报警信息</el-divider>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line3Status'))" :key="i + 'ssx1'" :span="4"> <el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line3Status'))" :key="i + 'ssx1'" :span="4">
<el-card class="box-card" style="min-width: 240px"> <el-card class="box-card" style="min-width: 240px">
@@ -57,7 +57,7 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-divider content-position="left">3-4巷道输送线报警信息</el-divider> <el-divider content-position="left">7-8巷道输送线报警信息</el-divider>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line4Status'))" :key="i + 'ssx2'" :span="4"> <el-col v-for="(item,i) in Info.filter(a=>a.name.startsWith('line4Status'))" :key="i + 'ssx2'" :span="4">
<el-card class="box-card" style="min-width: 240px"> <el-card class="box-card" style="min-width: 240px">