From f20987a557aad10cb54eb064efc27780c70aa2c9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 11 十一月 2023 17:09:07 +0800
Subject: [PATCH] # 显示器
---
src/main/java/com/zy/asrs/utils/Utils.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1966c36..2ef4f98 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -20,6 +21,7 @@
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.ShuttleDispatchUtils;
+import com.zy.core.DevpThread;
import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -32,15 +34,13 @@
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.model.protocol.ShuttleProtocol;
+import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.NyShuttleThread;
import com.zy.core.thread.ShuttleThread;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/8/27
@@ -547,4 +547,59 @@
return null;
}
+ //閫氳繃鎻愬崌鏈哄彿鍜屾ゼ灞傝幏鍙栧嚭鍏ュ簱妯″紡
+ public static Integer getOutInModelByLift(Integer liftNo, Integer lev) {
+ ArrayList<Integer> lev1 = new ArrayList<Integer>() {{
+ add(100);add(103);
+ add(105);
+ }};
+ ArrayList<Integer> lev2 = new ArrayList<Integer>() {{
+ add(200);add(203);
+ add(205);
+ }};
+ ArrayList<Integer> lev3 = new ArrayList<Integer>() {{
+ add(341);add(346);
+ }};
+
+ Integer staNo = null;
+ if (lev <= 4) {
+ staNo = lev1.get(liftNo - 1);
+ } else if (lev >= 5 && lev <= 7) {
+ staNo = lev2.get(liftNo - 1);
+ } else if ((lev >=8 && lev <= 10) && liftNo != 1) {
+ staNo = lev3.get(liftNo - 2);
+ }
+
+ if (staNo != null) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) {
+ return null;
+ }
+
+ if (staNo == 100 || staNo == 200) {//1鍙锋彁鍗囨満100绔欏拰200绔欓粯璁ゅ叏鏄嚭搴撴ā寮�
+ return 2;//鍑哄簱妯″紡
+ }
+
+ if (staNo == 341) {
+ return 1;//341绔欓粯璁ゅ彧鑳藉叆搴撴ā寮�
+ }
+
+ if (staProtocol.getOutInModel() == null) {
+ return null;//娌℃湁鍑哄叆搴撲俊鍙�
+ }
+
+ return staProtocol.getOutInModel().intValue();
+ }
+ return null;
+ }
+
+ public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
+ if(Cools.isEmpty(condition) || "null".equals(condition)){
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ }else {
+ wrapper.eq(column,condition);
+ }
+ }
+
}
--
Gitblit v1.9.1