From 79edfec1f6e6789d3f6cc57db3cb0cfdffd64c32 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 24 二月 2026 15:50:32 +0800
Subject: [PATCH] 库位拣料出库数量调整
---
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index 2046043..9831e8c 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -43,6 +43,7 @@
import { styled } from '@mui/material/styles';
import { DataGrid, useGridApiContext, GridActionsCellItem, useGridApiRef } from '@mui/x-data-grid';
import request from '@/utils/request';
+import { formatQuantity } from '@/utils/common';
import ConfirmationNumberOutlinedIcon from '@mui/icons-material/ConfirmationNumberOutlined';
import CloseSharpIcon from '@mui/icons-material/CloseSharp';
import ConfirmButton from '../../components/ConfirmButton';
@@ -227,12 +228,14 @@
console.log('API杩斿洖鐨勬暟鎹�:', responseData);
// 澶勭悊杩斿洖鐨勬暟鎹紝纭繚鏁版嵁缁撴瀯姝g‘
const processedData = (responseData || []).map((item, index) => {
+ // 鍑哄簱鍗曚笅鍙戜换鍔★細浼樺厛鐢ㄥ悗绔繑鍥炵殑 siteNo/sitesNo锛屾病鏈夊垯榛樿 1001
+ const defaultSiteNo = item.siteNo || item.sitesNo || '1001';
// 濡傛灉鏁版嵁鏈� locItem 宓屽缁撴瀯锛岄渶瑕佸睍寮�
if (item.locItem) {
return {
...item.locItem,
id: item.locItem.id || `temp_${index}`,
- siteNo: item.siteNo,
+ siteNo: defaultSiteNo,
staNos: item.staNos || [],
sourceId: item.sourceId,
source: item.source
@@ -241,7 +244,8 @@
// 濡傛灉鏁版嵁宸茬粡鏄墎骞崇粨鏋勶紝鐩存帴杩斿洖
return {
...item,
- id: item.id || `temp_${index}`
+ id: item.id || `temp_${index}`,
+ siteNo: defaultSiteNo
};
});
console.log('澶勭悊鍚庣殑鏁版嵁:', processedData);
@@ -334,9 +338,9 @@
<TextField source="poCode" label="table.field.outStockItem.poCode" />
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
<TextField source="maktx" label="table.field.outStockItem.maktx" />
- <NumberField source="anfme" label="table.field.outStockItem.anfme" />
- <NumberField source="workQty" label="table.field.outStockItem.workQty" />
- <NumberField source="qty" label="table.field.outStockItem.qty" />
+ <NumberField source="anfme" label="table.field.outStockItem.anfme" options={{ maximumFractionDigits: 6 }} />
+ <NumberField source="workQty" label="table.field.outStockItem.workQty" options={{ maximumFractionDigits: 6 }} />
+ <NumberField source="qty" label="table.field.outStockItem.qty" options={{ maximumFractionDigits: 6 }} />
<TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
<TextField source="splrName" label="table.field.outStockItem.splrName" />
</StyledDatagrid>
@@ -393,7 +397,7 @@
{ field: 'matnrCode', headerName: '鐗╂枡缂栫爜', width: 120 },
{ field: 'batch', headerName: '鎵规', width: 90 },
{ field: 'unit', headerName: '鍗曚綅', width: 60 },
- { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110, },
+ { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110, valueFormatter: (v) => formatQuantity(v) },
{
field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
renderCell: (params) => (
@@ -449,7 +453,7 @@
return (
hasStock ? (
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
- <span>{value}</span>
+ <span>{formatQuantity(value)}</span>
</Box>
) : (
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
--
Gitblit v1.9.1