From e482e7b01878a3dd98e8091115d572151ad4f2be Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 16:03:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/StartupDto.java | 9 +++++----
src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java | 8 ++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 +++
3 files changed, 16 insertions(+), 4 deletions(-)
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 30f354f..676ffb6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -303,6 +303,8 @@
@Override
@Transactional
public void stockOut(List<TaskDto> taskDtoList, Long userId) {
+ int seq = 1;
+ String batch = "S" + System.currentTimeMillis();
for (TaskDto taskDto : taskDtoList) {
Date now = new Date();
List<LocDto> locDtos = taskDto.getLocDtos();
@@ -337,6 +339,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
+ wrkMast.setMemo(batch + "-" + seq++);
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+taskDto.getLocNo());
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
index 039dda2..df764ea 100644
--- a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.WrkMastService;
@@ -74,6 +75,13 @@
);
}
} else {
+ String memo = wrkMast.getMemo();
+ if (!Cools.isEmpty(memo)) {
+ String[] split = memo.split("-");
+ startupDto.setBatch(split[0]);
+ startupDto.setBatchSeq(Integer.parseInt(split[1]));
+ }
+
String response ="";
boolean bool =false;
try {
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index 6c4fb4a..b0b2850 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -2,9 +2,6 @@
import lombok.Data;
-/**
- * Created by vincent on 2020/6/11
- */
@Data
public class StartupDto {
@@ -18,6 +15,10 @@
private Integer taskNo;
- private Double taskPri;
+ private Double taskPri;
+
+ private String batch;
+
+ private Integer batchSeq;
}
--
Gitblit v1.9.1