From d2b000d74d23f5c70e9f1414b57cab892c2b6eec Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 28 三月 2025 15:07:34 +0800
Subject: [PATCH] #输送线暂存数优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/BasDevpService.java | 3 +++
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 7 +++++++
src/main/resources/application.yml | 4 ++--
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 8628feb..b83d2e1 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -44,4 +44,7 @@
*/
BasDevp checkSiteStatus(Integer devpNo, boolean put);
+ int getStoreCount();
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..67b1ca8 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -1,8 +1,10 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
@@ -64,4 +66,9 @@
}
return station;
}
+
+ @Override
+ public int getStoreCount() {
+ return baseMapper.selectCount(new EntityWrapper<BasDevp>().in("loading","Y"));
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 44573ea..037ce7a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -998,9 +998,9 @@
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
break;
}
- int storeCount = taskWrkService.getStoreCount(taskWrk.getCrnNo());
+ int storeCount = basDevpService.getStoreCount();
if(storeCount >= maxCount){
- log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", taskWrk.getCrnNo());
+ log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄�");
break;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 2f155a8..5b20240 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -231,7 +231,7 @@
@Override
public int getStoreCount(Integer crnNo){
- return selectCount(new EntityWrapper<TaskWrk>().eq("crn_no", crnNo).in("wrk_sts",12,14,2));
+ return selectCount(new EntityWrapper<TaskWrk>().eq("crn_no", crnNo).in("wrk_sts",12,2));
}
@Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b72601d..de218f1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -44,8 +44,8 @@
publicKeysStorePath: publicCerts.keystore
wms:
- #鍫嗗灈鏈轰换鍔℃殏瀛樻暟
- count: 5
+ #杈撻�佺嚎鏆傚瓨鏁�
+ count: 8
# 鏄惁寮�鍚笂鎶�
start: true
# WMS绯荤粺ip
--
Gitblit v1.9.1