From fe315fb30fabf24940eaa3001774f9d43120748d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 08:43:13 +0800
Subject: [PATCH] 工作档取消报错修复 工作台管理问题修复 出库状态修改修复
---
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
index f86c4cb..05ea761 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.service.HmesApiService;
+import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.BasDevice;
import com.zy.asrs.entity.LocAroundBind;
import com.zy.asrs.entity.LocMast;
@@ -33,6 +34,9 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private WcsApiService wcsApiService;
/**
* 鎺ユ敹MES绌跨嚎浠诲姟
* @author Ryan
@@ -56,7 +60,7 @@
if (Objects.isNull(binds) || binds.isEmpty()) {
throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
}
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+ Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
.in("loc_no", locs)
@@ -70,6 +74,7 @@
//todo 閿佸簱浣嶉渶WCS閿佸畾锛堢浉鍏冲簱浣嶏紝涓嶅彲鎵ц浠诲姟鎿嶄綔锛屼笉鑳藉彧鍦╓MS閿佸畾锛�
List<LocMast> locMs = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("frozen", 0).eq("deleted", 0)
.in("loc_no", locs)
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
locMs.forEach(loc -> {
@@ -90,6 +95,7 @@
* @return com.core.common.R
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R releaseLock(ReceviceTaskParams params) {
if (Objects.isNull(params) || Objects.isNull(params.getDeviceNo())) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -104,9 +110,24 @@
if (Objects.isNull(binds) || binds.isEmpty()) {
throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
}
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+ Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("loc_no", locs)
+ .eq("frozen", 0).eq("deleted", 0)
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_X.type));
+ if (Objects.isNull(locMasts) || locMasts.isEmpty()) {
+ throw new CoolException("娌℃湁绂佺敤搴撲綅锛屼笉闇�瑕侀噴鏀撅紒锛�");
+ }
- return null;
+ locMasts.forEach(loc -> {
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ if (!locMastService.updateById(loc)) {
+ throw new CoolException("搴撲綅閲婃斁澶辫触锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
+ }
+ });
+
+// wcsApiService.reportLockLocs(locs, "lock");
+
+ return R.ok("閲婃斁鎴愬姛 锛侊紒");
}
}
--
Gitblit v1.9.1