From 4d7cce61317b2e2c2e90a0faf73fc57464bf698f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 07:58:47 +0800
Subject: [PATCH] 库位明细添加新字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
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 1b53b5f..114e815 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
@@ -6,21 +6,15 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
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.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.enums.LocStsType;
import io.swagger.annotations.ApiOperation;
@@ -46,6 +40,8 @@
@Autowired
private LocService locService;
+ @Autowired
+ private BasStationService basStationService;
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
@@ -120,7 +116,8 @@
if (null != waitPakin) {
waitPakin.setIoStatus(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (!waitPakinService.updateById(waitPakin)) {
- return R.error("鏇存柊缁勬墭鐘舵�佸け璐�");
+ throw new CoolException("鏇存柊缁勬墭鐘舵�佸け璐ワ紒锛�");
+
}
}
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
@@ -132,9 +129,41 @@
loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
if (!locService.updateById(loc)) {
- return R.error("鏇存柊搴撲綅鐘舵�佸け璐�");
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
}
}
+ if (task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)){
+ BasStation basStation = null;
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
+ ){
+ basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getOrgSite())
+ .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
+ );
+
+
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
+ ) {
+ basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getTargLoc())
+ .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
+ );
+ }
+ if (null == basStation) {
+ throw new CoolException("绔欑偣鐘舵�侀敊璇紒锛�");
+ }
+ basStation.setUseStatus(StaUseStatusType.TYPE_F.type);
+ if (!basStationService.updateById(basStation)){
+ throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+
+
}
if (!taskService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
@@ -177,8 +206,15 @@
// if (tasks.isEmpty()) {
// throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
// }
- taskService.completeTask(tasks);
- return R.ok();
+// taskService.completeTask(tasks);
+ for (Task task : tasks) {
+ task.setTaskStatus(task.getTaskType() < (short)100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+ }
+ if (!taskService.updateBatchById(tasks)){
+ return R.error("瀹屾垚浠诲姟澶辫触");
+ }
+
+ return R.ok("瀹屾垚浠诲姟鎴愬姛");
}
@PreAuthorize("hasAuthority('manager:task:update')")
--
Gitblit v1.9.1