From ad5fef776eb9d66a0fcfc2ddf89698c5642e0eec Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:36:24 +0800
Subject: [PATCH] 增加一个定时任务。如果拣货出库过程中,相同料箱号,存在(199 ,200)的任务 并且同时存在  101,196的任务 则101和196的任务会 自动变成199

---
 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 706513c..3a7cdf1 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -136,8 +136,7 @@
                 actions={(
                     <TopToolbar>
                         <FilterButton />
-                        <InitButton />
-                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+                        <InitButton />                        
                         <SelectColumnsButton preferenceKey='deviceSite' />
                         <MyExportButton />
                     </TopToolbar>
@@ -148,16 +147,16 @@
                     preferenceKey='deviceSite'
                     bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                     rowClick={(id, resource, record) => false}
-                    omit={['id', 'createTime', 'createBy', 'memo', 'label']}
+                    omit={['id', 'createTime', 'createBy', 'memo', 'label','name','target','statusBool','updateBy']}
                 >
                     <NumberField source="id" />
+                    <TextField source="site" label="table.field.deviceSite.site" />
                     <TextField source="name" label="table.field.deviceSite.name" />
                     <NumberField source="type$" label="table.field.deviceSite.type" />
-                    <TextField source="site" label="table.field.deviceSite.site" />
                     <TextField source="target" label="table.field.deviceSite.target" />
                     <TextField source="label" label="table.field.deviceSite.label" />
                     <TextField source="device$" label="table.field.deviceSite.device" />
-                    <TextField source="deviceCode" label="table.field.deviceSite.deviceCode" />
+                    <TextField source="channel" label="table.field.deviceSite.channel" />
                     <TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />

--
Gitblit v1.9.1