From e756eaba7a7868d27cad5a93e9f6d046671116c4 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 29 九月 2025 14:44:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/web/WcsController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e82d35b..ab15718 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -115,12 +115,15 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
StartupDto dto = commonService.getLocNo( 10, 1038, findLocNoAttributeVo, locTypeDto);
+ if (dto == null){
+ throw new CoolException("鏌ヨ搴撲綅澶辫触");
+ }
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(dto.getWorkNo());
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(1L);
+ wrkMast.setWrkSts(2L);
wrkMast.setIoPri(13D);
wrkMast.setIoType(10);
wrkMast.setCrnNo(dto.getCrnNo());
@@ -137,19 +140,38 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(dto.getWorkNo());
+ sourceStaNo.setModiUser(9999L);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiUser(9999L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()).add(wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut(@RequestBody LocTypeDto locTypeDto){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
return R.error("搴撳瓨娌℃湁绌烘澘");
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(301);
+ emptyPlateOutParam.setOutSite(locTypeDto.getSiteId());
emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
@@ -162,12 +184,14 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
+ if(sourceStaNo ==null ){
+ return R.error("璇ョ珯鐐圭洏鐐圭Щ鏍借鍙紝璇锋煡鐪嬫簮绔欑偣鐘舵�佹娴�");
+ }
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
Date now = new Date();
-
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(9997);
@@ -177,7 +201,7 @@
wrkMast.setIoType(12);
wrkMast.setCrnNo(3);
wrkMast.setBarcode(transplantWork.getBarcode());
- wrkMast.setSourceStaNo(1015);
+ wrkMast.setSourceStaNo(transplantWork.getSourceStaNo());
wrkMast.setStaNo(transplantWork.getStaNo());
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -208,6 +232,9 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
+ if(sourceStaNo == null){
+
+ }
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
--
Gitblit v1.9.1