From e84d4700e32dba450aa4d239779fc39f38ae4afa Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期三, 01 九月 2021 17:22:32 +0800
Subject: [PATCH] 1.0.8
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 161 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 134 insertions(+), 27 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 2069b21..b67cfb9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -17,10 +17,16 @@
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.ints.entity.IoComplete;
+import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.service.IoCompleteService;
+import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -30,6 +36,7 @@
*/
@Service
public class WorkServiceImpl implements WorkService {
+ static int i =1;
// 宸ヤ綔鍙风敓鎴愯鍒欓粯璁ょ被鍨�
private static final int DEFAULT_WORK_NO_TYPE = 0;
@@ -58,6 +65,10 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WaitMatchkService waitMatchkService;
+ @Autowired
+ private IoCompleteService ioCompleteService;
@Override
@Transactional
@@ -72,7 +83,7 @@
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -136,10 +147,10 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo(), paramLocDetl.getCount())) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatnr(paramLocDetl.getMatnr());
+ sqlParam.setMatNo(paramLocDetl.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
}
@@ -148,13 +159,14 @@
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
} else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
}
}
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {
+
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
@@ -166,13 +178,47 @@
LocDetlDto dto = iterator.next();
if (locNo.equals(dto.getLocDetl().getLocNo())) {
list.add(dto);
- iterator.remove();
+// iterator.remove();
}
}
dtos.add(new OutLocDto(locNo, list));
}
+ //鐢熸垚鐩樼偣鏂囨。
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+
+ 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(id);//璁㈠崟缂栧彿
+ waitMatchk.setLocNo(locDetl.getLocNo());//搴撲綅鍙�
+ waitMatchk.setStockQty(locDetl.getQty());
+ waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
+ waitMatchk.setMatName(locDetl.getMatName());//閾插钩鍚嶇О
+ waitMatchk.setSeqNo(i);
+ waitMatchk.setIoTime(new Date());
+ waitMatchk.setZpallet(locDetl.getZpallet());
+ waitMatchk.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ waitMatchk.setAppeTime(new Date());
+ waitMatchk.setModiUser(userId);
+ waitMatchk.setModiTime(new Date());
+ if (!waitMatchkService.insert(waitMatchk)){
+ throw new CoolException("淇濆瓨鐩樼偣妗ｅけ璐�");
+ }
+ i++;
+ }
+
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
+
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
if (ioType == null) {
ioType = dto.isAll() ? 101 : 103;
@@ -190,6 +236,8 @@
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+
+
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -220,8 +268,8 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
- wrkDetl.setAnfme(anfme); // 鏁伴噺
+ Double qty = ioType==101?detlDto.getLocDetl().getQty():detlDto.getCount();
+ wrkDetl.setQty(qty); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
@@ -254,7 +302,7 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -372,19 +420,19 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo())) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatnr(paramLocDetl.getMatnr());
+ sqlParam.setMatNo(paramLocDetl.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));
}
}
if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, 107, userId);
} else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
}
}
@@ -434,7 +482,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(locDetl.getAnfme());
+ wrkDetl.setQty(locDetl.getQty());
VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
@@ -485,6 +533,34 @@
} else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
}
+ //鏌ヨ鏄庣粏
+ List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
+ int i=1;
+ for (WrkDetl detl : detls) {
+ //鐢熸垚鍥炴姤妗�
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(detl.getBillNo());
+ ioComplete.setMatNo(detl.getMatNo());
+ ioComplete.setMatName(detl.getMatName());
+ ioComplete.setSeqNo(i);
+ ioComplete.setQty(detl.getQty());
+ ioComplete.setZpallet(detl.getZpallet());
+ ioComplete.setAppeUser(userId);
+ if (wrkMast.getWrkSts()==4L){
+ ioComplete.setTaskType(1);
+ ioComplete.setLocNo(wrkMast.getLocNo());
+ }else if (wrkMast.getWrkSts()==14L){
+ ioComplete.setTaskType(2);
+ ioComplete.setLocNo(wrkMast.getSourceLocNo());
+ }
+ ioComplete.setAppeTime(new Date());
+ if (!ioCompleteService.insert(ioComplete)){
+ throw new CoolException("鐢熸垚鍥炴姤妗ｅけ璐�");
+ }
+ i++;
+ }
+ // 瀹屾垚鎿嶄綔浜哄憳璁板綍
+ wrkMast.setManuType("鎵嬪姩瀹屾垚");
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
wrkMast.setCrnEndTime(now);
@@ -498,46 +574,59 @@
@Override
@Transactional
public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+ //鏍规嵁搴撲綅鍙锋壘瀵诲簱浣�
LocMast locMast = locMastService.selectById(param.getLocNo());
+ //鍒ゆ柇
if (Cools.isEmpty(locMast)) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
+ //鏌ヨ搴撲綅鐘舵��
+ if (locMast.getLocSts().equals("O")){
+ //鏇存柊搴撲綅鐘舵��
+ locMast.setLocSts("F");
+// boolean b = locMastService.updateById(locMast);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
+ }
+ }
+
for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
- if (Cools.isEmpty(adjust.getMatnr())) {
+ if (Cools.isEmpty(adjust.getMatNo())) {
throw new CoolException(BaseRes.PARAM);
}
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(locMast.getLocNo());
- sqlParam.setMatnr(adjust.getMatnr());
+ sqlParam.setMatNo(adjust.getMatNo());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
// 淇濆瓨鏂板簱瀛樻槑缁�
if (Cools.isEmpty(one)) {
if (adjust.getCount() == 0){
continue;
}
- MatCode matCode = matCodeService.selectById(adjust.getMatnr());
+ MatCode matCode = matCodeService.selectById(adjust.getMatNo());
LocDetl locDetl = new LocDetl();
locDetl.setLocNo(locMast.getLocNo());
- locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
+ locDetl.setQty(adjust.getCount()); // 鏁伴噺
VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
locDetl.setModiTime(new Date());
locDetl.setAppeUser(userId);
locDetl.setAppeTime(new Date());
+ locDetl.setZpallet(param.getZpallet());//鎵樼洏鍙�
if (!locDetlService.insert(locDetl)) {
throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
}
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
adjDetl.setLocNo(locDetl.getLocNo());
- adjDetl.setMatNo(locDetl.getMatnr());
+ adjDetl.setMatNo(locDetl.getMatNo());
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetlService.save(adjDetl, userId);
// 淇敼鍘熷簱瀛樻槑缁�
} else {
// 濡傛灉鏁伴噺淇敼锛屽垯鏇存柊搴撳瓨鏄庣粏
- if (!adjust.getCount().equals(one.getAnfme())) {
+ if (!adjust.getCount().equals(one.getQty())) {
// 褰撴暟閲忚淇敼涓� 0 鏃讹紝鐩存帴娓呴櫎搴撳瓨鏄庣粏
if (adjust.getCount() == 0) {
if (!locDetlService.delete(new EntityWrapper<>(one))) {
@@ -545,20 +634,20 @@
}
} else {
LocDetl sqlParam1 = new LocDetl();
- sqlParam1.setAnfme(adjust.getCount());
+ sqlParam1.setQty(adjust.getCount());
sqlParam1.setModiTime(new Date());
sqlParam1.setModiUser(userId);
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
- .eq("matnr", adjust.getMatnr()))) {
+ .eq("mat_no", adjust.getMatNo()))) {
throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
}
}
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
adjDetl.setLocNo(locMast.getLocNo());
- adjDetl.setMatNo(adjust.getMatnr());
- adjDetl.setOriQty(one.getAnfme());
+ adjDetl.setMatNo(adjust.getMatNo());
+ adjDetl.setOriQty(one.getQty());
adjDetl.setAdjQty(adjust.getCount());
adjDetlService.save(adjDetl, userId);
}
@@ -629,10 +718,28 @@
} else {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
- // 鍒犻櫎宸ヤ綔妗�
+ // 鍙栨秷鎿嶄綔浜哄憳璁板綍
+ wrkMast.setManuType("鎵嬪姩鍙栨秷");
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐�");
+ }
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
boolean wrkMastRes = wrkMastService.deleteById(wrkMast);
- // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
- boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
+
+ if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
+ boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
+ }
// 淇敼搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
@@ -642,7 +749,7 @@
locMast.setModiTime(new Date());
locMast.setModiUser(userId);
boolean locMastRes = locMastService.updateById(locMast);
- if (!wrkMastRes || !wrkDetlRes || !locMastRes) {
+ if (!wrkMastRes || !locMastRes) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
--
Gitblit v1.9.1