From 792ac2d480d61cf3922c16455b91393e41177182 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 27 十一月 2025 11:21:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 4 ++++
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
index 723d87c..39ecb52 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -47,6 +47,10 @@
id = basArmMast.getMatnr();
length = orderDetlValueResultUtil.getLength();
width = orderDetlValueResultUtil.getWidth();
+ if (length<width){
+ width = orderDetlValueResultUtil.getLength();
+ length = orderDetlValueResultUtil.getWidth();
+ }
weight = orderDetlValueResultUtil.getWeight();
height = orderDetlValueResultUtil.getHeight();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 342a9b7..6e65d8a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2871,7 +2871,7 @@
for (Integer site:list){
Integer emptyCount = wrkMastMapper.countPakOutEmpty(site);
StaProtocol staProtocol = null;
- if(emptyCount >= 1 && site == 1108){
+ if(emptyCount >= 2 && site == 1108){
continue;
}else if(emptyCount == 1 && site == 2031){
continue;
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index d7a24fb..602fe59 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -107,6 +107,7 @@
private void reset() {
commandList = null;
stringBuffer.delete(0, stringBuffer.length());
+ this.errorMsg.delete(0, errorMsg.length());
}
--
Gitblit v1.9.1