From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index 57e6567..aef4c24 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -20,20 +20,20 @@
const requestData = {
line: 2002
};
-request.post("/cacheGlass/taskCache/selectEdgTask",{
- ...requestData,
+// request.post("/cacheGlass/taskCache/selectEdgTask",{
+// ...requestData,
-}).then((res) => {
- if (res.code == 200) {
+// }).then((res) => {
+// if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- console.log(res.data[0].slot);
- } else {
- ElMessage.warning(res.msg)
+// console.log(res.data);
+// tableData.value = res.data
+// console.log(res.data[0].slot);
+// } else {
+// ElMessage.warning(res.msg)
- }
- });
+// }
+// });
// 鐮存崯
const open = async(row) => {
try {
@@ -49,8 +49,8 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
- controlsId: 300,
+ glassId: row.glass_id,
+ controlsId: 8,
line: 2002,
machine: '鍐峰姞宸�',
})
@@ -82,8 +82,8 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
- controlsId: 301,
+ glassId: row.glass_id,
+ controlsId: 9,
line: 2002,
machine: '鍐峰姞宸�',
})
@@ -128,13 +128,11 @@
<el-table height="240" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="GlassId" align="center" :label="$t('workOrder.glassID')" min-width="180" />
- <el-table-column prop="Height" align="center" :label="$t('workOrder.height')" min-width="80" />
- <el-table-column prop="Width" align="center" :label="$t('workOrder.width')" min-width="120" />
- <el-table-column prop="Thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
- <el-table-column prop="FilmsId" align="center" :label="$t('workOrder.coatingtypes')" min-width="120" />
- <el-table-column prop="SerialNumber" align="center" :label="$t('workOrder.productionsequence')" min-width="120" />
- <el-table-column prop="FlowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" />
+ <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
+ <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
--
Gitblit v1.8.0