From 605be0c8702fc7bfe4f7fcdd397c9f0d40722b69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 09 四月 2026 15:19:43 +0800
Subject: [PATCH] 1.商品档案新增最大限制和最小限制 2.mes空桶/余料回库修复
---
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 28b58d9..74c3361 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -251,6 +251,26 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public R releaseAllLocks() {
+ EntityWrapper<LocAroundBind> frozenWrapper = new EntityWrapper<>();
+ frozenWrapper.eq("freeze", 1);
+ int frozenCount = locAroundBindService.selectCount(frozenWrapper);
+ if (frozenCount <= 0) {
+ return R.ok("鍏ㄩ儴鏈哄彴宸ヤ綅鍧囨湭鍐荤粨");
+ }
+
+ LocAroundBind updateEntity = new LocAroundBind();
+ updateEntity.setFreeze(0);
+ EntityWrapper<LocAroundBind> updateWrapper = new EntityWrapper<>();
+ updateWrapper.eq("freeze", 1);
+ if (!locAroundBindService.update(updateEntity, updateWrapper)) {
+ throw new CoolException("鍏ㄩ儴鏈哄彴宸ヤ綅瑙ｅ喕澶辫触锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
+ }
+ return R.ok("鍏ㄩ儴鏈哄彴宸ヤ綅瑙ｅ喕鎴愬姛锛屽叡澶勭悊" + frozenCount + "涓伐浣�");
+ }
+
+ @Override
public R getDeviceFreezeStatus(String devNo) {
EntityWrapper<BasDevice> deviceWrapper = new EntityWrapper<>();
deviceWrapper.eq("status", 1);
@@ -321,7 +341,7 @@
}
workService.updateWrkIsSuplus(String.valueOf(mast.getWrkNo()), HMES_USER_ID, backType);
- return workService.backLocOperation(String.valueOf(mast.getWrkNo()), HMES_USER_ID);
+ return R.ok();
}
private HmesStationFreezeStatusDto buildStationFreezeStatus(LocAroundBind bind) {
--
Gitblit v1.9.1