From 5acac40bea6d214d256332f26119179956514699 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:14:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 30670f1..f7a0697 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -35,13 +36,18 @@
@Autowired
private WorkService workService;
+ @Value("${channel.equipmentRow}")
+ private Integer equipmentRow; //娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
+ @Value("${channel.quietRow}")
+ private Integer quietRow; //闈欑疆搴撲綅鎵�鍦ㄦ帓鍙�
+
@Transactional
public ReturnT<String> start() {
try {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
.eq("pack_status", 3)
- .eq("row1", 2)
+ .eq("row1", equipmentRow)
.eq("loc_type1", (short) 1)
.eq("fire_status",0)
);
@@ -55,14 +61,14 @@
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
- LocMast targetLocNo = locMastService.queryFreeLocMast(1,(short)2);
+ LocMast targetLocNo = locMastService.queryFreeLocMast(quietRow,(short)2);
if (Cools.isEmpty(targetLocNo)){
- targetLocNo=locMastService.queryFreeLocMast(2,(short)2);
+ targetLocNo=locMastService.queryFreeLocMast(equipmentRow,(short)2);
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
}else {
- log.error("娌℃湁绌哄簱浣�");
+ log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
}
}else if (testMast.getStatus()!=4) {
log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
--
Gitblit v1.9.1