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/asrs/entity/LocMast.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index ffca642..0e6e9e4 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasLocStsService;
-import com.zy.asrs.service.BasWhsService;
+import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -96,15 +96,29 @@
@TableField("loc_type")
private String locType;
+ /**
+ * 1.浣庡簱浣�
+ * 2.楂樺簱浣�
+ *
+ */
@ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ /**
+ * 1.灏忔墭鐩�
+ * 2.澶ф墭鐩�
+ */
+ @ApiModelProperty(value= "")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ /**
+ * 婊戝潡鍜岃繛鎺ュ櫒搴撳尯鍒�
+ * 1.婊戝潡搴�
+ * 2.閾炬帴鍣ㄥ簱
+ */
+ @ApiModelProperty(value= "")
@TableField("loc_type3")
private Short locType3;
@@ -195,12 +209,15 @@
@TableField("frozen_memo")
private String frozenMemo;
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
+ BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
+ BasWhsType basWhsType = service.selectById(this.whsType);
+ if (!Cools.isEmpty(basWhsType)){
+ return String.valueOf(basWhsType.getWhsDesc());
}
return null;
}
--
Gitblit v1.9.1