From a7b476eaa50abb7cdebf691cc232c26926ee1328 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 18 九月 2021 10:40:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 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 b501208..b1d2c77 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -14,11 +14,13 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
-import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.service.IoCompleteService;
+import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,9 +65,12 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
-
@Autowired
private WaitMatchkService waitMatchkService;
+ @Autowired
+ private WaitMatchkLogService waitMatchkLogService;
+ @Autowired
+ private IoCompleteService ioCompleteService;
@Override
@Transactional
@@ -80,7 +85,9 @@
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, 0);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1((short) 1);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(),false, matNos,locTypeDto, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -153,7 +160,7 @@
}
}
if (!locDetlDtos.isEmpty()) {
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+ // 鍚姩鍑哄簱寮�濮� 101.103鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
} else {
throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
@@ -180,37 +187,46 @@
}
dtos.add(new OutLocDto(locNo, list));
}
- //鐢熸垚鐩樼偣鏂囨。
- for (LocDetlDto locDetlDto : locDetlDtos) {
- String id="";
+ if(ioType == 107) {
//鑾峰彇褰撳墠鏃堕棿鎴�
SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
String temp = sf.format(new Date());
- //鑾峰彇6浣嶉殢鏈烘暟
- int random=(int) ((Math.random()+1)*1000);
- id=temp+random;
-
+ //鑾峰彇3浣嶉殢鏈烘暟
+ Random rand = new Random();
+ Integer r = rand.nextInt(900) + 100;
+ String billNo = temp + r;
+ //鐢熸垚鐩樼偣閫氱煡妗�
+ for (LocDetlDto locDetlDto : locDetlDtos) {
// 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("淇濆瓨鐩樼偣妗ｅけ璐�");
+ LocDetl locDetl = locDetlDto.getLocDetl();
+
+ //////鎻掑叆鐩樼偣妗ｅ墠锛屽皢閫氱煡妗ｄ箣鍓嶇浉鍚屽簱浣嶆暟鎹浆鍘嗗彶妗�
+ List<WaitMatchk> waitMatchks = waitMatchkService.selectList(new EntityWrapper<WaitMatchk>().eq("loc_no",locDetl.getLocNo()));
+ for(WaitMatchk one : waitMatchks){
+ waitMatchkLogService.save(one.getBillNo(),one.getLocNo(),one.getMatNo());
+ waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no",one.getBillNo()).eq("loc_no",one.getLocNo()).eq("mat_no",one.getMatNo()));
+ }
+
+ //鐢熸垚鐩樼偣妗�
+ WaitMatchk waitMatchk = new WaitMatchk();
+ waitMatchk.setBillNo(billNo);//璁㈠崟缂栧彿
+ 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++;
}
- i++;
}
// 鐢熸垚宸ヤ綔妗�
@@ -233,7 +249,6 @@
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
-
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -299,7 +314,9 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, 0);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1((short) 1);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, true,null,locTypeDto, 0);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -530,6 +547,7 @@
} else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
}
+
// 瀹屾垚鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩瀹屾垚");
Date now = new Date();
--
Gitblit v1.9.1