From 3aefb217aa542c1e80034dd9bd385724fc2292f6 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:30:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
index 6d5279c..9a152fd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
@@ -6,11 +6,14 @@
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.LocStsType;
+import com.zy.acs.manager.manager.enums.StaStsType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.mapper.LocMapper;
import com.zy.acs.manager.manager.service.LocService;
+import com.zy.acs.manager.manager.service.StaService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -22,8 +25,11 @@
@Service("locService")
public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService {
+ @Autowired
+ private StaService staService;
+
@Override
- public Loc selecatByLocNo(String locNo) {
+ public Loc selectByLocNo(String locNo) {
return this.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo));
}
@@ -80,8 +86,26 @@
log.error("Loc [{}] 搴撲綅淇敼鐘舵�佸け璐�", task.getOriLoc$());
}
}
+
+ destSta = staService.getById(task.getDestSta());
+ if (destSta.getStaSts().equals(StaStsType.READY_RELEASE.val())) {
+ destSta.setStaSts(StaStsType.STOCK.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getDestSta$());
+ }
+ }
break;
case STA_TO_LOC:
+ oriSta = staService.getById(task.getOriSta());
+ if (oriSta.getStaSts().equals(StaStsType.READY_TAKE.val())) {
+ oriSta.setStaSts(StaStsType.IDLE.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getOriSta$());
+ }
+ }
+
destLoc = this.getById(task.getDestLoc());
if (destLoc.getLocSts().equals(LocStsType.PAKIN.val())) {
destLoc.setLocSts(LocStsType.STOCK.val());
@@ -92,6 +116,23 @@
}
break;
case STA_TO_STA:
+ oriSta = staService.getById(task.getOriSta());
+ if (oriSta.getStaSts().equals(StaStsType.READY_TAKE.val())) {
+ oriSta.setStaSts(StaStsType.IDLE.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getOriSta$());
+ }
+ }
+
+ destSta = staService.getById(task.getDestSta());
+ if (destSta.getStaSts().equals(StaStsType.READY_RELEASE.val())) {
+ destSta.setStaSts(StaStsType.STOCK.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ log.error("Sta [{}] 绔欑偣淇敼鐘舵�佸け璐�", task.getDestSta$());
+ }
+ }
break;
case TO_CHARGE:
case TO_STANDBY:
@@ -103,4 +144,18 @@
}
+ @Override
+ public Loc selectRandOneByLocSts(Long locSts, Integer limit) {
+ List<Loc> locList = this.selectRandByLocSts(locSts, limit);
+ return locList.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public List<Loc> selectRandByLocSts(Long locSts, Integer limit) {
+ if (locSts == null) {
+ return null;
+ }
+ return this.baseMapper.selectRandByLocSts(locSts, limit);
+ }
+
}
--
Gitblit v1.9.1