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/LocTypeDto.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index e8ac917..f0dff62 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import lombok.Data;
@@ -25,15 +26,20 @@
public LocTypeDto() {
}
- public LocTypeDto(BasDevp basDevp) {
- if (basDevp.getLocType2() == null || basDevp.getLocType2() == 0) {
+ public LocTypeDto(BasDevp basDevp,String barcode) {
+ if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
- if (basDevp.getLocType2() == 1) {
+ if (basDevp.getLocType1() == 1) {
this.locType1 = 1; // 浣庡簱浣�
} else {
this.locType1 = 2; // 楂樺簱浣�
}
+ if (!Cools.isEmpty(barcode)&&barcode.substring(0,1).equals("4")){
+ this.locType2 = 1;
+ }else if (!Cools.isEmpty(barcode)&&barcode.substring(0,1).equals("5")){
+ this.locType2 = 2;
+ }
log.info(JSON.toJSONString(this));
}
--
Gitblit v1.9.1