From 60fdc9564c65b90a8911ff10a25f3f3a63d3812c Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 20 六月 2025 11:06:27 +0800
Subject: [PATCH] 出库任务历史档优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index 04a9034..ba6dff2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.*;
@@ -15,6 +16,8 @@
import com.zy.asrs.wms.utils.LocUtils;
import com.zy.asrs.wms.utils.OrderUtils;
import com.zy.asrs.wms.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +26,8 @@
@Service("workService")
public class WorkServiceImpl implements WorkService {
+
+ public static final Logger logger = LoggerFactory.getLogger(WorkServiceImpl.class);
@Autowired
private TaskService taskService;
@@ -77,9 +82,11 @@
@Override
public String generateTaskNo(Long taskType) {
+ String format = DateUtils.format(new Date(), "MMddHHmm");
Random random = new Random();
int nextInt = random.nextInt(99999);
- return "R" + nextInt;
+ logger.info("R" + format + nextInt);
+ return "R" + format + nextInt;
}
@Override
@@ -441,13 +448,12 @@
} else {
//鍑哄簱
TaskDetl taskDetl = taskDetls.get(0); //TODO 鍑哄簱娴佺▼寰呯‘璁わ紝ESS鍙栬揣鍚庯紝杈撻�佺嚎娴佽浆鍒版壂鐮佸鐘舵��
- if (taskDetl.getWaveId() == null) {
+ if (taskDetl.getWaveId() == null && task.getTaskType() != 103 && task.getTaskType() != 107) {
task.setTaskSts(TaskStsType.COMPLETE_OUT.id);//199.鍑哄簱瀹屾垚
} else {
task.setTaskSts(TaskStsType.WAVE_SEED.id);//198.鎾涓�
}
}
-
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鏇存柊澶辫触");
@@ -639,7 +645,7 @@
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- if (task.getTaskType() != 103) {
+ if (task.getTaskType() != 103 && task.getTaskType() != 107) {
throw new CoolException("浠诲姟绫诲瀷涓嶅彲鎷ｆ枡");
}
@@ -654,7 +660,9 @@
}
//鑾峰彇婧愬簱浣嶉珮搴�
- LocTypeBind locTypeBind = locTypeBindService.getOne(new LambdaQueryWrapper<LocTypeBind>().eq(LocTypeBind::getLocId, originLoc.getId()).in(LocTypeBind::getTypeId, LocBindType.HEIGHT.list()));
+ LocTypeBind locTypeBind = locTypeBindService.getOne(new LambdaQueryWrapper<LocTypeBind>()
+ .eq(LocTypeBind::getLocId, originLoc.getId())
+ .in(LocTypeBind::getTypeId, LocBindType.HEIGHT.list()));
if (locTypeBind == null) {
throw new CoolException("搴撲綅绫诲瀷涓嶅瓨鍦�");
}
--
Gitblit v1.9.1