From 34cc63f902b904b631d76b6b81eb76781b105390 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 03 九月 2025 08:44:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4122819..9b03a77 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -142,42 +142,44 @@
@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("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
- @PostMapping("/auto/Transplanting/v1")
+ @PostMapping("/auto/TransplantingOut/v1")
@ResponseBody
- public R autoTransplanting(@RequestBody TransplantWork transplantWork){
+ public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
- if(wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode()) == null){
+ 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();
- int workNo = commonService.getWorkNo(2);
-
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
+ wrkMast.setWrkNo(9997);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L);
wrkMast.setIoPri(14D);
wrkMast.setIoType(12);
wrkMast.setCrnNo(3);
wrkMast.setBarcode(transplantWork.getBarcode());
- wrkMast.setSourceStaNo(transplantWork.getSourceStaNo());
+ wrkMast.setSourceStaNo(1015);
wrkMast.setStaNo(transplantWork.getStaNo());
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -202,6 +204,56 @@
return wrkMastService.insert(wrkMast) ? R.ok("鑷姩3鍙峰爢鍨涙満绉绘牻鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩3鍙峰爢鍨涙満绉绘牻澶辫触");
}
+ @PostMapping("/auto/TransplantingIn/v1")
+ @ResponseBody
+ public R autoTransplantingIn(@RequestBody TransplantWork transplantWork){
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
+ WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
+ if(sourceStaNo == null){
+
+ }
+ if(wrkMast1== null){
+ return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
+ Date now = new Date();
+
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(9996);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoPri(14D);
+ wrkMast.setIoType(12);
+ wrkMast.setCrnNo(3);
+ wrkMast.setBarcode(transplantWork.getBarcode());
+ wrkMast.setSourceStaNo(4001);
+ wrkMast.setStaNo(transplantWork.getStaNo());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setMemo("鑷姩3鍙峰爢鍨涙満绉绘牻");
+ for (WrkDetl item : wrkDetls) {
+ WrkDetl newDetl = new WrkDetl();
+ newDetl.sync(item);
+ newDetl.setWrkNo(wrkMast.getWrkNo());
+ newDetl.setIoTime(wrkMast.getIoTime());
+ newDetl.setAppeTime(now);
+ newDetl.setModiTime(now);
+ if (!wrkDetlService.insert(newDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩3鍙峰爢鍨涙満绉绘牻鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩3鍙峰爢鍨涙満绉绘牻澶辫触");
+ }
+
+
/**
* 鍏ㄦ澘鍏ュ簱
*/
--
Gitblit v1.9.1