From 7bd1e8326844525956f13ebaf4e5549943be484f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 08:12:47 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index 19b67c6..0543095 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -6,6 +6,7 @@
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.TaskMapper;
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -52,8 +53,17 @@
if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
+
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getSourceStaNo()));
+ if (!Objects.isNull(station)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ station.setBarcode(null);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!!");
+ }
+ }
wrkMast.setWrkSts(4L);
// 鍑哄簱
} else if (wrkMast.getWrkSts() > 10) {
@@ -74,7 +84,7 @@
@Override
@Transactional
public void pickWrkMast(String workNo, Long userId) {
- Task wrkMast = this.selectById(workNo);
+ Task wrkMast = this.selectOne(new EntityWrapper<Task>().eq("wrk_no", workNo) );
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
@@ -131,6 +141,11 @@
@Override
public List<Task> selectToBeCompleteData() {
return this.baseMapper.selectToBeCompleteData();
+ }
+
+ @Override
+ public List<Task> selectToBeHistoryData() {
+ return this.baseMapper.selectToBeHistoryData();
}
@@ -199,6 +214,7 @@
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getStaNo()));
if (station.getLocSts().equals("S")) {
station.setLocSts("O");
+ station.setBarcode(null);
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
@@ -231,6 +247,9 @@
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
for (TaskDetl wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(wrkDetl.getOrderNo())){
+ continue;
+ }
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
@@ -240,7 +259,7 @@
boolean flag = true;
OrderPakin order = orderService.selectByNo(wrkDetl.getOrderNo()); //OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁淇℃伅涓嶅瓨鍦紒锛�");
+ continue;
}
List<OrderDetlPakin> orderDetls = orderDetlService.selectByOrderId(order.getId()); //OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
for (OrderDetlPakin orderDetl : orderDetls) {
--
Gitblit v1.9.1