From 96c5a749f14c3dea75ff774e5eed2921ba0f2555 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 17 十二月 2025 09:52:02 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/web/WcsController.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index fa70d1e..c54e16d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -85,12 +86,12 @@
if (Cools.isEmpty(param.getFromPort())) {
return Re.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if(Cools.isEmpty(param.getWarehouse())){
- return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
- }
- if(!param.getWarehouse().equals(warehouse)){
- return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
- }
+// if(Cools.isEmpty(param.getWarehouse())){
+// return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+// }
+// if(!param.getWarehouse().equals(warehouse)){
+// return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+// }
List<WaitPakin> waitPakins = null;
if (param.getFromPort().equals("101")) {
@@ -161,12 +162,12 @@
@ResponseBody
public synchronized Re getLocNo(@RequestBody SearchEmptyParam param) {
log.info("鏀跺埌WCS绌烘澘鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if(Cools.isEmpty(param.getWarehouse())){
- return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
- }
- if(!param.getWarehouse().equals(warehouse)){
- return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
- }
+// if(Cools.isEmpty(param.getWarehouse())){
+// return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+// }
+// if(!param.getWarehouse().equals(warehouse)){
+// return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+// }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
@@ -239,9 +240,14 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ WaitPakin waitPakin1 = waitPakins.get(0);
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setMatnr(waitPakin1.getMatnr());
+
+// StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+ StartupDto dto = commonService.getLocNoNew(1, devpNo, findLocNoAttributeVo, locTypeDto,barcode);
if (dto == null) {
throw new CoolException("娌℃湁妫�绱㈠埌绌哄簱浣�");
}
@@ -270,6 +276,8 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setModiUser(waitPakin1.getModiUser());
+ wrkMast.setAppeUser(waitPakin1.getAppeUser());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -321,7 +329,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(10, devpNo, null, null, null, locTypeDto);
+ StartupDto dto = commonService.getLocNoNew(10, devpNo, null, null, null);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -536,12 +544,12 @@
success = true;
} else {
log.error("wms鍚屾wcs搴撲綅澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + "/" + loc, JSON.toJSONString(mapList), response);
- throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
+ throw new CoolException("wms鍚屾wcs搴撲綅澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
+ throw new CoolException("wms鍚屾wcs搴撲綅澶辫触");
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
--
Gitblit v1.9.1