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/asrs/entity/LocAroundBind.java | 6 +++---
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java | 4 ++--
src/main/webapp/views/locAroundBind/locAroundBind.html | 4 ++--
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/controller/LocAroundBindController.java | 4 ++--
7 files changed, 16 insertions(+), 16 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 61d48a3..05ea761 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -60,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)
@@ -110,7 +110,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());
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("loc_no", locs)
.eq("frozen", 0).eq("deleted", 0)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 15e3030..dc49e35 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -58,7 +58,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());
reportLockLocs(locs, "lock");
diff --git a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
index e5a2b27..90de26c 100644
--- a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
@@ -72,12 +72,12 @@
if (Objects.isNull(locAroundBind)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBLocNo()));
+ LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBlocNo()));
if (!Objects.isNull(aroundBind)) {
return R.error("宸ヤ綅宸茬粦瀹氾紝涓嶈兘閲嶅缁戝畾锛�");
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBlocNo()));
locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
locMast.setDeleted(1);
locMast.setFrozen(1);
diff --git a/src/main/java/com/zy/asrs/entity/LocAroundBind.java b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
index bd7f2cb..f18f3ed 100644
--- a/src/main/java/com/zy/asrs/entity/LocAroundBind.java
+++ b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -47,7 +47,7 @@
*/
@ApiModelProperty(value= "搴撲綅鐮�")
@TableField("b_loc_no")
- private String bLocNo;
+ private String blocNo;
@ApiModelProperty("鏄惁榛樿")
@TableField("is_default")
@@ -63,11 +63,11 @@
public LocAroundBind() {}
- public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {
+ public LocAroundBind(Long devId,String devNo,Long bLocId,String blocNo) {
this.devId = devId;
this.devNo = devNo;
this.bLocId = bLocId;
- this.bLocNo = bLocNo;
+ this.blocNo = blocNo;
}
public String getDef$() {
diff --git a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
index 41d172c..0fc46fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
@@ -71,13 +71,13 @@
}
LocAroundBind bind = new LocAroundBind();
bind.setDevNo(params.getDevNo());
- bind.setBLocNo(mast.getLocNo());
+ bind.setBlocNo(mast.getLocNo());
bind.setDevId(basDevice.getId());
if (!this.insert(bind)) {
throw new CoolException("缁戝畾搴撲綅澶辫触");
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBlocNo()));
locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
locMast.setDeleted(1);
locMast.setFrozen(1);
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 4270b32..ed3f0b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -461,7 +461,7 @@
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)
@@ -473,7 +473,7 @@
binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
.eq("dev_no", basDevice.getDevNo()));
- Set<String> nlocs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+ Set<String> nlocs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
.in("loc_no", nlocs)
@@ -485,7 +485,7 @@
}
LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMasts.getLocNo()));
- bLocNo.setLocType(LocStsType.LOC_STS_TYPE_R.type);
+ bLocNo.setLocType(LocStsType.LOC_STS_TYPE_S.type);
if (!locAroundBindService.updateById(bLocNo)) {
throw new CoolException("宸ヤ綅棰勭害澶辫触锛侊紒");
@@ -1714,7 +1714,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)
diff --git a/src/main/webapp/views/locAroundBind/locAroundBind.html b/src/main/webapp/views/locAroundBind/locAroundBind.html
index 48686e5..0e6632e 100644
--- a/src/main/webapp/views/locAroundBind/locAroundBind.html
+++ b/src/main/webapp/views/locAroundBind/locAroundBind.html
@@ -78,9 +78,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">搴撲綅鐮�: </label>
+ <label class="layui-form-label layui-form-required">宸ヤ綅: </label>
<div class="layui-input-block">
- <input class="layui-input" name="bLocNo" placeholder="璇疯緭鍏ュ簱浣嶇爜" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="blocNo" placeholder="璇疯緭鍏ュ簱浣嶇爜" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1