From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/common/web/WcsController.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e8eddec..cc7fa7a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -17,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -82,21 +83,34 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
- switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
- assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
- break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
- break;
- case 103:// 鎷ｆ枡鍏ュ簱
- case 104:// 骞舵澘鍏ュ簱
- case 107:// 鐩樼偣鍏ュ簱
- dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
- break;
- default:
- break;
+ try{
+ switch (param.getIoType()) {
+ case 1://婊℃墭鐩樺叆搴�
+ assert waitPakins != null;
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ break;
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ break;
+ case 103:// 鎷ｆ枡鍏ュ簱
+ case 104:// 骞舵澘鍏ュ簱
+ case 107:// 鐩樼偣鍏ュ簱
+ dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
+ break;
+ default:
+ break;
+ }
+ } catch (Exception e){
+ String message = e.getMessage();
+ if (message.contains("--")){
+ String[] split = message.split("--");
+ if (!Cools.isEmpty(split) && split.length>=2){
+ if (split[1].equals("1000")){
+ return R.parse(CodeRes.NONE_DETL_1000);
+ }
+ }
+ }
+ return R.error().add(e.getMessage());
}
if (!Cools.isEmpty(dto) && param.getIoType()<11 && dto.getCrnNo().equals(0) && dto.getWorkNo().equals(9999) && dto.getStaNo().equals(1000)){
return R.parse(CodeRes.NONE_DETL_1000);
@@ -115,7 +129,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,waitPakins.get(0).getMatTypeIn());
if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
dto.setWorkNo(9999);
dto.setStaNo(1000);
@@ -166,6 +180,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setOrigin(waitPakin.getBatch());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -204,7 +219,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
dto.setWorkNo(9999);
dto.setStaNo(1000);
@@ -273,7 +288,7 @@
}
// 妫�绱㈠簱浣�
List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
- return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
}
--
Gitblit v1.9.1