From affbe9bef5371d880d2b80b6b343fca6c13c7980 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Fri, 4 Oct 2024 17:04:16 +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=E7=9B=92=E5=AD=90=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=202.=20=E5=85=A5=E5=BA=93=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=AB=E9=80=9F=E8=BF=9E=E7=82=B9=E9=98=B2?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/task.js                  | 13 ++++++-
 src/http/request.js              |  2 +-
 src/layout/clcNoPlan.vue         |  2 +-
 src/layout/goodsIn.vue           |  5 +++
 src/layout/goodsInQR.vue         |  5 +++
 src/layout/sortBoxs.vue          | 64 +++++++++++++++++++++++---------
 src/layout/stockUpdateRecord.vue | 57 +++++++++++++++++++++++++---
 src/layout/taskMonitor.vue       |  4 +-
 src/layout/workFlow.vue          |  4 +-
 9 files changed, 127 insertions(+), 29 deletions(-)

diff --git a/src/api/task.js b/src/api/task.js
index 1a70d50..e3dedcd 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -68,7 +68,8 @@ const getWorkByStandAndGoods = (params) => {
   return request({
     url: '/task/getWorkByStandAndGoods',
     method: 'post',
-    data: params
+    data: params,
+    timeout: 10000
   })
 }
 
@@ -148,6 +149,15 @@ const requestSortBox = (params) => {
   return request({
     url: '/task/requestSortBox',
     method: 'post',
+    data: params,
+    timeout: 10000
+  })
+}
+
+const requestSumOfBox = (params) => {
+  return request({
+    url: '/task/requestSumOfBox',
+    method: 'post',
     data: params
   })
 }
@@ -211,6 +221,7 @@ export {
   requestInTest,
   requestPrintData,
   requestSortBox,
+  requestSumOfBox,
   getPickTasksByPage,
   deletePickTasks,
   updatePickTasks,
diff --git a/src/http/request.js b/src/http/request.js
index f931042..140e628 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://localhost:12315/wms',
+    baseURL: 'http://10.90.36.70:443/wmsServer/wms',
     timeout: 5000
 })
 
diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue
index 419a22a..c1b2382 100644
--- a/src/layout/clcNoPlan.vue
+++ b/src/layout/clcNoPlan.vue
@@ -31,7 +31,7 @@
                                         </div>
                                         <div class="display-form-div">
                                             <el-input v-model="workFormEntity.goodsId" size="default" ref="needGoodsId"
-                                                @blur="getStockNumOfGoodsIdMethod()" clearable></el-input>
+                                            v-on:keyup.enter="getStockNumOfGoodsIdMethod()" clearable></el-input>
                                         </div>
                                     </div>
                                     <div style="display: flex; flex-direction: column;">
diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue
index 5f5d3aa..49bbb33 100644
--- a/src/layout/goodsIn.vue
+++ b/src/layout/goodsIn.vue
@@ -103,6 +103,7 @@ import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
 import { reactive, ref } from 'vue'
 import { errorBox } from '@/utils/myMessageBox.js'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import loading from '@/utils/loading.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 </script>
 
