From 38a5f5195220132da2797116bbb3dbebb312c63b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 25 十月 2023 08:38:25 +0800
Subject: [PATCH] agv输送线入库

---
 src/main/java/com/zy/asrs/utils/Utils.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 7ef96f8..aec9f69 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;
 
@@ -207,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)) {
@@ -228,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) {
@@ -248,7 +250,7 @@
     }
 
     public static void main(String[] args) {
-        System.out.println(JSON.toJSONString(getGroupLoc("0703409")));
+        System.out.println(JSON.toJSONString(getGroupLoc("1305908")));
     }
 
     /**
@@ -349,4 +351,60 @@
         throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
     }
 
+    //閫氳繃杈撻�佺珯鐐瑰彿鑾峰彇鎻愬崌鏈哄彿
+    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 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);
+        }
+    }
+
+    public static void confirmOnlyMat(Wrapper wrapper, String matnr, String csocode, String isoseq){
+        wapperSetCondition(wrapper,"matnr",matnr);
+        wapperSetCondition(wrapper,"csocode",csocode);
+        wapperSetCondition(wrapper,"isoseq",isoseq);
+    }
+
+    public static void confirmOnlyMat(Wrapper wrapper, String matnr, String batch, String threeCode, String deadTime){
+        wapperSetCondition(wrapper,"matnr",matnr);
+        wapperSetCondition(wrapper,"three_code",threeCode);
+        wapperSetCondition(wrapper,"dead_time",deadTime);
+        wapperSetCondition(wrapper,"batch",batch);
+    }
+
 }

--
Gitblit v1.9.1