From b4453189f458329bf9eb7ff25944b3a7bdf55574 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 06 二月 2025 08:39:18 +0800
Subject: [PATCH] # 证书过期 CTU立体库，生成任务时绑定站点 CTU回库时走入库操作
---
license.lic | 0
zy-asrs-wms/src/main/resources/application.yml | 2
zy-asrs-admin/src/views/IndexView.vue | 3 -
zy-asrs-admin/src/assets/main.css | 2
zy-asrs-wms/src/main/resources/license.lic | 0
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 60 +++++++++++++++++++++---------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PageRequest.java | 2 -
zy-asrs-wms/pom.xml | 2
8 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/license.lic b/license.lic
index 24858ca..2ef3cb1 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/zy-asrs-admin/src/assets/main.css b/zy-asrs-admin/src/assets/main.css
index 963f4c2..4b3d84f 100644
--- a/zy-asrs-admin/src/assets/main.css
+++ b/zy-asrs-admin/src/assets/main.css
@@ -13,7 +13,7 @@
}
.sider-style {
- min-height: 100vh;
+ max-height: 100vh;
background: #01101E;
}
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index 10cdd64..42414ea 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/zy-asrs-admin/src/views/IndexView.vue
@@ -253,7 +253,6 @@
console.log(state.openKeys)
}
-
</script>
<template>
@@ -387,7 +386,7 @@
<style scoped>
.ant-layout-sider ant-layout-sider-dark main-sider {
- min-height: 100vh;
+ max-height: 100vh;
background: #01101E;
}
diff --git a/zy-asrs-wms/pom.xml b/zy-asrs-wms/pom.xml
index e6848c3..a29da4a 100644
--- a/zy-asrs-wms/pom.xml
+++ b/zy-asrs-wms/pom.xml
@@ -5,7 +5,7 @@
<artifactId>asrs-wms</artifactId>
<version>1.0.0</version>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<name>wms</name>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PageRequest.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PageRequest.java
index 0e64938..e8afd54 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PageRequest.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PageRequest.java
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.xml.internal.ws.model.WrapperParameter;
import lombok.Data;
-import java.sql.Wrapper;
import java.util.Map;
@Data
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 709c6a1..b60555e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -995,7 +995,7 @@
}
/**
- * 鏍规嵁涓嶅悓搴撲綅绫诲瀷鐢熸垚鍑哄簱鎷ｅ崟鍙奀TU浠诲姟妗�
+ * 鏍规嵁涓嶅悓搴撲綅绫诲瀷鐢熸垚鍑哄簱鎷ｈ揣鍗曟垨CTU浠诲姟妗�
*
* @param dto
* @param wave
@@ -1008,10 +1008,9 @@
//骞冲簱鏁版嵁婧�
List<OrderOutMergeParam> flatOrders = new ArrayList<>();// listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_FLAT);
- //TUC鏁版嵁婧�
+ //CTU鏁版嵁婧�
List<OrderOutMergeParam> tucOrders = new ArrayList<>();//listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_UTC);
//鎸夊簱浣嶇被鍨嬪垎绫�
- //fixme 濡傛灉搴撳瓨涓嶈冻鏃讹紝鐢熸垚浠诲姟妗� 杩囨护鎺夋病鏈夊簱浣嶄俊鎭殑鏁版嵁銆傛壘鍚涙澃纭
List<OrderOutMergeParam> mergeParam = params.stream().filter(par -> {
return !StringUtils.isNullOrEmpty(par.getLocNo());
}).collect(Collectors.toList());
@@ -1031,20 +1030,19 @@
}
if (!tucOrders.isEmpty()) {
- //TUC鍑哄簱
+ //CTU鍑哄簱
outStockByTUC(tucOrders, wave);
}
-
}
/**
- * TUC鍑哄簱--鐢熸垚鍑哄簱浠诲姟妗�
+ * CTU鍑哄簱--鐢熸垚鍑哄簱浠诲姟妗�
*
* @param tucOrders
* @param wave
*/
- private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {//123
+ private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {
Map<Long, List<OrderOutMergeDto>> map = checkLoc(tucOrders, wave);
for (Map.Entry<Long, List<OrderOutMergeDto>> entry : map.entrySet()) {
@@ -1126,6 +1124,32 @@
waveDetl.setUpdateTime(new Date());
if (!waveDetlService.updateById(waveDetl)) {
throw new CoolException("娉㈡鏁版嵁鏇存柊澶辫触");
+ }
+ }
+
+ List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveNo, wave.getWaveNo()));
+ if (orders.isEmpty()) {
+ throw new CoolException("褰撳墠娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
+ }
+
+ List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).orderByAsc(CacheSite::getChannel));
+
+ if (cacheSites.isEmpty()) {
+ throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+ }
+
+ if (cacheSites.size() < orders.size()) {
+ throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+ }
+
+ for (int i = 0; i < orders.size(); i++) {
+ CacheSite cacheSite = cacheSites.get(i);
+ cacheSite.setOrderId(orders.get(i).getId());
+ cacheSite.setOrderNo(orders.get(i).getOrderNo());
+ cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
+ cacheSite.setUpdateTime(new Date());
+ if (!cacheSiteService.updateById(cacheSite)) {
+ throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
}
}
@@ -1385,17 +1409,17 @@
throw new CoolException("璁㈠崟鍙嶅啓澶辫触");
}
-// CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId()));
-// if (cacheSite == null) {
-// throw new CoolException("缂撳瓨绔欎笉瀛樺湪");
-// }
-// cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
-// cacheSite.setOrderId(null);
-// cacheSite.setOrderNo(null);
-// cacheSite.setUpdateTime(new Date());
-// if (!cacheSiteService.updateById(cacheSite)) {
-// throw new CoolException("缂撳瓨绔欐竻绌哄け璐�");
-// }
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId()));
+ if (cacheSite == null) {
+ throw new CoolException("缂撳瓨绔欎笉瀛樺湪");
+ }
+ cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
+ cacheSite.setOrderId(null);
+ cacheSite.setOrderNo(null);
+ cacheSite.setUpdateTime(new Date());
+ if (!cacheSiteService.updateById(cacheSite)) {
+ throw new CoolException("缂撳瓨绔欐竻绌哄け璐�");
+ }
}
waveDetlService.removeById(waveDetl.getId());
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 6f72699..1f8f5e5 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -13,8 +13,8 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-# url: jdbc:mysql://127.0.0.1:3306/wms_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
password: 34821015
# url: jdbc:mysql://47.76.147.249:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
diff --git a/zy-asrs-wms/src/main/resources/license.lic b/zy-asrs-wms/src/main/resources/license.lic
index 24858ca..2ef3cb1 100644
--- a/zy-asrs-wms/src/main/resources/license.lic
+++ b/zy-asrs-wms/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1