@@ -254,7 +255,9 @@ export default {
             }
         },
         confirmTask() {
+            loading.open('处理中，请稍等...')
             if (this.currentVehicleId == '') {
+                loading.close()
                 errorBox('必须输入料箱号')
                 return
             }
@@ -264,6 +267,7 @@ export default {
                 goodsList: this.tempTasks.length > 0 ? this.tempTasks : [],
             }
             sendGoodsInTask(request).then(res => {
+                loading.close()
                 const response = res.data
                 if (response.code == 0) {
                     ElMessage.success('入库确认成功。')
@@ -275,6 +279,7 @@ export default {
                     errorBox(response.message)
                 }
             }).catch(err => {
+                loading.close()
                 console.log(err)
                 errorBox('入库处理异常')
             })
diff --git a/src/layout/goodsInQR.vue b/src/layout/goodsInQR.vue
index 36342b7..e3d5937 100644
--- a/src/layout/goodsInQR.vue
+++ b/src/layout/goodsInQR.vue
@@ -112,6 +112,7 @@ import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
 import { reactive, ref } from 'vue'
 import { errorBox } from '@/utils/myMessageBox.js'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import loading from '@/utils/loading.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 </script>
 
@@ -266,7 +267,9 @@ export default {
             }
         },
         confirmTask() {
+            loading.open('处理中，请稍等...')
             if (this.currentVehicleId == '') {
+                loading.close()
                 errorBox('必须输入料箱号')
                 return
             }
@@ -276,6 +279,7 @@ export default {
                 goodsList: this.tempTasks.length > 0 ? this.tempTasks : [],
             }
             sendGoodsInTask(request).then(res => {
+                loading.close()
                 const response = res.data
                 if (response.code == 0) {
                     ElMessage.success('入库确认成功。')
@@ -287,6 +291,7 @@ export default {
                     errorBox(response.message)
                 }
             }).catch(err => {
+                loading.close()
                 console.log(err)
                 errorBox('入库处理异常')
             })
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 3a47fdf..0a1799d 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -31,18 +31,28 @@
                                             <span class="display-title-text">大盒子</span>
                                         </div>
                                         <div class="display-form-div">
-                                            <el-input v-model="workFormEntity.bigBoxNo" size="default" id="bigBoxNo"
-                                                clearable></el-input>
+                                            <el-input v-model="workFormEntity.bigBoxNo" size="default" id="bigBoxNo" v-on:keyup.enter="getSumOfBox()" clearable></el-input>
                                         </div>
                                     </div>
                                     <div style="display: flex; flex-direction: column;">
                                         <div class="display-title-div">
-                                            <span class="display-title-text">机器号数量</span>
+                                            <span class="display-title-text">需要盒子总数</span>
+                                        </div>
+                                        <div style="display: flex; margin-top: 20px;">
+                                            <div class="display-form-div-left">
+                                                <el-input-number v-model.number="workFormEntity.sumOfOrders"
+                                                  disabled  controls-position="right" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div style="display: flex; flex-direction: column;">
+                                        <div class="display-title-div">
+                                            <span class="display-title-text">当前盒子序号</span>
                                         </div>
                                         <div style="display: flex; margin-top: 20px;">
                                             <div class="display-form-div-left">
                                                 <el-input-number v-model.number="workFormEntity.orderOfOrders"
-                                                    controls-position="right" :min="1" disabled />
+                                                    controls-position="right" :min="0" :max="workFormEntity.sumOfOrders" clearable />
                                             </div>
                                         </div>
                                     </div>
@@ -64,7 +74,7 @@
 
 <script setup>
 import store from '@/store'
-import { requestSortBox } from '@/api/task'
+import { requestSortBox, requestSumOfBox } from '@/api/task'
 import { reactive, ref } from 'vue'
 import { errorBox } from '@/utils/myMessageBox.js'
 import { ElMessage } from 'element-plus'
@@ -82,7 +92,8 @@ export default {
             workFormRef: ref(),
             workFormEntity: reactive({
                 bigBoxNo: '',
-                orderOfOrders: null
+                orderOfOrders: null,
+                sumOfOrders: null
             }),
             rules: reactive({}),
         }
@@ -100,7 +111,29 @@ export default {
             this.$refs.bigBoxNo.focus()
             this.workFormEntity = reactive({
                 bigBoxNo: '',
-                orderOfOrders: null
+                orderOfOrders: null,
+                sumOfOrders: null
+            })
+        },
+        getSumOfBox() {
+            if (this.workFormEntity.bigBoxNo == '') {
+                return
+            }
+            const request = {
+                bigBoxNo: this.workFormEntity.bigBoxNo,
+                standId: this.standId,
+                userName: store.getters.getUserName
+            }
+            requestSumOfBox(request).then(res => {
+                const response = res.data
+                if (response.code == 0) {
+                    this.workFormEntity.sumOfOrders = response.returnData.sumOfOrders
+                } else {
+                    errorBox(response.message)
+                }
+            }).catch(err => {
+                console.log(err)
+                errorBox('请求发生异常。')
             })
         },
         confirmTask() {
@@ -108,14 +141,10 @@ export default {
                 errorBox('请输入大盒子号')
                 return
             }
-            // if (this.workFormEntity.orderOfOrders == null) {
-            //     errorBox('请输入工单顺序')
-            //     return
-            // }
             const request = {
                 standId: this.standId,
                 bigBoxNo: this.workFormEntity.bigBoxNo,
-                // orderOfOrders: this.workFormEntity.orderOfOrders,
+                orderOfOrders: this.workFormEntity.orderOfOrders,
                 userName: store.getters.getUserName
             }
             requestSortBox(request).then(res => {
@@ -123,6 +152,7 @@ export default {
                 if (response.code == 0) {
                     this.workFormEntity.orderOfOrders = response.returnData.orderOfOrders
                     ElMessage.success('请根据灯光拣选盒子。')
+                    this.resetForms()
                 } else {
                     errorBox(response.message)
                 }
@@ -188,13 +218,13 @@ export default {
 }
 
 :deep(.el-input) {
-    width: 340px;
+    width: 240px;
     height: 130px;
     font-size: 25px;
 }
 
 :deep(.el-input-number) {
-    width: 340px;
+    width: 240px;
     height: 130px;
     font-size: 25px;
 }
@@ -246,7 +276,7 @@ export default {
 .display-title-div {
     display: inline-flex;
     justify-content: center;
-    width: 350px;
+    width: 250px;
     height: 80px;
     margin: 5px;
     padding: 5px;
@@ -262,7 +292,7 @@ export default {
 .display-form-div {
     display: inline-flex;
     justify-content: center;
-    width: 340px;
+    width: 240px;
     margin: 5px;
     padding: 5px;
     border: 5px double #000000;
@@ -272,7 +302,7 @@ export default {
 .display-form-div-left {
     display: inline-flex;
     justify-content: center;
-    width: 340px;
+    width: 240px;
     margin: 5px;
     padding: 5px;
     border: 5px double #000000;
diff --git a/src/layout/stockUpdateRecord.vue b/src/layout/stockUpdateRecord.vue
index fc11a78..90bb11c 100644
--- a/src/layout/stockUpdateRecord.vue
+++ b/src/layout/stockUpdateRecord.vue
@@ -9,14 +9,16 @@
                         :suffix-icon="Search" />
                     <el-input v-model="reasonQuery" style="width: 158px; margin-right: 10px;" placeholder="更新原因"
                         :suffix-icon="Search" />
+                    <el-select-v2 v-model="reasonQuery" style="width: 158px; margin-right: 10px;"
+                        placeholder="请选择更新原因" :options="reasonOptions" @change="search()"></el-select-v2>
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
             </div>
             <br />
-            <el-table :data="recordList" stripe border v-loading="loading" class="table-class"
-                highlight-current-row max-height="650px" @row-click="getCurrentRow"
-                :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
+            <el-table :data="recordList" stripe border v-loading="loading" class="table-class" highlight-current-row
+                max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }">
                 <el-table-column width="65px" fixed="left">
                     <template v-slot="scope">
                         <el-radio :label="scope.row.recordId" v-model="recordId">&nbsp;</el-radio>
@@ -31,8 +33,7 @@
                 <el-table-column prop="locationAfter" label="新位置" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="quantityBefore" label="原数量" min-width="120px" />
                 <el-table-column prop="quantityAfter" label="新数量" min-width="120px" />
-                <el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip
-                    min-width="120px" />
+                <el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="updateTime" label="完成时间" :formatter="timeFormat" min-width="120px"
                     show-overflow-tooltip />
                 <el-table-column prop="updateUser" label="操作用户" min-width="120px" />
@@ -68,6 +69,52 @@ export default {
             reasonQuery: '',
             loading: true,
             recordId: '',
+            reasonOptions: [
+                {
+                    value: '',
+                    label: '全部'
+                },
+                {
+                    value: '备料拣选更新',
+                    label: '备料拣选更新'
+                },
+                {
+                    value: '站台确认更新',
+                    label: '站台确认更新'
+                },
+                {
+                    value: '直接物料非计划领料回库更新',
+                    label: '直接物料非计划领料回库更新'
+                },
+                {
+                    value: '站台处理箱料错误',
+                    label: '站台处理箱料错误'
+                },
+                {
+                    value: '界面修改库存',
+                    label: '界面修改库存'
+                },
+                {
+                    value: '界面删除库存',
+                    label: '界面删除库存'
+                },
+                {
+                    value: '界面增加库存',
+                    label: '界面增加库存'
+                },
+                {
+                    value: '入库更新库存',
+                    label: '入库更新库存'
+                },
+                {
+                    value: '入库增加库存',
+                    label: '入库增加库存'
+                },
+                {
+                    value: '整出',
+                    label: '整出'
+                },
+            ],
         }
     },
     mounted() {
diff --git a/src/layout/taskMonitor.vue b/src/layout/taskMonitor.vue
index c722573..45b8e11 100644
--- a/src/layout/taskMonitor.vue
+++ b/src/layout/taskMonitor.vue
@@ -28,8 +28,8 @@
                 <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="origin" label="起点" min-width="120px" />
                 <el-table-column prop="destination" label="终点" min-width="120px" />
-                <el-table-column prop="opNum" label="操作数量" min-width="120px" />
-                <el-table-column prop="originNum" label="库存数量" min-width="120px" />
+                <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
+                <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
                 <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
                 <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
index 375ddc5..ec77b8b 100644
--- a/src/layout/workFlow.vue
+++ b/src/layout/workFlow.vue
@@ -11,9 +11,9 @@
                         :suffix-icon="Search" />
                     <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;"
+                    <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;"
+                    <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>