From 332b916c0984a116191e882606d70d4c0c3691f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 七月 2025 10:09:50 +0800
Subject: [PATCH] no message
---
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 69 ----------------------------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveOrderRela.java | 14 -------
rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java | 6 ---
4 files changed, 3 insertions(+), 89 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index b9649a9..e5c302b 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -110,11 +110,7 @@
>
<StyledDatagrid
preferenceKey='waveItem'
- bulkActionButtons={
- <>
- <BulkStartButton />
- </>
- }
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={false}
@@ -138,10 +134,6 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
<TextField source="exceStatus$" label="table.field.waveItem.exceStatus" />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <PauseButton />
- <ContinueButton />
- </WrapperField>
</StyledDatagrid>
</List>
<WaveItemEdit
@@ -170,66 +162,7 @@
event.stopPropagation()
setEditDialog(true)
}
-
return (
<Button label="ra.action.edit" onClick={editClick} startIcon={<ContentCreate />} />
)
}
-
-
-const BulkStartButton = () => {
- const { data, selectedIds, onUnselectItems } = useListContext();
- const waveId = useGetRecordId();
- const notify = useNotify();
- const refresh = useRefresh()
- const startClick = async () => {
- onUnselectItems();
- const { data: { code, data, msg } } = await request.post('/wave/selects/task', { wave: waveId, waveItem: selectedIds });
- if (code === 200) {
- notify(msg);
- setAutoExce(false)
- } else {
- notify(msg);
- }
- refresh()
- }
- return (
- <Button label="toolbar.publicWorking" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
- )
-}
-
-const PauseButton = () => {
- const notify = useNotify()
- const refresh = useRefresh();
- const record = useRecordContext();
- const pauseClick = async () => {
- const { data: { code, data, msg } } = await request.post('/waveItem/pause/pub/' + record?.id);
- if (code === 200) {
- notify(msg);
- } else {
- notify(msg);
- }
- refresh()
- }
- return (
- record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<StopCircleOutlinedIcon />} /> : <></>
- )
-}
-
-const ContinueButton = () => {
- const notify = useNotify()
- const refresh = useRefresh();
- const record = useRecordContext();
- const continueClick = async () => {
- const { data: { code, data, msg } } = await request.post('/waveItem/continue/pub/' + record?.id);
- if (code === 200) {
- notify(msg);
- } else {
- notify(msg);
- }
- refresh()
- }
- return (
- record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
- )
-}
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java
index b4a2137..558a27d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java
@@ -50,7 +50,8 @@
"sys_menu",
"man_loc_type_rela",
"man_qly_inspect_result",
- "view_stock_manage"
+ "view_stock_manage",
+ "man_wave_order_rela"
).contains(tableName);
}
};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
index 68cbb60..eee2c3a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
@@ -55,10 +55,6 @@
@OperationLog("Create 娉㈡绛栫暐")
@PostMapping("/waveOrderRela/save")
public R save(@RequestBody WaveOrderRela waveOrderRela) {
- waveOrderRela.setCreateBy(getLoginUserId());
- waveOrderRela.setCreateTime(new Date());
- waveOrderRela.setUpdateBy(getLoginUserId());
- waveOrderRela.setUpdateTime(new Date());
if (!waveOrderRelaService.save(waveOrderRela)) {
return R.error("Save Fail");
}
@@ -69,8 +65,6 @@
@OperationLog("Update 娉㈡绛栫暐")
@PostMapping("/waveOrderRela/update")
public R update(@RequestBody WaveOrderRela waveOrderRela) {
- waveOrderRela.setUpdateBy(getLoginUserId());
- waveOrderRela.setUpdateTime(new Date());
if (!waveOrderRelaService.updateById(waveOrderRela)) {
return R.error("Update Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveOrderRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveOrderRela.java
index 627cc27..89c9752 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveOrderRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveOrderRela.java
@@ -76,18 +76,4 @@
// null // 澶囨敞
// );
-
-
- public Boolean getStatusBool(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return true;
- case 0:
- return false;
- default:
- return null;
- }
- }
-
}
--
Gitblit v1.9.1