From 9d13a9628d06bca38ae4afe3402945561044bf45 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 24 十月 2025 14:25:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b01636e..44c1cbf 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -218,15 +218,16 @@
}
return workNo;
}
- @PostMapping("/auto/TransplantingOut/v1")
+ @PostMapping("/auto/銆�" +
+ "TransplantingOut/v1")
@ResponseBody
public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
- if(sourceStaNo ==null ){
- return R.error("璇ョ珯鐐圭洏鐐圭Щ鏍借鍙紝璇锋煡鐪嬫簮绔欑偣鐘舵�佹娴�");
- }
+// if(sourceStaNo ==null ){
+// return R.error("璇ョ珯鐐圭洏鐐圭Щ鏍借鍙紝璇锋煡鐪嬫簮绔欑偣鐘舵�佹娴�");
+// }
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
@@ -271,11 +272,11 @@
@ResponseBody
public R autoTransplantingIn(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
- if(sourceStaNo == null){
-
- }
+// if(sourceStaNo == null){
+//
+// }
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
@@ -286,7 +287,7 @@
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(9996);
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(2L);
+ wrkMast.setWrkSts(11L);
wrkMast.setIoPri(14D);
wrkMast.setIoType(12);
wrkMast.setCrnNo(3);
--
Gitblit v1.9.1