From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/resources/mapper/WrkMastLogMapper.xml | 1 +
src/main/java/com/zy/common/web/BaseController.java | 20 ++++++++++++++++++--
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 1 +
src/main/resources/application-dev.yml | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 5 ++++-
src/main/java/com/zy/common/service/CommonService.java | 17 ++++++++++++++++-
7 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b033501..f17d01b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -269,8 +269,11 @@
}});
String agvSta = "";
if (locMast.getLocType3() == 2) {
+ agvSta = "Z-LZP26";
+ }else if (locType == 2){
- } else {
+ }
+ else {
agvSta = orderPakout.getCstmrName();//agv鐩爣绔欑偣浣嶇疆
}
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam, ioPri, agvSta);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 800bda2..2237764 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -30,6 +30,7 @@
private Long id;
@ApiModelProperty("鏃ュ織ID")
+ @TableField("log_id")
private Long logId;
/**
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f01b610..a5bd580 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -177,7 +177,22 @@
.orderBy("lev1")
.orderBy("bay1")
.orderBy("row1"));
- if (locMast == null) {
+ if (locMast == null && locTypeDto.getLocType1() ==1) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", locTypeDto.getLocType1() + 1)
+ .eq("loc_type2", locTypeDto.getLocType2())
+ .orderBy("lev1")
+ .orderBy("bay1")
+ .orderBy("row1"));
+ if (locMast1 == null){
+ log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ }else {
+ locMast =locMast1;
+ }
+
+ }else if (locMast ==null){
log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 995c3d9..d3ef2f5 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -121,6 +121,14 @@
// 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
+ // 鍒涘缓涓�涓复鏃秏ap锛屾帓闄ondition鍙傛暟鍜屽垎椤垫帓搴忓弬鏁�
+ Map<String, Object> tempMap = new HashMap<>(map);
+ tempMap.remove("condition");
+ tempMap.remove("curr");
+ tempMap.remove("limit");
+ tempMap.remove("orderByField");
+ tempMap.remove("orderByType");
+
for (Field field : Cools.getAllFields(cls)){
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
@@ -134,7 +142,7 @@
if (Cools.isEmpty(column)) {
column = field.getName();
}
- if (!map.keySet().contains(column)) {
+ if (!tempMap.keySet().contains(column)) {
columns.add(column);
}
}
@@ -154,6 +162,14 @@
if (Cools.isEmpty(condition)) {
return;
}
+ // 鍒涘缓涓�涓柊鐨勯泦鍚堬紝鎺掗櫎condition鍙傛暟鏈韩
+ Set<String> excludeSet = new HashSet<>(set);
+ excludeSet.remove("condition");
+ excludeSet.remove("curr");
+ excludeSet.remove("limit");
+ excludeSet.remove("orderByField");
+ excludeSet.remove("orderByType");
+
List<String> columns = new ArrayList<>();
for (Field field :Cools.getAllFields(cls)){
if (Modifier.isFinal(field.getModifiers())
@@ -168,7 +184,7 @@
if (Cools.isEmpty(column)) {
column = field.getName();
}
- if (!set.contains(column)) {
+ if (!excludeSet.contains(column)) {
columns.add(column);
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 24bb2f0..0be9371 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -90,7 +90,7 @@
}
//鍏ュ簱鏃跺绌烘澘鍑哄簱浠诲姟杩涜瀹屾垚
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()).eq("wrk_sts",110));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()).eq("io_type",110));
if (!Cools.isEmpty(wrkMast)) {
wrkMast.setWrkSts(15L);//绌烘澘鍑哄簱浠诲姟杞巻鍙叉。
wrkMastService.updateById(wrkMast);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fa19016..35ccdff 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -130,7 +130,7 @@
zpalletId: tuopan
wcs:
- url: 127.0.0.1:9094/wcs
+ url: 172.26.160.202/
#mes瀵规帴
mes:
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index b7a61ef..8508a2c 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastLog">
<id column="id" property="id" />
<result column="wrk_no" property="wrkNo" />
+ <result column="log_id" property="logId" />
<result column="inv_wh" property="invWh" />
<result column="ymd" property="ymd" />
<result column="mk" property="mk" />
--
Gitblit v1.9.1