From 80dc5631087fd664dd6134a12c9a3e5833839547 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Thu, 21 Nov 2024 20:50:36 +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=E6=95=B4=E7=90=86=E5=A4=A7=E7=9B=92=E5=AD=90=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=95=B4=E7=90=86=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=202.=20=E5=85=A5=E5=BA=93=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E9=98=B2=E5=91=86=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/task.js          | 12 +++++++++++-
 src/layout/goodsIn.vue   |  2 +-
 src/layout/goodsInQR.vue |  2 +-
 src/layout/sortBoxs.vue  | 25 ++++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/api/task.js b/src/api/task.js
index e3dedcd..9a33f01 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -154,6 +154,15 @@ const requestSortBox = (params) => {
   })
 }
 
+const finishSortBox = (params) => {
+  return request({
+    url: '/task/finishSortBox',
+    method: 'post',
+    data: params,
+    timeout: 10000
+  })
+}
+
 const requestSumOfBox = (params) => {
   return request({
     url: '/task/requestSumOfBox',
@@ -226,5 +235,6 @@ export {
   deletePickTasks,
   updatePickTasks,
   clcNoPlan,
-  clcNoPlanConfirmBack
+  clcNoPlanConfirmBack,
+  finishSortBox
 }
\ No newline at end of file
diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue
index 7021e7a..1a0ecce 100644
--- a/src/layout/goodsIn.vue
+++ b/src/layout/goodsIn.vue
@@ -182,7 +182,7 @@ export default {
                     errorBox('请下发之前料箱的任务后再继续绑定新的料箱')
                     return
                 }
-                if (this.workFormEntity.goodsNum == 9999) {
+                if (this.workFormEntity.goodsNum >= 9999) {
                     ElMessageBox.confirm(
                         '当前数量达最大值9999。\n是否继续',
                         '警告',
diff --git a/src/layout/goodsInQR.vue b/src/layout/goodsInQR.vue
index fa9217f..254a6dd 100644
--- a/src/layout/goodsInQR.vue
+++ b/src/layout/goodsInQR.vue
@@ -206,7 +206,7 @@ export default {
                     errorBox('请下发之前料箱的任务后再继续绑定新的料箱')
                     return
                 }
-                if (this.workFormEntity.goodsNum == 9999) {
+                if (this.workFormEntity.goodsNum >= 9999) {
                     ElMessageBox.confirm(
                         '当前数量达最大值9999。\n是否继续',
                         '警告',
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index eb2a8e1..225ca17 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -64,6 +64,12 @@
                                         style="margin-left: 25px; align-self: center; font-weight: bold;font-size: 45px; writing-mode: vertical-lr;">完成确认</span>
                                 </div>
                             </div>
+                            <div style="margin: 10px;">
+                                <div class="arrow" @click="finishSort()">
+                                    <span
+                                        style="margin-left: 25px; align-self: center; font-weight: bold;font-size: 45px; writing-mode: vertical-lr;">整理结束</span>
+                                </div>
+                            </div>
                         </div>
                     </el-form>
                 </fieldset>
@@ -88,7 +94,7 @@
 
 <script setup>
 import store from '@/store'
-import { requestSortBox, requestSumOfBox } from '@/api/task'
+import { requestSortBox, requestSumOfBox, finishSortBox } from '@/api/task'
 import { getBigBoxList } from '@/api/kateWork'
 import { reactive, ref } from 'vue'
 import { errorBox } from '@/utils/myMessageBox.js'
@@ -180,6 +186,23 @@ export default {
                 errorBox('请求发生异常。')
             })
         },
+        finishSort() {
+            const request = {
+                standId: this.standId,
+                userName: store.getters.getUserName
+            }
+            finishSortBox(request).then(res => {
+                const response = res.data
+                if (response.code == 0) {
+                    ElMessage.success('整理结束，站台已解锁。')
+                } else {
+                    errorBox(response.message)
+                }
+            }).catch(err => {
+                console.log(err)
+                errorBox('请求发生异常。')
+            })
+        },
         getCurrentRow(row) {
             this.bigBoxNo = row.bigBoxNo
         },