From 56f3e2740afb3fc9845134b87646541735b5ccf0 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 3 Oct 2025 18:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/po/po.js                            |  8 +-
 src/views/modules/recv/qualifiedStorage.vue | 84 +++++++++++++++++----
 2 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/src/api/po/po.js b/src/api/po/po.js
index ba09637..4d314cb 100644
--- a/src/api/po/po.js
+++ b/src/api/po/po.js
@@ -56,4 +56,10 @@ export const getPurchaseOrderReceiptList = data => createAPI(`qualified-storage/
 export const validateHandlingUnitForQualifiedStorage = data => createAPI(`qualified-storage/validateHandlingUnit`,'post',data)
 
 // 确认检验合格入库
-export const confirmQualifiedStorage = data => createAPI(`qualified-storage/confirmQualifiedStorage`,'post',data)
\ No newline at end of file
+export const confirmQualifiedStorage = data => createAPI(`qualified-storage/confirmQualifiedStorage`,'post',data)
+
+// 校验库位类型是否匹配收货方式要求
+export const validateLocationForReceiveCase = data => createAPI(`warehouse/validateLocationForReceiveCase`, 'post', data)
+
+// 校验库位是否为PICKING类型（检验合格入库用）
+export const validateLocationForPicking = data => createAPI(`warehouse/validateLocationForPicking`, 'post', data)
\ No newline at end of file
diff --git a/src/views/modules/recv/qualifiedStorage.vue b/src/views/modules/recv/qualifiedStorage.vue
index cdda0e9..a70917a 100644
--- a/src/views/modules/recv/qualifiedStorage.vue
+++ b/src/views/modules/recv/qualifiedStorage.vue
@@ -251,7 +251,7 @@
 </template>
 
 <script>
-import { getPurchaseOrderReceiptList, confirmQualifiedStorage, validateHandlingUnitForQualifiedStorage, getInboundHistory } from "@/api/po/po.js";
+import { getPurchaseOrderReceiptList, confirmQualifiedStorage, validateHandlingUnitForQualifiedStorage, getInboundHistory, validateLocationForPicking } from "@/api/po/po.js";
 
 export default {
   data() {
@@ -369,21 +369,60 @@ export default {
         return;
       }
 
-      // 失去光标
-      if (this.$refs.locationInput) {
-        this.$refs.locationInput.blur();
+      // 校验库位类型
+      this.validateLocationForPickingType();
+    },
+
+    // 校验库位是否为PICKING类型
+    async validateLocationForPickingType() {
+      if (!this.targetLocationId.trim()) {
+        return;
       }
 
-      // 定位到页面最底部
-      this.$nextTick(() => {
-        const bottomActions = document.querySelector('.bottom-actions');
-        if (bottomActions) {
-          bottomActions.scrollIntoView({
-            behavior: 'smooth',
-            block: 'end'
+      try {
+        const { data } = await validateLocationForPicking({
+          site: this.site,
+          locationId: this.targetLocationId.trim()
+        });
+
+        if (data.code === 0) {
+          // 校验通过，失去光标并定位到页面底部
+          if (this.$refs.locationInput) {
+            this.$refs.locationInput.blur();
+          }
+
+          this.$nextTick(() => {
+            const bottomActions = document.querySelector('.bottom-actions');
+            if (bottomActions) {
+              bottomActions.scrollIntoView({
+                behavior: 'smooth',
+                block: 'end'
+              });
+            }
+          });
+        } else {
+          this.$message.error(data.msg || '库位必须是PICKING类型');
+          // 清空库位输入
+          this.targetLocationId = '';
+          // 重新聚焦到库位输入框
+          this.$nextTick(() => {
+            if (this.$refs.locationInput) {
+              this.$refs.locationInput.focus();
+            }
           });
         }
-      });
+      } catch (error) {
+        console.error('库位校验失败:', error);
+        this.$message.error('库位校验失败，请重试');
+        // 清空库位输入
+        this.targetLocationId = '';
+        // 重新聚焦到库位输入框
+        this.$nextTick(() => {
+          if (this.$refs.locationInput) {
+            this.$refs.locationInput.focus();
+          }
+        });
+      }
     },
 
     // 验证标签并添加到列表
@@ -458,7 +497,7 @@ export default {
     },
 
     // 确认入库
-    confirmStorage() {
+    async confirmStorage() {
       // 验证必填字段
       if (!this.targetLocationId) {
         this.$message.error('请输入目标库位');
@@ -470,6 +509,23 @@ export default {
         return;
       }
 
+      // 提交前再次校验库位类型
+      try {
+        const { data } = await validateLocationForPicking({
+          site: this.site,
+          locationId: this.targetLocationId.trim()
+        });
+
+        if (data.code !== 0) {
+          this.$message.error(data.msg || '库位必须是PICKING类型');
+          return;
+        }
+      } catch (error) {
+        console.error('库位校验失败:', error);
+        this.$message.error('库位校验失败，请重试');
+        return;
+      }
+
       // 计算HandlingUnit总数量
       const totalScannedQty = this.scannedItems.reduce((sum, item) => sum + (parseFloat(item.qty) || 0), 0);
       const availableQty = this.getAvailableQty();
@@ -943,7 +999,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  background: rgba(255, 255, 255, 0.9);
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   align-items: center;
   justify-content: center;