From 5ea75676b5decb2994d77d92553ad5151277dfc7 Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期六, 28 八月 2021 08:27:24 +0800
Subject: [PATCH] 1.0.3
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 5438dd4..4f3c4fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -181,11 +182,20 @@
}
//鐢熸垚鐩樼偣鏂囨。
for (LocDetlDto locDetlDto : locDetlDtos) {
- String replace = UUID.randomUUID().toString().replace("-", "");
+
+ String id="";
+ //鑾峰彇褰撳墠鏃堕棿鎴�
+ SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
+ String temp = sf.format(new Date());
+ //鑾峰彇6浣嶉殢鏈烘暟
+ int random=(int) ((Math.random()+1)*1000);
+ id=temp+random;
+
+// String replace = UUID.randomUUID().toString().replace("-", "");
LocDetl locDetl = locDetlDto.getLocDetl();
//鐢熸垚鐩樼偣妗�
WaitMatchk waitMatchk = new WaitMatchk();
- waitMatchk.setBillNo(replace);//璁㈠崟缂栧彿
+ waitMatchk.setBillNo(id);//璁㈠崟缂栧彿
waitMatchk.setLocNo(locDetl.getLocNo());//搴撲綅鍙�
waitMatchk.setStockQty(locDetl.getQty());
waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
@@ -535,10 +545,13 @@
@Override
@Transactional
public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+ //鏍规嵁搴撲綅鍙锋壘瀵诲簱浣�
LocMast locMast = locMastService.selectById(param.getLocNo());
+ //鍒ゆ柇
if (Cools.isEmpty(locMast)) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
+
for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
if (Cools.isEmpty(adjust.getMatNo())) {
throw new CoolException(BaseRes.PARAM);
@@ -561,6 +574,7 @@
locDetl.setModiTime(new Date());
locDetl.setAppeUser(userId);
locDetl.setAppeTime(new Date());
+ locDetl.setZpallet(param.getZpallet());//鎵樼洏鍙�
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
--
Gitblit v1.9.1