From b6681bc12173c1179d0185805ba461211472ac18 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 04 一月 2026 09:31:16 +0800
Subject: [PATCH] 1.完善出库任务呼叫agv 2.完善agv任务下发 3.等等
---
src/main/java/com/zy/common/model/LocTypeDto.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 08c9f1b..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;
@@ -14,7 +15,7 @@
public class LocTypeDto {
// 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
- private Short locType1;
+ private Short locType1=1;
// 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
private Short locType2;
@@ -25,14 +26,19 @@
public LocTypeDto() {
}
- public LocTypeDto(BasDevp basDevp) {
+ public LocTypeDto(BasDevp basDevp,String barcode) {
if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 灏忓簱浣�
+ this.locType1 = 1; // 浣庡簱浣�
} else {
- this.locType1 = 2; // 澶у簱浣�
+ 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