From d14030746fcd0310d3c9b028fe2c0a5b78984eb6 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:44:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx |   84 +++++++++++++++++++++++++++--------------
 1 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
index 6d53e9c..0204d4e 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
@@ -8,21 +8,21 @@
     gridBody: RobotSelect,
     gridFooter: '',
     //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-    modelHeader: '',
-    modelBody: '',
-    modelFooter: ''
+    modelHeader: "",
+    modelBody: "",
+    modelFooter: "",
   },
-  tableAction: '',
+  tableAction: "",
   buttons: { view: [], box: [], detail: [] },
   methods: {
     onInit() {
       // 娣诲姞MES鎿嶄綔鍒�
       this.columns.push({
-        title: '鎿嶄綔',
-        field: '鎿嶄綔',
-        align: 'center',
+        title: "鎿嶄綔",
+        field: "鎿嶄綔",
+        align: "center",
         width: 200,
-        fixed: 'right',
+        fixed: "right",
         render: (h, { row, column, index }) => {
           return (
             <div>
@@ -50,7 +50,7 @@
               >瑙ｇ粦</el-button>
             </div>
           );
-        }
+        },
       });
     },
 
@@ -62,16 +62,24 @@
     // 鎵樼洏杩涚珯鎿嶄綔
     async handleInbound(row) {
       try {
-        await this.$confirm(`纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "杩涚珯纭", {
-          confirmButtonText: "纭",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        });
+        await this.$confirm(
+          `纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+          "杩涚珯纭",
+          {
+            confirmButtonText: "纭",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          },
+        );
 
-        const result = await this.http.post("/api/StockInfo/inboundInContainer", {
-          palletCode: row.palletCode,
-          stockId: row.id
-        }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+        const result = await this.http.post(
+          "/api/StockInfo/inboundInContainer",
+          {
+            palletCode: row.palletCode,
+            stockId: row.id,
+          },
+          "姝ｅ湪璋冪敤MES鎺ュ彛...",
+        );
 
         if (result.status) {
           this.$Message.success(result.message || "鎵樼洏杩涚珯鎴愬姛");
@@ -89,16 +97,24 @@
     // 鎵樼洏鍑虹珯鎿嶄綔
     async handleOutbound(row) {
       try {
-        await this.$confirm(`纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "鍑虹珯纭", {
-          confirmButtonText: "纭",
-          cancelButtonText: "鍙栨秷",
-          type: "warning"
-        });
+        await this.$confirm(
+          `纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+          "鍑虹珯纭",
+          {
+            confirmButtonText: "纭",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          },
+        );
 
-        const result = await this.http.post("/api/StockInfo/outboundInContainer", {
-          palletCode: row.palletCode,
-          stockId: row.id
-        }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+        const result = await this.http.post(
+          "/api/StockInfo/outboundInContainer",
+          {
+            palletCode: row.palletCode,
+            stockId: row.id,
+          },
+          "姝ｅ湪璋冪敤MES鎺ュ彛...",
+        );
 
         if (result.status) {
           this.$Message.success(result.message || "鎵樼洏鍑虹珯鎴愬姛");
@@ -122,6 +138,16 @@
       // 妗嗘灦鍒濆鍖栭厤缃悗
     },
     searchBefore(param) {
+      const stockStatusFilter = {
+        name: "stockStatus",
+        value: "1",
+        displayType: "notequal",
+      };
+      if (!param.wheres) {
+        param.wheres = [];
+      }
+      // 灏嗚繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+      param.wheres.push(stockStatusFilter);
       return true;
     },
     searchAfter(result) {
@@ -138,8 +164,8 @@
     },
     modelOpenAfter(row) {
       // 鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚�
-    }
-  }
+    },
+  },
 };
 
 export default extension;

--
Gitblit v1.9.3