From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化

---
 rsf-admin/src/page/orders/check/CheckOrderItemList.jsx |   63 +++++++++++++------------------
 1 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx b/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
index 095f269..e79fac0 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderItemList.jsx
@@ -39,8 +39,8 @@
 import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import PageDrawer from "../../components/PageDrawer";
+import BillStatusField from '../../components/BillStatusField';
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
-
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
@@ -58,8 +58,8 @@
 
 const filters = [
   <SearchInput source="condition" alwaysOn />,
-  <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
-  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn />,
+  <NumberInput source="orderId" label="table.field.outStockItem.orderId" />,
+  <TextInput source="orderCode" label="table.field.outStockItem.orderCode" alwaysOn />,
   <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
   <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
   <TextInput source="maktx" label="table.field.outStockItem.maktx" alwaysOn />,
@@ -99,8 +99,8 @@
     <>
       <Box display="flex">
         <List
-          resource="outStockItem"
-          storeKey='outStockItem'
+          resource="checkItem"
+          storeKey='checkItem'
           sx={{
             flexGrow: 1,
             transition: (theme) =>
@@ -109,57 +109,47 @@
               }),
             marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
           }}
-          title={"menu.outStockItem"}
+          title={"menu.checkItem"}
           empty={false}
-          filter={{ asnId: asnId, deleted: 0 }}
+          filter={{ orderId: asnId, deleted: 0 }}
           filters={filters}
           sort={{ field: "create_time", order: "desc" }}
           actions={(
             <TopToolbar>
               <FilterButton />
-              <SelectColumnsButton preferenceKey='outStockItem' />
+              <SelectColumnsButton preferenceKey='checkItem' />
             </TopToolbar>
           )}
           perPage={DEFAULT_ITEM_PAGE_SIZE}
         >
           <StyledDatagrid
-            preferenceKey='outStockItem'
+            preferenceKey='checkItem'
             bulkActionButtons={false}
             rowClick={false}
-            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'asnId']}
+            omit={['id', 'createTime', 'createBy$', 'memo', 'poDetlId', 'purQty', 'trackCode', 'qty','qrcode', 'splrName', 'matnrId', 'orderId']}
           >
             <NumberField source="id" />
-            <NumberField source="asnId" label="table.field.outStockItem.asnId" />
-            <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
-            <TextField source="poCode" label="table.field.outStockItem.poCode" />
-            <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />
-            <TextField source="matnrId" label="table.field.outStockItem.matnrId" />
-            <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
-            <TextField source="maktx" label="table.field.outStockItem.maktx" />
-            <TextField source="platOrderCode" label="table.field.outStockItem.platOrderCode" />
-            <NumberField source="anfme" label="table.field.outStockItem.anfme" />
-            <NumberField source="purQty" label="table.field.outStockItem.purQty" />
-            <NumberField source="workQty" label="table.field.outStockItem.workQty" />
-            <NumberField source="qty" label="table.field.outStockItem.qty" />
-            <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
-            <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />
-            <TextField source="purUnit" label="table.field.outStockItem.purUnit" />
-            <TextField source="splrCode" label="table.field.outStockItem.splrCode" />
-            <TextField source="splrName" label="table.field.outStockItem.splrName" />
-            <TextField source="qrcode" label="table.field.outStockItem.qrcode" />
-            <TextField source="trackCode" label="table.field.outStockItem.barcode" />
-            <TextField source="packName" label="table.field.outStockItem.packName" />
+            <NumberField source="orderId" label="table.field.checkOrderItem.orderId" />
+            <TextField source="orderCode" label="table.field.checkOrderItem.orderCode" />
+            <TextField source="matnrId" label="table.field.checkOrderItem.matnrId" />
+            <TextField source="matnrCode" label="table.field.checkOrderItem.matnrCode" />
+            <TextField source="maktx" label="table.field.checkOrderItem.maktx" />
+            <TextField source="platOrderCode" label="table.field.checkOrderItem.platOrderCode" />
+            <NumberField source="anfme" label="table.field.checkOrderItem.anfme" />
+            <NumberField source="workQty" label="table.field.checkOrderItem.workQty" />
+            <NumberField source="qty" label="table.field.checkOrderItem.qty" />
+            <TextField source="stockUnit" label="table.field.checkOrderItem.stockUnit" />
+            <TextField source="splrBatch" label="table.field.checkOrderItem.splrBatch" />
+            <TextField source="splrCode" label="table.field.checkOrderItem.splrCode" />
+            <TextField source="splrName" label="table.field.checkOrderItem.splrName" />
             <DateField source="updateTime" label="common.field.updateTime" showTime />
-            <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
-              <TextField source="nickname" />
-            </ReferenceField>,
-            <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-              <TextField source="nickname" />
-            </ReferenceField>,
+            <TextField source="updateBy$" label="common.field.updateBy" />
+            <TextField source="createBy$" label="common.field.createBy" />
             <DateField source="createTime" label="common.field.createTime" showTime />
             <TextField source="memo" label="common.field.memo" sortable={false} />
           </StyledDatagrid>
         </List>
+
         {/* <OutOrderItemCreate
           open={createDialog}
           setOpen={setCreateDialog}
@@ -180,6 +170,7 @@
     </>
   )
 }
+
 OutOrderItemList.Context = React.createContext()
 
 export default OutOrderItemList;

--
Gitblit v1.9.1