From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/java/com/zy/common/model/DetlDto.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..2e71070 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -17,6 +17,8 @@
private String orderNo;
+ private Long orderId;
+
private String matnr;
private String batch = "";
@@ -225,9 +227,9 @@
if (Cools.isEmpty(matnr)) {
return null;
}
- for (DetlDto detlDto : detlDtos) {
+ for (DetlDto detlDto : detlDtos) {//&& standby1.equals(detlDto.getStandby1())
if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
- && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
+ && brand.equals(detlDto.getBrand())
&& standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())
&& boxType1.equals(detlDto.getBoxType1()) && boxType2.equals(detlDto.getBoxType2())
&& boxType3.equals(detlDto.getBoxType3())) {
--
Gitblit v1.9.1