From e8f76615d2875e1acf9b28b20657cbca6117ca9f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 16 五月 2025 18:18:58 +0800
Subject: [PATCH] 1. 即时库存修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
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..4e610b6 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
@@ -7,17 +7,13 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
-import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -27,7 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -54,6 +49,37 @@
private TaskItemService taskItemService;
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private BasStationService basStationService;
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void agvTaskPickUpComplete(TaskInParam param) {
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBarcode, param.getBarcode())
+ );
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔′俊鎭�");
+ }
+// if (!task.getTaskStatus().equals(TaskStsType.WCS_CONVEYOR_START.id)){
+// throw new CoolException("浠诲姟鐘舵�佹湁璇�");
+// }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, param.getSourceStaNo())
+ );
+ if (null == basStation) {
+ throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
+ }
+ task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
+ taskService.updateById(task);
+
+ basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
+ basStation.setBarcode(null);
+ basStationService.updateById(basStation);
+
+
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -90,6 +116,8 @@
locNo.setWorkNo(ruleCode);
return locNo;
}
+
+
/**
* 楠岃瘉璁惧绔欑偣
@@ -188,7 +216,7 @@
BeanUtils.copyProperties(item, taskItem);
return taskItem.setTaskId(taskId)
- .setOrderType(OrderType.ORDER_RECEIPT.type)
+ .setOrderType(OrderType.ORDER_IN.type)
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
.setCreateBy(loginUserId)
@@ -575,9 +603,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)) {
--
Gitblit v1.9.1