From 5a06c9a6923fde7889ac33d84de74f5e64b67bb8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 二月 2025 19:21:46 +0800
Subject: [PATCH] #修改 集货区绑定可流动问题修复
---
zy-asrs-wms/src/main/resources/application.yml | 2 +-
construction-data/src/components/datav/index.vue | 4 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 8 ++++++++
zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml | 7 -------
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index 69a977f..0ac35a5 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -228,6 +228,10 @@
},
//鎷嶇伅瀹瑰櫒娴佸姩
lightClick(item) {
+ if (item.platformId == null || item.platformId == undefined || item.platformId == '') {
+ this.$message.error('璇锋墦鍗拌鍗曟槑缁嗭紝骞堕�夋嫨鐩爣闆嗚揣鍖猴紒锛�')
+ return
+ }
this.slapLight(item)
},
//璁㈠崟鍏ュ簱闆嗚揣鍖�,骞舵墦鍗板崟鎹�
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index c3eb626..25d3db8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -308,6 +308,11 @@
String taskNo = request.get("taskNo").toString();
String orderNo = request.get("orderNo").toString();
+ List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
+ if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {
+ throw new CoolException("璇锋墦鍗版槑缁嗭紝骞剁粦瀹氱洰鏍囬泦璐у尯");
+ }
+
//* 1. 鍒ゆ柇褰撳墠瀹瑰櫒鏄惁杩樻湁鐗╂枡鏈嫞锛屾湭鎷ｅ畬闂伅锛屾嫞瀹岄�氱煡瀹瑰櫒娴佸姩锛屽苟鐏伅
SlapLightControlParam slapParam = new SlapLightControlParam();
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
@@ -337,6 +342,9 @@
//鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
for (CacheSite cacheSite : cacheSites) {
+ if (Objects.isNull(cacheSite.getPlatformId())) {
+ throw new CoolException("");
+ }
if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
cacheSite.setOrderId(null);
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 1f8f5e5..8cfb5c2 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -41,7 +41,7 @@
# global-config:
# field-strategy: 0
configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
index 3d8caf4..d732c09 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
@@ -16,13 +16,6 @@
<if test="batch != null and batch != ''">
AND t.batch = #{batch}
</if>
- <if test="param!=null and param.size()>0">
- <foreach item="item" collection="param" index="index">
- <if test="item.value!=null and item.value != ''">
- and ${item.name} = #{item.value}
- </if>
- </foreach>
- </if>
<if test="sortParam!=null and sortParam.size()>0">
<foreach collection="sortParam" item="item" open="order by " separator="," close=" ">
${item.name} ${item.value}
--
Gitblit v1.9.1