From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/wls/materialstock/data.ts |   96 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/src/views/wls/materialstock/data.ts b/src/views/wls/materialstock/data.ts
index c6f0ceb..8cc4eb3 100644
--- a/src/views/wls/materialstock/data.ts
+++ b/src/views/wls/materialstock/data.ts
@@ -8,7 +8,6 @@
 import { DICT_TYPE } from '@vben/constants';
 
 import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 import {
   WmWarehouseAreaSelect,
@@ -84,6 +83,7 @@
     newFrozen: boolean,
     row: MesWmMaterialStockApi.MaterialStock,
   ) => Promise<boolean | undefined>,
+  onMove?: (row: MesWmMaterialStockApi.MaterialStock) => void,
 ): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
   const { hasAccessByCodes } = useAccess();
   return [
@@ -106,6 +106,41 @@
       field: 'quantity',
       title: '鍦ㄥ簱鏁伴噺',
       width: 100,
+    },
+    {
+      field: 'frozenQuantity',
+      title: '鍐荤粨鏁伴噺',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'reservedQuantity',
+      title: '鍗犵敤閲�',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'inTransitQuantity',
+      title: '鍦ㄩ�旈噺',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'availableQuantity',
+      title: '鍙敤閲�',
+      width: 100,
+      cellRender: {
+        name: 'CellText',
+        props: {
+          class: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) =>
+            (row.availableQuantity || 0) < 0 ? 'text-red-500 font-bold' : '',
+          formatter: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) =>
+            ((row.availableQuantity || 0) as number).toFixed(2),
+        },
+      },
     },
     {
       field: 'unitMeasureName',
@@ -155,6 +190,16 @@
         },
       },
     },
+    ...(onMove
+      ? [
+          {
+            title: '鎿嶄綔',
+            width: 80,
+            fixed: 'right' as const,
+            slots: { default: 'actions' } as const,
+          },
+        ]
+      : []),
   ];
 }
 
@@ -162,19 +207,21 @@
 export function useSelectGridFormSchema(): VbenFormSchema[] {
   return [
     {
-      fieldName: 'itemId',
+      fieldName: 'itemName',
       label: '鐗╂枡',
-      component: markRaw(MdItemSelect),
+      component: 'Input',
       componentProps: {
-        placeholder: '璇烽�夋嫨鐗╂枡',
+        allowClear: true,
+        placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
       },
     },
     {
-      fieldName: 'vendorId',
+      fieldName: 'vendorName',
       label: '渚涘簲鍟�',
-      component: markRaw(MdVendorSelect),
+      component: 'Input',
       componentProps: {
-        placeholder: '璇烽�夋嫨渚涘簲鍟�',
+        allowClear: true,
+        placeholder: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О',
       },
     },
     {
@@ -288,6 +335,41 @@
       width: 100,
     },
     {
+      field: 'frozenQuantity',
+      title: '鍐荤粨鏁伴噺',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'reservedQuantity',
+      title: '鍗犵敤閲�',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'inTransitQuantity',
+      title: '鍦ㄩ�旈噺',
+      width: 100,
+      formatter: ({ cellValue }: { cellValue: number }) =>
+        (cellValue || 0).toFixed(2),
+    },
+    {
+      field: 'availableQuantity',
+      title: '鍙敤閲�',
+      width: 100,
+      cellRender: {
+        name: 'CellText',
+        props: {
+          class: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) =>
+            (row.availableQuantity || 0) < 0 ? 'text-red-500 font-bold' : '',
+          formatter: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) =>
+            ((row.availableQuantity || 0) as number).toFixed(2),
+        },
+      },
+    },
+    {
       field: 'receiptTime',
       title: '鍏ュ簱鏃ユ湡',
       width: 180,

--
Gitblit v1.9.3