From 20235a873f123a83f7763c0327e5845caa32c9b9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 03 四月 2025 16:15:19 +0800
Subject: [PATCH] 入出库订单打印，拣货单打印，搜索条件增加
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index b801644..04a9034 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.*;
@@ -142,15 +142,16 @@
}
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
+ return locUtils.getGlobalEmptyLocToCtu(locTypeHeight);
//浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
- List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
- //鑾峰彇搴撲綅
- if (!globalLoc.isEmpty()) {
- defaultLoc = locUtils.filterAllLoc(globalLoc);
- if (defaultLoc != null) {
- return defaultLoc;
- }
- }
+// List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
+// //鑾峰彇搴撲綅
+// if (!globalLoc.isEmpty()) {
+// defaultLoc = locUtils.filterAllLoc(globalLoc);
+// if (defaultLoc != null) {
+// return defaultLoc;
+// }
+// }
}
}
@@ -240,15 +241,16 @@
}
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
+ return locUtils.getGlobalEmptyLocToCtu(locTypeHeight);
//浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
- List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList, currentLev);
- //鑾峰彇搴撲綅
- if (!globalLoc.isEmpty()) {
- defaultLoc = locUtils.filterAllLoc(globalLoc);
- if (defaultLoc != null) {
- return defaultLoc;
- }
- }
+// List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList, currentLev);
+// //鑾峰彇搴撲綅
+// if (!globalLoc.isEmpty()) {
+// defaultLoc = locUtils.filterAllLoc(globalLoc);
+// if (defaultLoc != null) {
+// return defaultLoc;
+// }
+// }
}
}
return defaultLoc;
@@ -683,8 +685,12 @@
if (loc == null) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
+ // 鑾峰彇鏂颁换鍔″彿
+ String taskNo = generateTaskNo(53L);
+ // 璁剧疆鏂颁换鍔″彿
+ task.setTaskNo(taskNo);
//102鎷ｆ枡姝ゅ闇�淇敼涓篧CS_CONTAINER_RECEIVE,瀹氭椂浠诲姟鏌ヨ鍚庯紝鑷姩涓嬪彂鍏ュ簱浠诲姟鑷矱SS
- task.setTaskSts(TaskStsType.WCS_CONTAINER_RECEIVE.id);//1.鐢熸垚鍏ュ簱浠诲姟
+ task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.鐢熸垚鍏ュ簱浠诲姟
task.setTaskType(taskType);
//鍘熷簱浣嶅彉鐩爣搴撲綅, 鍘熺珯鐐瑰彉鐩爣绔欑偣
//todo 闇�纭鍘熺珯鐐逛负绌猴紝璇ユ�庝箞澶勭悊
@@ -693,6 +699,9 @@
if (!taskService.updateById(task)) {
throw new CoolException("鎷ｆ枡澶辫触");
}
+ // 鏇存柊浠诲姟鏄庣粏鏂颁换鍔″彿
+ UpdateWrapper<TaskDetl> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("task_no",taskNo).eq("task_id",task.getId());
//搴撲綅鐘舵�佹敼涓洪绾﹀叆搴� R => S
loc.setLocStsId(LocStsType.S.val());
loc.setUpdateTime(new Date());
--
Gitblit v1.9.1