From 57c109f4c962659e7a8f17ef4cd6b00a551e30ad Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 31 三月 2025 15:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs-sxkVersion' into lfdasrs-sxkVersion
---
src/main/java/com/zy/asrs/entity/LocMast.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..6b46397 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -26,8 +26,8 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
+ @ApiModelProperty(value= "搴撲綅鍙�") //鍙傛暟绫诲瀷涓篠tring锛屼綔鐢ㄤ负姝ゅ睘鎬х殑绠�瑕佹弿杩般��
+ @TableId(value = "loc_no", type = IdType.INPUT) // @TableId 娉ㄨВ鐨勭敤娉曪紝璇ユ敞瑙ｇ敤浜庡皢鏌愪釜鎴愬憳鍙橀噺鎸囧畾涓烘暟鎹〃涓婚敭
@TableField("loc_no")
private String locNo;
@@ -165,7 +165,7 @@
@ApiModelProperty(value= "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏉＄爜鍙�")
private String barcode;
@ApiModelProperty(value= "")
@@ -176,6 +176,18 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty(value= "缁�")
+ @TableField("group1")
+ private Integer group1;
+
+ /**
+ * 娣辨祬搴撲綅鎺掑彿
+ * 1.鏈�娣卞簱浣�
+ * 浠庡皬鍒板ぇ锛岃秺澶х殑搴撲綅瓒婃祬
+ */
+ @ApiModelProperty(value= "搴撲綅灞炴��")
+ @TableField("loc_attribute")
+ private Integer locAttribute;
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
--
Gitblit v1.9.1