From 8b3d5b19b746a808d447b67164ba86e673fd9822 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 24 八月 2025 16:10:14 +0800
Subject: [PATCH] 订单出库，统一出库时间
---
src/main/java/com/zy/asrs/service/WorkService.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 +--
src/main/java/com/zy/asrs/controller/OutController.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b97f668..c56325f 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -220,6 +220,7 @@
taskDtos.add(taskDto);
}
}
+ Date now = new Date();
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
@@ -233,7 +234,7 @@
}
}
}
- workService.stockOut(staNo, taskDto, getUserId());
+ workService.stockOut(staNo, taskDto, getUserId(),now);
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index c3a472c..635a6cb 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -12,6 +12,7 @@
import com.zy.common.model.TaskDto;
import com.zy.common.model.enums.IoWorkType;
+import java.util.Date;
import java.util.List;
public interface WorkService {
@@ -40,7 +41,7 @@
*/
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
- void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
+ void stockOut(BasDevp staNo, TaskDto taskDto, Long userId, Date now);
/**
* 绌烘澘鍏ュ簱
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a713524..518c0f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -409,8 +409,7 @@
@Override
@Transactional
- public void stockOut(BasDevp staNo, TaskDto taskDto, Long userId) {
- Date now = new Date();
+ public void stockOut(BasDevp staNo, TaskDto taskDto, Long userId,Date now) {
List<LocDto> locDtos = taskDto.getLocDtos();
for (LocDto locDto : locDtos) {
if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
--
Gitblit v1.9.1