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 | 12 ++++++++++--
1 files changed, 10 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 7b5c23f..aec9f69 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -229,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) {
@@ -249,7 +250,7 @@
}
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupLoc("0703409")));
+ System.out.println(JSON.toJSONString(getGroupLoc("1305908")));
}
/**
@@ -386,7 +387,7 @@
}
public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
- if(Cools.isEmpty(condition)){
+ if(Cools.isEmpty(condition) || "null".equals(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
@@ -399,4 +400,11 @@
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