From a6f97ff678665c497645911077c65395c6c01a6e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 26 十月 2023 16:28:55 +0800
Subject: [PATCH] 库存调整单据修改
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 6ac573e..0430850 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -9,12 +9,14 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.StartupDto;
import com.zy.common.model.TaskDto;
import com.zy.common.service.AgvCommonService;
import com.zy.common.web.BaseController;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,7 +25,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.UUID;
/**
* Created by vincent on 2020/6/11
@@ -69,6 +70,7 @@
鍏ュ簱
*/
@Transactional
+ @Synchronized
public StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor) {
Date now = new Date();
@@ -350,8 +352,8 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(userId);
- UUID uuid = UUID.randomUUID();
- adjDetl.setOrderNo(uuid.toString());
+ adjDetl.setOrderNo(Utils.generateAdjustOrderNo());
+
adjDetl.setCsocode(locDetl.getThreeCode());
adjDetl.setIsoseq(locDetl.getDeadTime());
@@ -380,6 +382,7 @@
adjDetl.setModiUser(userId);
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(userId);
+ adjDetl.setOrderNo(Utils.generateAdjustOrderNo());
adjDetlService.save(adjDetl, userId);
}
@@ -414,8 +417,7 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(userId);
- UUID uuid = UUID.randomUUID();
- adjDetl.setOrderNo(uuid.toString());
+ adjDetl.setOrderNo(Utils.generateAdjustOrderNo());
adjDetl.setCsocode(locDetl.getThreeCode());
adjDetl.setIsoseq(locDetl.getDeadTime());
@@ -731,8 +733,6 @@
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
}
-
-
}
}
--
Gitblit v1.9.1