From 4641d0443ce979898dc564df2f972547060938fe Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 11 八月 2025 15:40:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 6 ++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 16 ++++---
src/main/java/com/zy/common/web/WcsController.java | 59 ++++++++++++++++++++++++++---
3 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index e0ea69d..06ad18d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1201,15 +1201,17 @@
// 淇敼搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(locNo);
- if (Cools.isEmpty(locMast)) {
+ if (Cools.isEmpty(locMast) && wrkMast.getIoType() != 12) {
throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:"+ locNo);
}
- locMast.setLocSts(locSts);
- locMast.setModiTime(now);
- locMast.setModiUser(userId);
- boolean locMastRes = locMastService.updateById(locMast);
- if (!wrkMastRes || !locMastRes) {
- throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ if(wrkMast.getIoType() != 12){
+ locMast.setLocSts(locSts);
+ locMast.setModiTime(now);
+ locMast.setModiUser(userId);
+ boolean locMastRes = locMastService.updateById(locMast);
+ if (!wrkMastRes || !locMastRes) {
+ throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index 8a43981..e2c293f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -52,6 +52,7 @@
case 1015:wrkMastSta1.setStaEnd(1018);break;
case 1025:wrkMastSta1.setStaEnd(1028);break;
case 1032:wrkMastSta1.setStaEnd(1035);break;
+ case 4001:wrkMastSta1.setStaEnd(4001);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
@@ -62,8 +63,9 @@
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
- if(wrkMast.getWrkNo() == 1108){
- wrkMastSta1.setStaEnd(1106);
+ switch ((wrkMast.getStaNo())){
+ case 1108:wrkMastSta1.setStaEnd(1106);break;
+ case 4006:wrkMastSta1.setStaEnd(1018);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4122819..e82d35b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -156,28 +156,28 @@
}
- @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(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 +202,53 @@
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(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