From f14bb52ddab40bf589304b6b43331ddaccea69f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 27 十二月 2025 16:03:36 +0800
Subject: [PATCH] 1.完善AGV任务创建和下发 2.完善数据孪生 3.新增拍照获取照片 4.新增PDA配盘出库单立即出库 5.新增PDA配盘入库单下拉框获取订单号
---
src/main/java/com/zy/common/model/LocTypeDto.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c6630aa..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,7 +26,7 @@
public LocTypeDto() {
}
- public LocTypeDto(BasDevp basDevp) {
+ public LocTypeDto(BasDevp basDevp,String barcode) {
if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
@@ -34,6 +35,11 @@
} 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