From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码,ERP接口,MES接口优化,WMS业务优化等

---
 项目代码/WMS/WMSClient/src/views/stock/ProStockView.vue |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
index ffc36b8..250cbcd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
@@ -41,11 +41,15 @@
       });
       const searchFormOptions = ref([
         [
-          { title: "鑳舵鍙�", field: "palletCode",type: "like" },
+          { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
           // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
           { title: "鐗╂枡缂栧彿", field: "productCode",type: "like" },
           { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
           { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
+        ],
+        [
+          { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: []},
+          { title: "搴撳瓨灞炴��", field: "proStockAttribute" ,type: "selectList",dataKey: "proStockAttributeEnum",data: [],},
         ],
       ]);
       const columns = ref([
@@ -61,7 +65,7 @@
         },
         {
           field: "palletCode",
-          title: "鎵樼洏鍙�",
+          title: "鎵樼洏缂栧彿",
           type: "string",
           width: 150,
           link: true,
@@ -113,10 +117,24 @@
           align: "left",
         },
         {
+          field: "productName",
+          title: "鐗╂枡鍚嶇О",
+          type: "string",
+          width: 200,
+          align: "left",
+        },
+        {
           field: "lotNumber",
           title: "鐗╂枡鎵瑰彿",
           type: "string",
           width: 110,
+          align: "left",
+        },
+        {
+          field: "productSpec",
+          title: "鐗╂枡瑙勬牸",
+          type: "string",
+          width: 200,
           align: "left",
         },
         {
@@ -125,6 +143,14 @@
           type: "string",
           width: 100,
           align: "left",
+        },
+        {
+          field: "productUnit",
+          title: "鐗╂枡鍗曚綅",
+          type: "string",
+          width: 100,
+          align: "left",
+          bind: { key: "materielUnitEnum", data: [] },
         },
         {
           field: "row",
@@ -235,6 +261,27 @@
             align: "left",
           },
           {
+            field: "productName",
+            title: "鐗╂枡鍚嶇О",
+            type: "string",
+            width: 150,
+            align: "left",
+          },
+          {
+            field: "lotNumber",
+            title: "鐗╂枡鎵瑰彿",
+            type: "string",
+            width: 90,
+            align: "left",
+          },
+          {
+            field: "productSpec",
+            title: "鐗╂枡瑙勬牸",
+            type: "string",
+            width: 90,
+            align: "left",
+          },
+          {
             field: "stockQty",
             title: "搴撳瓨鏁�",
             type: "string",
@@ -242,8 +289,8 @@
             align: "left",
           },
           {
-            field: "lotNumber",
-            title: "鐗╂枡鎵瑰彿",
+            field: "productUnit",
+            title: "鍗曚綅",
             type: "string",
             width: 90,
             align: "left",

--
Gitblit v1.9.3