From 955fef9ba80fda70582d926a2c6f2af527447bb5 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 22 十一月 2025 08:21:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 30f438b..e4e7a12 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -125,10 +125,13 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
+ if(sourceStaNo.getWrkNo() == 0 ){
+ return R.error("绔欑偣宸ヤ綔鍙蜂笉瀛樺湪");
+ }
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-
+ param.setIoType(10);
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
@@ -256,8 +259,7 @@
}
return workNo;
}
- @PostMapping("/auto/銆�" +
- "TransplantingOut/v1")
+ @PostMapping("/auto/TransplantingOut/v1")
@ResponseBody
public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
@@ -362,13 +364,16 @@
@Transactional
public StartupDto startupFullPutStoreAgv(Integer devpNo, String barcode, LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
// 鏇存柊鐩爣搴撲綅鐘舵��
Date now = new Date();
+ if(dto == null){
+ throw new CoolException("鏈壘鍒板簱浣�");
+ }
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
--
Gitblit v1.9.1