From 7509e168c020fd6617f803a1a7b6771cf0d9de4a Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 21 五月 2024 10:06:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 1b64e5e..f2d4d60 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -46,9 +46,13 @@
@Autowired
private WorkService workService;
- public ReturnT<String> start(Integer staNo) {
+ public ReturnT<String> start(Integer staNo,Integer count) {
try {
- if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
+// if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
+// return null;
+// }
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo));
+ if (wrkCount>count){
return null;
}
// 鑾峰彇宸ヤ綔鍙�
@@ -64,6 +68,7 @@
crns.add(4);
crns.add(5);
crns.add(6);
+ crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
@@ -145,18 +150,23 @@
return SUCCESS;
}
- public ReturnT<String> startYx(Integer staNo) {
+ public ReturnT<String> startYx(Integer staNo,Integer count) {
try {
// if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
// return null;
// }
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo));
- if (wrkCount>10){
+ if (wrkCount>count){
return null;
}
ArrayList<Integer> crns =new ArrayList<>();
crns.add(1);
crns.add(2);
+ crns.add(3);
+ crns.add(4);
+ crns.add(5);
+ crns.add(6);
+ crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
List<String> locNoList = new ArrayList<>();
@@ -191,7 +201,7 @@
}
if (sign) {
EmptyPlateOutParam param = new EmptyPlateOutParam();
- param.setOutSite(172);
+ param.setOutSite(staNo);
param.setLocNos(locNoList);
try{
workService.emptyPlateOut(param, 9999L);
--
Gitblit v1.9.1