From 307811368b38882c36b9fa20d533570d39af730e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 13:53:10 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/task/TaskList.jsx | 8 +++++--- rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 3 +++ rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 4 ++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx index 8f310bf..84fd054 100644 --- a/rsf-admin/src/page/task/TaskList.jsx +++ b/rsf-admin/src/page/task/TaskList.jsx @@ -146,7 +146,7 @@ <DateField source="createTime" label="common.field.createTime" showTime /> {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */} <TextField source="memo" label="common.field.memo" sortable={false} /> - <WrapperField cellClassName="opt" label="common.field.opt"> + <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} > <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton> <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton> @@ -206,7 +206,8 @@ const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); - const clickCancel = () => { + const clickCancel = (event) => { + event.stopPropagation(); cancleTask(record) }; //鍙栨秷浠诲姟 @@ -236,7 +237,8 @@ const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); - const clickTop = () => { + const clickTop = (event) => { + event.stopPropagation(); topTask(record) }; //缃《浠诲姟 diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java index 269072b..d55b581 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java @@ -575,9 +575,9 @@ .eq(Loc::getAreaId, area) .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) .eq(Loc::getType, locTypeDto.getLocType1()) - .orderByAsc(Loc::getRow) - .orderByAsc(Loc::getCol) .orderByAsc(Loc::getLev) + .orderByAsc(Loc::getCol) + .orderByAsc(Loc::getRow) ); for (Loc loc2 :loc1){ if (!LocUtils.locMoveCheckLocTypeComplete(loc2, locTypeDto)) { diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java index eedb8af..0c1f658 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java @@ -12,11 +12,17 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.entity.Loc; import com.vincent.rsf.server.manager.entity.Task; import com.vincent.rsf.server.manager.entity.TaskItem; +import com.vincent.rsf.server.manager.entity.WaitPakin; +import com.vincent.rsf.server.manager.enums.PakinIOStatus; +import com.vincent.rsf.server.manager.service.LocService; import com.vincent.rsf.server.manager.service.TaskItemService; import com.vincent.rsf.server.manager.service.TaskService; +import com.vincent.rsf.server.manager.service.WaitPakinService; import com.vincent.rsf.server.system.controller.BaseController; +import com.vincent.rsf.server.system.enums.LocStsType; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,6 +40,12 @@ @Autowired private TaskItemService taskItemService; + + @Autowired + private WaitPakinService waitPakinService; + + @Autowired + private LocService locService; @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/task/page") @@ -100,6 +112,30 @@ if (tasks.isEmpty()) { throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�"); } + for (Task task : tasks) { + //鎭㈠缁勬墭鐘舵�� + WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() + .eq(WaitPakin::getBarcode, task.getBarcode()) + ); + if (null != waitPakin) { + waitPakin.setIoStatus(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); + if (!waitPakinService.updateById(waitPakin)) { + return R.error("鏇存柊缁勬墭鐘舵�佸け璐�"); + } + } + Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>() + .eq(Loc::getCode, task.getTaskType() < 100 ? task.getTargLoc() : task.getOrgLoc()) + ); + if (null != loc + && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) + || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) { + + loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type); + if (!locService.updateById(loc)) { + return R.error("鏇存柊搴撲綅鐘舵�佸け璐�"); + } + } + } if (!taskService.removeByIds(Arrays.asList(ids))) { return R.error("Delete Fail"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java index 07f3f46..30256bf 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java @@ -27,6 +27,9 @@ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>() .eq(Loc::getAreaId, areaId) + .orderByAsc(Loc::getLev) + .orderByAsc(Loc::getCol) + .orderByAsc(Loc::getRow) .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type), false ); -- Gitblit v1.9.1