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

更新

Browse Source
This commit is contained in:
朱文强
2025-11-28 16:30:12 +08:00
parent f5d8b37c09
commit 43918cc8a8
15 changed files with 488 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/oth/delivery.js
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2024-04-16 15:08:37 * @Date: 2024-04-16 15:08:37
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-07-15 13:42:39 * @LastEditTime: 2025-11-26 11:15:22
* @Description: * @Description:
*/ */
import request from '@/utils/request' import request from '@/utils/request'
@@ -122,7 +122,8 @@ export function exportDeliveryHisExcel(query) {
url: '/asrs/delivery-history-product/export-excel', url: '/asrs/delivery-history-product/export-excel',
method: 'get', method: 'get',
params: query, params: query,
responseType: 'blob' responseType: 'blob',
timeout: 60000,
}) })
} }

2
src/layout/index.vue
View File

@@ -129,7 +129,7 @@ export default {
this.timer = null; this.timer = null;
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.getRealAlarm(); this.getRealAlarm();
}, 10000); }, 20000);
}, },
getRealAlarm() { getRealAlarm() {
axios axios

183
src/views/asrs/buyRoll/index.vue
View File

@@ -5,20 +5,98 @@
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
@headBtnClick="buttonClick" /> @headBtnClick="buttonClick" />
<base-table <el-table
:data="tableData"
:header-cell-style="{
background: '#F2F4F9',
color: '#606266',
}"
border
v-loading="dataListLoading" v-loading="dataListLoading"
:table-props="tableProps" style="width: 100%"
:page="listQuery.pageNo" ref="dataList">
:limit="listQuery.pageSize" <el-table-column type="expand">
:table-data="tableData"> <template slot-scope="scope">
<method-btn <product
v-if="tableBtn.length" :warehouse-id="listQuery.warehouseId"
slot="handleBtn" :warehouseStorehouseStorageId="
:width="80" scope.row.warehouseStorehouseStorageId
label="操作" "></product>
:method-list="tableBtn" </template>
@clickBtn="handleClick" /> </el-table-column>
</base-table> <el-table-column prop="mainTaskCode" label="任务编码" width="155" />
<el-table-column prop="inOutWarehouseName" label="出入移库库位" />
<el-table-column prop="relocationWarehouseName" label="移库终点库位" />
<el-table-column prop="mainTaskType" label="任务类型" width="100">
<template slot-scope="scope">
<span>
{{
{
1: '入库',
2: '出库',
3: '移库',
4: '出库+移库',
5: '不带agv入库',
6: '不带agv出库',
7: '入库+6臂空托盘出库',
8: '不带agv出库+移库',
9: '入库+12臂空托盘出库',
10: '平库移库',
11: '盘库出库',
12: '盘库入库',
13: '盘库出库+移库',
}[scope.row.mainTaskType]
}}
</span>
</template>
</el-table-column>
<el-table-column prop="stacker" label="堆垛机" />
<el-table-column prop="barCode" label="托盘编码" />
<el-table-column prop="agv" label="agv" />
<el-table-column prop="agvStartPoint" label="AGV起点" />
<el-table-column prop="agvEndPoint" label="AGV终点" />
<el-table-column prop="mainTaskState" label="状态">
<template slot-scope="scope">
{{
{
0: '开始',
1: '已发送agv',
2: 'agv运行中',
3: '已发送堆垛机',
4: '堆垛机运行中',
5: '完成',
6: '已发送传输线',
7: '传输线运行中',
8: '暂时无空托盘',
}[scope.row.mainTaskState]
}}
<el-button
v-if="scope.row.mainTaskState === 8"
type="text"
size="mini"
@click="Radd()">
重补
</el-button>
</template>
</el-table-column>
<el-table-column prop="taskSource" label="任务来源">
<template slot-scope="scope">
{{
{
1: 'mes下发',
2: 'wms手动',
3: '自动包装线',
4: 'wms外购',
}[scope.row.taskSource]
}}
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="150">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination <pagination
:limit.sync="listQuery.pageSize" :limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo" :page.sync="listQuery.pageNo"
@@ -33,71 +111,15 @@
</template> </template>
<script> <script>
import product from './product-mini';
import drawerAdd from './add-or-updata.vue'; import drawerAdd from './add-or-updata.vue';
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 { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory'; import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
import { Radd } from '@/api/oth/mainTask';
import point from './point'; import point from './point';
const tableProps = [
{
prop: 'mainTaskCode',
label: '任务编码',
},
{
prop: 'inOutWarehouseName',
label: '出入移库库位',
},
{
prop: 'relocationWarehouseName',
label: '移库终点库位',
},
{
prop: 'mainTaskType',
label: '任务类型',
filter: codeFilter('mainTaskType'),
width: 100,
},
{
prop: 'stacker',
label: '堆垛机',
width: 110,
},
{
prop: 'barCode',
label: '托盘编码',
},
{
prop: 'agv',
label: 'agv',
},
{
prop: 'agvStartPoint',
label: 'AGV起点',
},
{
prop: 'agvEndPoint',
label: 'AGV终点',
},
{
prop: 'mainTaskState',
label: '状态',
subcomponent: point,
},
{
prop: 'taskSource',
label: '任务来源',
filter: codeFilter('taskSourceBuyIn'),
width: 100,
},
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
width: 150,
},
];
const mainTaskType = [ const mainTaskType = [
{ {
name: '入库', name: '入库',
@@ -194,6 +216,7 @@ export default {
mixins: [basicPage], mixins: [basicPage],
components: { components: {
drawerAdd, drawerAdd,
product,
}, },
data() { data() {
return { return {
@@ -207,13 +230,6 @@ export default {
total: 1, total: 1,
}, },
drawerVisible: false, drawerVisible: false,
tableProps,
tableBtn: [
// {
// type: 'canlce',
// btnName: '取消',
// },
],
tableData: [], tableData: [],
formConfig: [ formConfig: [
{ {
@@ -285,7 +301,7 @@ export default {
}; };
}, },
created() { created() {
this.listQuery.taskSource = 4; this.listQuery.taskSource = 4;
this.setFormConfig(); this.setFormConfig();
}, },
methods: { methods: {
@@ -334,6 +350,15 @@ export default {
console.log(val); console.log(val);
} }
}, },
Radd() {
Radd(this.injectData.id).then((response) => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
});
});
},
otherMethods(val) { otherMethods(val) {
this.$confirm( this.$confirm(
`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`, `确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,

185
src/views/asrs/buyRoll/indexb.vue
View File

@@ -5,20 +5,98 @@
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
@headBtnClick="buttonClick" /> @headBtnClick="buttonClick" />
<base-table <el-table
:data="tableData"
:header-cell-style="{
background: '#F2F4F9',
color: '#606266',
}"
border
v-loading="dataListLoading" v-loading="dataListLoading"
:table-props="tableProps" style="width: 100%"
:page="listQuery.pageNo" ref="dataList">
:limit="listQuery.pageSize" <el-table-column type="expand">
:table-data="tableData"> <template slot-scope="scope">
<method-btn <product
v-if="tableBtn.length" :warehouse-id="listQuery.warehouseId"
slot="handleBtn" :warehouseStorehouseStorageId="
:width="80" scope.row.warehouseStorehouseStorageId
label="操作" "></product>
:method-list="tableBtn" </template>
@clickBtn="handleClick" /> </el-table-column>
</base-table> <el-table-column prop="mainTaskCode" label="任务编码" width="155" />
<el-table-column prop="inOutWarehouseName" label="出入移库库位" />
<el-table-column prop="relocationWarehouseName" label="移库终点库位" />
<el-table-column prop="mainTaskType" label="任务类型" width="100">
<template slot-scope="scope">
<span>
{{
{
1: '入库',
2: '出库',
3: '移库',
4: '出库+移库',
5: '不带agv入库',
6: '不带agv出库',
7: '入库+6臂空托盘出库',
8: '不带agv出库+移库',
9: '入库+12臂空托盘出库',
10: '平库移库',
11: '盘库出库',
12: '盘库入库',
13: '盘库出库+移库',
}[scope.row.mainTaskType]
}}
</span>
</template>
</el-table-column>
<el-table-column prop="stacker" label="堆垛机" />
<el-table-column prop="barCode" label="托盘编码" />
<el-table-column prop="agv" label="agv" />
<el-table-column prop="agvStartPoint" label="AGV起点" />
<el-table-column prop="agvEndPoint" label="AGV终点" />
<el-table-column prop="mainTaskState" label="状态">
<template slot-scope="scope">
{{
{
0: '开始',
1: '已发送agv',
2: 'agv运行中',
3: '已发送堆垛机',
4: '堆垛机运行中',
5: '完成',
6: '已发送传输线',
7: '传输线运行中',
8: '暂时无空托盘',
}[scope.row.mainTaskState]
}}
<el-button
v-if="scope.row.mainTaskState === 8"
type="text"
size="mini"
@click="Radd()">
重补
</el-button>
</template>
</el-table-column>
<el-table-column prop="taskSource" label="任务来源">
<template slot-scope="scope">
{{
{
1: 'mes下发',
2: 'wms手动',
3: '自动包装线',
4: 'wms外购',
}[scope.row.taskSource]
}}
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="150">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination <pagination
:limit.sync="listQuery.pageSize" :limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo" :page.sync="listQuery.pageNo"
@@ -33,71 +111,15 @@
</template> </template>
<script> <script>
import product from './product-mini';
import drawerAdd from './add-or-updata.vue'; import drawerAdd from './add-or-updata.vue';
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 { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory'; import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
import { Radd } from '@/api/oth/mainTask';
import point from './point'; import point from './point';
const tableProps = [
{
prop: 'mainTaskCode',
label: '任务编码',
},
{
prop: 'inOutWarehouseName',
label: '出入移库库位',
},
{
prop: 'relocationWarehouseName',
label: '移库终点库位',
},
{
prop: 'mainTaskType',
label: '任务类型',
filter: codeFilter('mainTaskType'),
width: 100,
},
{
prop: 'stacker',
label: '堆垛机',
width: 110,
},
{
prop: 'barCode',
label: '托盘编码',
},
{
prop: 'agv',
label: 'agv',
},
{
prop: 'agvStartPoint',
label: 'AGV起点',
},
{
prop: 'agvEndPoint',
label: 'AGV终点',
},
{
prop: 'mainTaskState',
label: '状态',
subcomponent: point,
},
{
prop: 'taskSource',
label: '任务来源',
filter: codeFilter('taskSourceBuyIn'),
width: 100,
},
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
width: 150,
},
];
const mainTaskType = [ const mainTaskType = [
{ {
name: '入库', name: '入库',
@@ -194,6 +216,7 @@ export default {
mixins: [basicPage], mixins: [basicPage],
components: { components: {
drawerAdd, drawerAdd,
product
}, },
data() { data() {
return { return {
@@ -207,13 +230,6 @@ export default {
total: 1, total: 1,
}, },
drawerVisible: false, drawerVisible: false,
tableProps,
tableBtn: [
// {
// type: 'canlce',
// btnName: '取消',
// },
],
tableData: [], tableData: [],
formConfig: [ formConfig: [
{ {
@@ -285,8 +301,8 @@ export default {
}; };
}, },
created() { created() {
this.listQuery.warehouseId = this.bId this.listQuery.warehouseId = this.bId;
this.listQuery.taskSource = 4; this.listQuery.taskSource = 4;
this.setFormConfig(); this.setFormConfig();
}, },
methods: { methods: {
@@ -335,6 +351,15 @@ export default {
console.log(val); console.log(val);
} }
}, },
Radd() {
Radd(this.injectData.id).then((response) => {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
});
});
},
otherMethods(val) { otherMethods(val) {
this.$confirm( this.$confirm(
`确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`, `确定对${'[任务编码=' + val.data.mainTaskCode + ']'}进行取消操作?`,

84
src/views/asrs/buyRoll/product-mini.vue Normal file
View File

@@ -0,0 +1,84 @@
<!--
* @Author: zwq
* @Date: 2023-08-24 14:47:58
* @LastEditors: zwq
* @LastEditTime: 2025-11-26 14:07:19
* @Description:
-->
<template>
<div>
<!-- <div class="app-container"> -->
<base-table
v-loading="dataListLoading"
:table-props="tableProps"
max-height="200"
:table-data="tableData" />
</div>
</template>
<script>
import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter';
import codeFilter from '../mixins/code-filter';
import {
getWarehouseStorehouseStorageGoodsSpecificationPage,
} from '@/api/asrs/warehouseStorehouseStorageGoodsSpecification';
const tableProps = [
{
prop: 'goodSpecificationName',
label: '产品名',
},
{
prop: 'rollCode',
label: '膜卷编码',
},
{
prop: 'specification',
label: '产品规格',
filter: codeFilter('specification'),
},
{
prop: 'number',
label: '数量',
},
];
export default {
mixins: [basicPage],
props: {
warehouseId: {
type: String,
default: '',
},
warehouseStorehouseStorageId: {
type: String,
default: '',
},
},
data() {
return {
urlOptions: {
getDataListURL: getWarehouseStorehouseStorageGoodsSpecificationPage,
},
tableProps,
tableData: [],
listQuery: {
pageSize: 100,
pageNo: 1,
total: 1,
warehouseId:this.warehouseId,
warehouseStorehouseStorageId:this.warehouseStorehouseStorageId,
},
};
},
components: {
},
created() {
},
methods: {
},
};
</script>

63
src/views/asrs/delivery/add-or-updata.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-08-14 09:47:56 * @LastEditTime: 2025-11-26 11:08:44
* @Description: * @Description:
--> -->
<template> <template>
@@ -12,7 +12,8 @@
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmit()" @keyup.enter.native="dataFormSubmit()"
label-width="100px"> label-width="100px"
label-position="top">
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出库单号" prop="deliveryCode"> <el-form-item label="出库单号" prop="deliveryCode">
@@ -177,6 +178,14 @@
placeholder="请输入申请人" /> placeholder="请输入申请人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="dataForm.deliveryType === 3">
<el-form-item label="出库事由" prop="outwhy">
<el-input
v-model="dataForm.outwhy"
clearable
placeholder="请输入出库事由" />
</el-form-item>
</el-col>
<div v-if="dataForm.deliveryType === 3"> <div v-if="dataForm.deliveryType === 3">
<el-table <el-table
:data="tableData" :data="tableData"
@@ -246,6 +255,11 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="freeze" label="是否冻结" width="80">
<template v-slot="scope">
<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="50"> <el-table-column fixed="right" label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -369,7 +383,7 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.8)"> element-loading-background="rgba(0, 0, 0, 0.8)">
<el-table-column type="index" fixed="left" label="#" align="center" /> <el-table-column type="index" fixed="left" label="#" align="center" />
<el-table-column label="" width="40"> <el-table-column label="" width="40" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-plus" class="el-icon-plus"
@@ -377,21 +391,45 @@
style="color: #409eff; cursor: pointer; font-weight: bolder" /> style="color: #409eff; cursor: pointer; font-weight: bolder" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="trayCode" label="托盘编码" width="80" /> <el-table-column
<el-table-column property="productCode" label="物料编码" width="120" /> property="trayCode"
<el-table-column property="description" label="物料名称" /> fixed="left"
label="托盘编码"
width="80" />
<el-table-column
property="productCode"
fixed="left"
label="物料编码"
width="120" />
<el-table-column
property="description"
fixed="left"
label="物料名称"
show-overflow-tooltip
width="200" />
<el-table-column property="planQty" label="数量" width="80" /> <el-table-column property="planQty" label="数量" width="80" />
<el-table-column property="grade" label="货物品质" width="80" /> <el-table-column property="grade" label="货物品质" width="80" />
<el-table-column property="cpGrade" label="初判等级" width="80" /> <el-table-column property="cpGrade" label="初判等级" width="80" />
<el-table-column property="fpGrade" label="复判等级" width="80" /> <el-table-column property="fpGrade" label="复判等级" width="80" />
<el-table-column property="inventory" label="膜卷号" width="160" /> <el-table-column property="inventory" label="膜卷号" width="168" />
<el-table-column property="freeze" label="是否冻结" width="80">
<template v-slot="scope">
<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
</template>
</el-table-column>
<el-table-column property="freezeType" label="冻结类型" width="80" />
<el-table-column
property="freezeNote"
label="冻结备注"
show-overflow-tooltip
width="80" />
<el-table-column property="process" label="工序" width="80" /> <el-table-column property="process" label="工序" width="80" />
<el-table-column property="createTime" label="入库时间" width="160"> <el-table-column property="createTime" label="入库时间" width="150">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="finishTime" label="完成日期" width="160"> <el-table-column property="finishTime" label="完成日期" width="150">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.finishTime) }}</span> <span>{{ parseTime(scope.row.finishTime) }}</span>
</template> </template>
@@ -461,6 +499,7 @@ export default {
workOrder: null, workOrder: null,
department: null, department: null,
applicant: null, applicant: null,
outwhy: null,
process: null, process: null,
}, },
listQuery: { listQuery: {
@@ -521,6 +560,9 @@ export default {
applicant: [ applicant: [
{ required: true, message: '申请人不能为空', trigger: 'blur' }, { required: true, message: '申请人不能为空', trigger: 'blur' },
], ],
outwhy: [
{ required: true, message: '出库事由不能为空', trigger: 'blur' },
],
}, },
}; };
}, },
@@ -624,6 +666,7 @@ export default {
); );
this.$set(this.tableData[this.trayIndex], 'process', val.process); this.$set(this.tableData[this.trayIndex], 'process', val.process);
this.$set(this.tableData[this.trayIndex], 'earlyTime', 0); this.$set(this.tableData[this.trayIndex], 'earlyTime', 0);
this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
} else { } else {
this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', { this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -654,6 +697,7 @@ export default {
); );
this.$set(this.tableData[this.trayIndex], 'process', val.process); this.$set(this.tableData[this.trayIndex], 'process', val.process);
this.$set(this.tableData[this.trayIndex], 'earlyTime', 1); this.$set(this.tableData[this.trayIndex], 'earlyTime', 1);
this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
}) })
.catch(() => { .catch(() => {
return; return;
@@ -718,6 +762,7 @@ export default {
item.deliveryCode = this.dataForm.deliveryCode; item.deliveryCode = this.dataForm.deliveryCode;
item.department = this.dataForm.department; item.department = this.dataForm.department;
item.applicant = this.dataForm.applicant; item.applicant = this.dataForm.applicant;
item.outwhy = this.dataForm.outwhy;
item.warehouseId = this.aId; item.warehouseId = this.aId;
item.deliveryType = 3; item.deliveryType = 3;
item.needTrayNumber = 1; item.needTrayNumber = 1;

85
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-08-14 09:33:21 * @LastEditTime: 2025-11-26 11:07:40
* @Description: * @Description:
--> -->
<template> <template>
@@ -12,7 +12,8 @@
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmit()" @keyup.enter.native="dataFormSubmit()"
label-width="100px"> label-width="100px"
label-position="top">
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出库单号" prop="deliveryCode"> <el-form-item label="出库单号" prop="deliveryCode">
@@ -177,6 +178,14 @@
placeholder="请输入申请人" /> placeholder="请输入申请人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="dataForm.deliveryType === 3">
<el-form-item label="出库事由" prop="outwhy">
<el-input
v-model="dataForm.outwhy"
clearable
placeholder="请输入出库事由" />
</el-form-item>
</el-col>
<div v-if="dataForm.deliveryType === 3"> <div v-if="dataForm.deliveryType === 3">
<el-table <el-table
:data="tableData" :data="tableData"
@@ -214,7 +223,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
{{ {{
scope.row.region ? regionArr.filter(item=>{return item.id===scope.row.region})[0].name: '' scope.row.region
? regionArr.filter((item) => {
return item.id === scope.row.region;
})[0].name
: ''
}} }}
</span> </span>
</template> </template>
@@ -236,10 +249,21 @@
<el-table-column prop="earlyTime" label="最早时间"> <el-table-column prop="earlyTime" label="最早时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
{{ scope.row.earlyTime?scope.row.earlyTime == 0 ? '是' : '否':'' }} {{
scope.row.earlyTime
? scope.row.earlyTime == 0
? '是'
: '否'
: ''
}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="freeze" label="是否冻结" width="80">
<template v-slot="scope">
<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="50"> <el-table-column fixed="right" label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -315,7 +339,10 @@
clearable /> clearable />
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="planQty"> <el-form-item label="数量" prop="planQty">
<el-input v-model="listQuery.planQty" clearable placeholder="请输入数量" /> <el-input
v-model="listQuery.planQty"
clearable
placeholder="请输入数量" />
</el-form-item> </el-form-item>
<el-form-item label="当日工单" prop="todayOrder"> <el-form-item label="当日工单" prop="todayOrder">
<el-input <el-input
@@ -360,7 +387,7 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.8)"> element-loading-background="rgba(0, 0, 0, 0.8)">
<el-table-column type="index" fixed="left" label="#" align="center" /> <el-table-column type="index" fixed="left" label="#" align="center" />
<el-table-column label="" width="40"> <el-table-column label="" width="40" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-plus" class="el-icon-plus"
@@ -368,21 +395,45 @@
style="color: #409eff; cursor: pointer; font-weight: bolder" /> style="color: #409eff; cursor: pointer; font-weight: bolder" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="trayCode" label="托盘编码" width="80" /> <el-table-column
<el-table-column property="productCode" label="物料编码" width="120" /> property="trayCode"
<el-table-column property="description" label="物料名称" /> fixed="left"
label="托盘编码"
width="80" />
<el-table-column
property="productCode"
fixed="left"
label="物料编码"
width="120" />
<el-table-column
property="description"
fixed="left"
label="物料名称"
show-overflow-tooltip
width="200" />
<el-table-column property="planQty" label="数量" width="80" /> <el-table-column property="planQty" label="数量" width="80" />
<el-table-column property="grade" label="货物品质" width="80" /> <el-table-column property="grade" label="货物品质" width="80" />
<el-table-column property="cpGrade" label="初判等级" width="80" /> <el-table-column property="cpGrade" label="初判等级" width="80" />
<el-table-column property="fpGrade" label="复判等级" width="80" /> <el-table-column property="fpGrade" label="复判等级" width="80" />
<el-table-column property="inventory" label="膜卷号" width="160" /> <el-table-column property="inventory" label="膜卷号" width="160" />
<el-table-column property="freeze" label="是否冻结" width="80">
<template v-slot="scope">
<span>{{ scope.row.freeze == 1 ? '冻结' : '否' }}</span>
</template>
</el-table-column>
<el-table-column property="freezeType" label="冻结类型" width="80" />
<el-table-column
property="freezeNote"
label="冻结备注"
show-overflow-tooltip
width="80" />
<el-table-column property="process" label="工序" width="80" /> <el-table-column property="process" label="工序" width="80" />
<el-table-column property="createTime" label="入库时间" width="160"> <el-table-column property="createTime" label="入库时间" width="150">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="finishTime" label="完成日期" width="160"> <el-table-column property="finishTime" label="完成日期" width="150">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.finishTime) }}</span> <span>{{ parseTime(scope.row.finishTime) }}</span>
</template> </template>
@@ -405,7 +456,7 @@ import {
getDelivery, getDelivery,
getCode, getCode,
createDeliveryList, createDeliveryList,
checkGoods checkGoods,
} from '@/api/oth/delivery'; } from '@/api/oth/delivery';
import { getPage } from '@/api/oth/rollMessage'; import { getPage } from '@/api/oth/rollMessage';
import { getLineList } from '@/api/asrs/warehouseStorehouse'; import { getLineList } from '@/api/asrs/warehouseStorehouse';
@@ -452,6 +503,7 @@ export default {
workOrder: null, workOrder: null,
department: null, department: null,
applicant: null, applicant: null,
outwhy: null,
process: null, process: null,
}, },
listQuery: { listQuery: {
@@ -512,6 +564,9 @@ export default {
applicant: [ applicant: [
{ required: true, message: '申请人不能为空', trigger: 'blur' }, { required: true, message: '申请人不能为空', trigger: 'blur' },
], ],
outwhy: [
{ required: true, message: '出库事由不能为空', trigger: 'blur' },
],
}, },
}; };
}, },
@@ -594,6 +649,7 @@ export default {
containerCode: val.containerCode, containerCode: val.containerCode,
warehouseId: this.bId, warehouseId: this.bId,
}; };
console.log(val);
checkGoods(params).then((res) => { checkGoods(params).then((res) => {
if (res == 0) { if (res == 0) {
this.innerVisible = false; this.innerVisible = false;
@@ -615,6 +671,7 @@ export default {
); );
this.$set(this.tableData[this.trayIndex], 'process', val.process); this.$set(this.tableData[this.trayIndex], 'process', val.process);
this.$set(this.tableData[this.trayIndex], 'earlyTime', 0); this.$set(this.tableData[this.trayIndex], 'earlyTime', 0);
this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
} else { } else {
this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', { this.$confirm('该货物不是完成日期最早货物，是否选择出库?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -645,6 +702,7 @@ export default {
); );
this.$set(this.tableData[this.trayIndex], 'process', val.process); this.$set(this.tableData[this.trayIndex], 'process', val.process);
this.$set(this.tableData[this.trayIndex], 'earlyTime', 1); this.$set(this.tableData[this.trayIndex], 'earlyTime', 1);
this.$set(this.tableData[this.trayIndex], 'freeze', val.freeze);
}) })
.catch(() => { .catch(() => {
return; return;
@@ -709,6 +767,7 @@ export default {
item.deliveryCode = this.dataForm.deliveryCode; item.deliveryCode = this.dataForm.deliveryCode;
item.department = this.dataForm.department; item.department = this.dataForm.department;
item.applicant = this.dataForm.applicant; item.applicant = this.dataForm.applicant;
item.outwhy = this.dataForm.outwhy;
item.warehouseId = this.bId; item.warehouseId = this.bId;
item.deliveryType = 3; item.deliveryType = 3;
item.needTrayNumber = 1; item.needTrayNumber = 1;
@@ -732,7 +791,7 @@ export default {
return; return;
} }
// 添加的提交 // 添加的提交
this.dataForm.warehouseId = '1698950657556340737' this.dataForm.warehouseId = '1698950657556340737';
this.urlOptions.createURL(this.dataForm).then((response) => { this.urlOptions.createURL(this.dataForm).then((response) => {
if (response.data === -1) { if (response.data === -1) {
this.$modal.msgWarning('排、列、层不能重复'); this.$modal.msgWarning('排、列、层不能重复');

2
src/views/asrs/delivery/index.vue
View File

@@ -119,7 +119,7 @@ const tableProps = [
prop: 'earlyTime', prop: 'earlyTime',
label: '最早时间', label: '最早时间',
filter: (val) => { filter: (val) => {
val == 0 ? '是' : '否'; return val == 0 ? '是' : '否';
}, },
}, },
{ {

2
src/views/asrs/delivery/indexb.vue
View File

@@ -119,7 +119,7 @@ const tableProps = [
prop: 'earlyTime', prop: 'earlyTime',
label: '最早时间', label: '最早时间',
filter: (val) => { filter: (val) => {
val == 0 ? '是' : '否'; return val == 0 ? '是' : '否';
}, },
}, },
{ {

15
src/views/asrs/deliveryHis/product-mini.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-24 14:47:58 * @Date: 2023-08-24 14:47:58
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-05-31 14:07:27 * @LastEditTime: 2025-11-26 12:51:42
* @Description: * @Description:
--> -->
<template> <template>
@@ -83,6 +83,19 @@ const tableProps = [
prop: 'lineId', prop: 'lineId',
label: '行号', label: '行号',
}, },
{
prop: 'freeze',
label: '是否冻结',
filter: (val)=>{return val == 1 ? '冻结' : '否'}
},
{
prop: 'freezeType',
label: '冻结类型',
},
{
prop: 'freezeNote',
label: '冻结备注',
},
{ {
prop: 'createTime', prop: 'createTime',
label: '创建时间', label: '创建时间',

13
src/views/asrs/jobMainTask/add-or-updata.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-08-14 13:57:21 * @LastEditTime: 2025-09-04 09:19:29
* @Description: * @Description:
--> -->
<template> <template>
@@ -40,7 +40,10 @@
</template> </template>
<script> <script>
import { updatestacker, getLibraryPage } from '@/api/oth/mainTask'; import { updatestacker } from '@/api/oth/mainTask';
import {
getLineList,
} from '@/api/asrs/warehouseStorehouse';
const stackerArr1 = [ const stackerArr1 = [
{ {
@@ -118,12 +121,10 @@ export default {
this.stackerArr = this.stackerArr1; this.stackerArr = this.stackerArr1;
} }
const params = { const params = {
pageSize: 100,
pageNo: 1,
warehouseId: this.dataForm.warehouseId, warehouseId: this.dataForm.warehouseId,
}; };
getLibraryPage(params).then((res) => { getLineList(params).then((res) => {
this.libraryArr = res.data.list; this.libraryArr = res.data;
}); });
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields(); this.$refs['dataForm'].resetFields();

16
src/views/asrs/rollMessage/index.vue
View File

@@ -29,6 +29,7 @@ const tableProps = [
prop: 'workOrderCode', prop: 'workOrderCode',
label: '入库单号', label: '入库单号',
width: 170, width: 170,
fixed: true,
}, },
{ {
prop: 'process', prop: 'process',
@@ -142,6 +143,21 @@ const tableProps = [
label: '物料类型描述', label: '物料类型描述',
width: 100, width: 100,
}, },
{
prop: 'freeze',
label: '是否冻结',
filter: (val) => {
return val == 1 ? '冻结' : '否';
},
},
{
prop: 'freezeType',
label: '冻结类型',
},
{
prop: 'freezeNote',
label: '冻结备注',
},
{ {
prop: 'customCode', prop: 'customCode',
label: '客户编码', label: '客户编码',

28
src/views/asrs/rollMessage/indexb.vue
View File

@@ -29,6 +29,7 @@ const tableProps = [
prop: 'workOrderCode', prop: 'workOrderCode',
label: '入库单号', label: '入库单号',
width: 170, width: 170,
fixed: true,
}, },
{ {
prop: 'process', prop: 'process',
@@ -146,6 +147,21 @@ const tableProps = [
prop: 'customCode', prop: 'customCode',
label: '客户编码', label: '客户编码',
}, },
{
prop: 'freeze',
label: '是否冻结',
filter: (val) => {
return val == '1' ? '冻结' : '否';
},
},
{
prop: 'freezeType',
label: '冻结类型',
},
{
prop: 'freezeNote',
label: '冻结备注',
},
{ {
prop: 'sfcCreateTime', prop: 'sfcCreateTime',
label: '膜卷生产时间', label: '膜卷生产时间',
@@ -169,7 +185,7 @@ export default {
}, },
tableProps, tableProps,
tableData: [], tableData: [],
getTrayCode: undefined, getTrayCode: undefined,
formConfig: [ formConfig: [
{ {
type: 'input', type: 'input',
@@ -248,11 +264,11 @@ export default {
}, },
components: {}, components: {},
created() { created() {
this.listQuery.warehouseId = this.bId this.listQuery.warehouseId = this.bId;
this.listQuery.trayCode = this.$route.query && this.$route.query.trayCode this.listQuery.trayCode = this.$route.query && this.$route.query.trayCode;
this.formConfig[0].placeholder = this.listQuery.trayCode || '托盘编码' this.formConfig[0].placeholder = this.listQuery.trayCode || '托盘编码';
this.getDataList(); this.getDataList();
}, },
methods: { methods: {
buttonClick(val) { buttonClick(val) {
switch (val.btnName) { switch (val.btnName) {

4
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-01-09 10:07:00 * @LastEditTime: 2025-10-20 13:32:06
* @Description: * @Description:
--> -->
<template> <template>
@@ -126,7 +126,7 @@ export default {
startFun() { startFun() {
const timer = setInterval(() => { const timer = setInterval(() => {
this.getInfo(); this.getInfo();
}, 10000); }, 20000);
this.$once('hook:beforeDestroy', () => { this.$once('hook:beforeDestroy', () => {
clearInterval(timer); clearInterval(timer);
}); });

4
src/views/wcsAlarm/real2.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: 2024-10-10 14:29:56 * @LastEditTime: 2025-10-20 13:32:14
* @Description: * @Description:
--> -->
<template> <template>
@@ -126,7 +126,7 @@ export default {
startFun() { startFun() {
const timer = setInterval(() => { const timer = setInterval(() => {
this.getInfo(); this.getInfo();
}, 10000); }, 20000);
this.$once('hook:beforeDestroy', () => { this.$once('hook:beforeDestroy', () => {
clearInterval(timer); clearInterval(timer);
}); });