From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/utils/Utils.java | 155 ++++++++++++++++-----------------------------------
1 files changed, 48 insertions(+), 107 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4557c58..49274c9 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,6 +1,7 @@
package com.zy.asrs.utils;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.zy.common.properties.SlaveProperties;
@@ -8,7 +9,6 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -181,17 +181,6 @@
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
- public static Integer getOutLayerRow(String locNo, Boolean pakin){
- int row = getRow(locNo);
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 4;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 5;
- } else {
- return -1;
- }
- }
-
/**
* 鑾峰彇搴撲綅缁�
* @param locNo 搴撲綅鍙�
@@ -218,6 +207,7 @@
for (Integer row0 : CommonService.THIRD_GROUP_ROW_LIST) {
result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
}
+ Collections.reverse(result);
return result;
}
if (CommonService.FOURTH_GROUP_ROW_LIST.contains(row)) {
@@ -239,6 +229,7 @@
for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
}
+ Collections.reverse(result);
return result;
}
if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {
@@ -259,7 +250,7 @@
}
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupInnerLoc("1605909")));
+ System.out.println(JSON.toJSONString(getGroupLoc("1305908")));
}
/**
@@ -360,103 +351,53 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜
- public static List<String> getGroupOuterLocIoPri(String locNo){
-// int row = getRow(locNo);
-// List<String> result = new ArrayList<>();
-// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
-// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
-// for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.THIRD_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.THIRD_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// }
-// return result;
+ //閫氳繃杈撻�佺珯鐐瑰彿鑾峰彇鎻愬崌鏈哄彿
+ public static Integer stnNoToLiftNo(Integer stnNo) {
+ //涓�鍙锋彁鍗囨満
+ ArrayList<Integer> one = new ArrayList<Integer>(){{
+ add(100);add(101);
+ add(200);add(201);
+ add(300);add(301);
+ }};
+
+ //浜屽彿鎻愬崌鏈�
+ ArrayList<Integer> two = new ArrayList<Integer>(){{
+ add(102);add(103);
+ add(202);add(203);
+ add(340);add(341);
+ }};
+
+ //涓夊彿鎻愬崌鏈�
+ ArrayList<Integer> three = new ArrayList<Integer>(){{
+ add(104);add(105);
+ add(204);add(205);
+ add(345);add(346);
+ }};
+
+ if (one.contains(stnNo)) {
+ return 1;
+ } else if (two.contains(stnNo)) {
+ return 2;
+ } else if (three.contains(stnNo)) {
+ return 3;
+ }
+
+
return null;
}
- // 鍐呬晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupInsideLoc(String locNo){
-// int row = getRow(locNo);
-// List<String> result = new ArrayList<>();
-// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
-// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
-// for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else {
-//// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
-// }
-// if (!Cools.isEmpty(result)) {
-// Collections.reverse(result);
-// }
-// return result;
- return null;
+ public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
+ if(Cools.isEmpty(condition)){
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ }else {
+ wrapper.eq(column,condition);
+ }
+ }
+
+ public static void confirmOnlyMat(Wrapper wrapper, String matnr, String csocode, String isoseq){
+ wapperSetCondition(wrapper,"matnr",matnr);
+ wapperSetCondition(wrapper,"csocode",csocode);
+ wapperSetCondition(wrapper,"isoseq",isoseq);
}
}
--
Gitblit v1.9.1