From bd863e9989b68702051333e179976a83817dc453 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sun, 29 Sep 2024 17:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/stock.js         | 11 ++++++-
 src/http/request.js      |  2 +-
 src/layout/doKitting.vue | 65 ++++++++++++++++++++++++++++++++++++++--
 src/layout/workFlow.vue  | 24 ++++++++++++---
 4 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/src/api/stock.js b/src/api/stock.js
index 9c30c57..2026f44 100644
--- a/src/api/stock.js
+++ b/src/api/stock.js
@@ -32,9 +32,18 @@ const getStockUpdateRecord = (params) => {
     })
 }
 
+const handleExceptionStock = (params) => {
+    return request({
+        url: '/stock/handleExceptionStock',
+        method: 'post',
+        data: params
+    })
+}
+
 export {
     getAllStocks,
     updateStockInfo,
     getStockNumByGoodsId,
-    getStockUpdateRecord
+    getStockUpdateRecord,
+    handleExceptionStock
 }
\ No newline at end of file
diff --git a/src/http/request.js b/src/http/request.js
index 140e628..f931042 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 const request = axios.create({
-    baseURL: 'http://10.90.36.70:443/wmsServer/wms',
+    baseURL: 'http://localhost:12315/wms',
     timeout: 5000
 })
 
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index 8882f6a..de30c85 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -13,7 +13,7 @@
                         <span class="station-text">工作站：</span>
                     </div>
                     <div class="station-no-div">
-                        <span class="station-no-text">{{ standId }}</span>
+                        <span class="station-no-text" @click="showStockDealDialog()">{{ standId }}</span>
                     </div>
                 </fieldset>
                 <fieldset class="main-area">
@@ -132,6 +132,33 @@
                         </div>
                     </el-form>
                 </fieldset>
+                <el-dialog v-model="dialogVisible" title="异常箱料处理" width="40%" draggable :show-close="false">
+                <div style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
+                    <el-form ref="exceptionHandleFormRef" :model="exceptionHandleFormEntity" :label-position="labelPosition"
+                        label-width="100px" style="width: 95%;" :rules="rules" status-icon>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="箱号" prop="vehicleId">
+                                    <el-input v-model="exceptionHandleFormEntity.vehicleId" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="料号" prop="goodsId">
+                                    <el-input v-model="exceptionHandleFormEntity.goodsId" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                        <el-button type="primary" @click="exceptionHandle()">
+                            确定
+                        </el-button>
+                    </span>
+                </template>
+            </el-dialog>
             </div>
         </el-container>
     </el-config-provider>
@@ -140,6 +167,7 @@
 <script setup>
 import store from '@/store'
 import { getWorkByStandAndGoods, confirmFinishWork, queryFinishByStandAndGoods } from '@/api/task'
+import { handleExceptionStock } from '@/api/stock'
 import { errorBox, warningBox } from '@/utils/myMessageBox.js'
 import { ElMessage } from 'element-plus'
 import { reactive, ref } from 'vue'
@@ -172,13 +200,16 @@ export default {
                     { required: true, message: '请输入料号' }
                 ]
             }),
+            exceptionHandleFormEntity: reactive({}),
+            exceptionHandleFormRef: ref(),
+            dialogVisible: false
         }
     },
     mounted() {
         this.$refs.goodsId.focus()
         this.timer = setInterval(() => {
             this.queryFinish()
-        }, 1000)
+        }, 1500)
     },
     beforeUnmount() {
         clearInterval(this.timer)
@@ -287,6 +318,34 @@ export default {
                 console.log(err)
                 errorBox('确认时发生异常')
             })
+        },
+        showStockDealDialog() {
+            errorBox('暂未开放')
+        },
+        exceptionHandle() {
+            if (this.exceptionHandleFormEntity.vehicleId == '' || this.exceptionHandleFormEntity.goodsId == '') {
+                errorBox('箱号和料号必须输入。')
+                return
+            }
+            const request = {
+                vehicleId: this.exceptionHandleFormEntity.vehicleId.trim(),
+                goodsId: this.exceptionHandleFormEntity.goodsId.trim(),
+                standId: this.standId,
+                userName: store.getters.getUserName
+            }
+            handleExceptionStock(request).then(res => {
+                const response = res.data
+                if (response.code == 0) {
+                    ElMessage.success(response.message)
+                    this.exceptionHandleFormEntity.vehicleId = ''
+                    this.exceptionHandleFormEntity.goodsId = ''
+                } else {
+                    errorBox(response.message)
+                }
+            }).catch(err => {
+                console.log(err)
+                errorBox('确认时发生异常')
+            })
         }
     }
 }
@@ -408,6 +467,8 @@ export default {
     align-self: center;
     font-weight: bold;
     font-size: 25px;
+    width: 100%;
+    cursor: pointer;
 }
 
 .display-title-div {
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
index 3439016..375ddc5 100644
--- a/src/layout/workFlow.vue
+++ b/src/layout/workFlow.vue
@@ -3,14 +3,18 @@
         <el-config-provider :locale="zhCn">
             <div style="display: flex;justify-content: space-between;">
                 <el-row>
-                    <el-input v-model="workOrderQuery" style="width: 196px; margin-right: 10px;" placeholder="工单号"
+                    <el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单号"
                         :suffix-icon="Search" />
-                    <el-input v-model="workCenterQuery" style="width: 196px; margin-right: 10px;" placeholder="工位/小盒子"
+                    <el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px;" placeholder="工位/小盒子"
                         :suffix-icon="Search" />
-                    <el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号"
+                    <el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
                         :suffix-icon="Search" />
-                    <el-input v-model="standIdQuery" style="width: 196px; margin-right: 10px;" placeholder="站台号"
+                    <el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px;" placeholder="站台号"
                         :suffix-icon="Search" />
+                        <el-select-v2 v-model="lightStatusQuery" style="width: 158px; margin-right: 10px;"
+                        placeholder="请选择灯光状态" :options="lightStatusOptions" @change="search()"></el-select-v2>
+                        <el-select-v2 v-model="workStatusQuery" style="width: 158px; margin-right: 10px;"
+                        placeholder="请选择工作状态" :options="workStatusOptions" @change="search()"></el-select-v2>
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
@@ -177,6 +181,8 @@ export default {
             workCenterQuery: '',
             goodsIdQuery: '',
             standIdQuery: '',
+            lightStatusQuery: -99,
+            workStatusQuery: -99,
             loading: true,
             dialogVisible: false,
             workFlowId: '',
@@ -185,6 +191,10 @@ export default {
             labelPosition: 'top',
             rules: reactive({}),
             lightStatusOptions: [
+                {
+                    value: -99,
+                    label: '全部'
+                },
                 {
                     value: 0,
                     label: '未亮灯'
@@ -199,6 +209,10 @@ export default {
                 }
             ],
             workStatusOptions: [
+                {
+                    value: -99,
+                    label: '全部'
+                },
                 {
                     value: 0,
                     label: '未开始'
@@ -227,6 +241,8 @@ export default {
                 workOrder: this.workOrderQuery.trim(),
                 workCenter: this.workCenterQuery.trim(),
                 goodsId: this.goodsIdQuery.trim(),
+                lightStatus: this.lightStatusQuery == -99 ? null : this.lightStatusQuery,
+                workStatus: this.workStatusQuery == -99 ? null : this.workStatusQuery,
                 userName: store.getters.getUserName
             }
             getWorkFlows(request).then(res => {