From 7e0df28ca9b90d7511759c8dd476ac82ec815941 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 10:53:01 +0800
Subject: [PATCH] #检料盘点工作档更新
---
src/main/java/com/zy/common/web/WcsController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 2760459..1663fbd 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -114,11 +115,11 @@
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
break;
case 103:// 鎷ｆ枡鍏ュ簱
- dto = pickWrkIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+ dto = pickWrkIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto, 2);
break;
case 104:// 骞舵澘鍏ュ簱
case 107:// 鐩樼偣鍏ュ簱
- dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+ dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto, 2);
break;
default:
break;
@@ -194,7 +195,7 @@
case 103:// 鎷ｆ枡鍏ュ簱
case 104:// 骞舵澘鍏ュ簱
case 107:// 鐩樼偣鍏ュ簱
- dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
+ dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto);
break;
default:
break;
@@ -382,12 +383,12 @@
}
@Transactional
- public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto) {
- return pickWrkPlateIn(wrkNo, ioType, devpNo, locTypeDto, 1);
+ public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto) {
+ return pickWrkPlateIn(wrkNo, ioType, devpNo, liftNo, locTypeDto, 1);
}
@Transactional
- public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
+ public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto, Integer version) {
WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
if (Cools.isEmpty(wrkMast)) {
log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
@@ -406,8 +407,8 @@
}
StartupDto dto = null;
if (version == 2) {
- dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
- }else {
+ dto = commonService.getShuttleLocNo(ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ } else {
dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto, 0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
// 鏇存柊鐩爣搴撲綅鐘舵��
@@ -421,11 +422,27 @@
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+
+ //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+ Integer staNo = liftNo * 100 + locMast.getLev1();
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(staNo);//鐩爣绔�
+ wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+ wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+
return dto;
}
@Transactional
- public StartupDto pickWrkIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
+ public StartupDto pickWrkIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto, Integer version) {
WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
if (Cools.isEmpty(wrkMast)) {
log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
@@ -442,7 +459,7 @@
devpNo = 341;
}
}
- StartupDto dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto);//鑾峰彇搴撲綅
+ StartupDto dto = commonService.getShuttleLocNo(ioType - 50, devpNo, matnrList, locTypeDto);//鑾峰彇搴撲綅
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -474,9 +491,26 @@
if (!locMastService.updateById(locMast1)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
- }else {
+ } else {
throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
+
+ //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+ Integer staNo = liftNo * 100 + locMast1.getLev1();
+
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(staNo);//鐩爣绔�
+ wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+ wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+
return dto;
}
--
Gitblit v1.9.1