From 123a17c9d50745ea609f91943adca64e5ed12355 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 12 四月 2025 09:08:14 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   84 +++++-------------------------------------
 1 files changed, 10 insertions(+), 74 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index d465035..24b77db 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,35 +30,9 @@
     @TableField("loc_no")
     private String locNo;
 
-    /**
-     * 搴撲綅绫诲瀷
-     */
-    @ApiModelProperty(value= "搴撲綅绫诲瀷")
-    @TableField("whs_type")
-    private Long whsType;
-
-    @ApiModelProperty(value= "")
-    @TableField("plt_type")
-    private Integer pltType;
-
-    @ApiModelProperty(value= "")
-    @TableField("ctn_type")
-    private Integer ctnType;
-
     @ApiModelProperty(value= "搴撲綅鐘舵��")
     @TableField("loc_sts")
     private String locSts;
-
-    @ApiModelProperty(value= "")
-    @TableField("sheet_no")
-    private String sheetNo;
-
-    /**
-     * 鍫嗗灈鏈哄彿(asr_bas_crnp)
-     */
-    @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
-    @TableField("crn_no")
-    private Integer crnNo;
 
     /**
      * 鎺�
@@ -77,13 +52,6 @@
     @ApiModelProperty(value= "灞�")
     private Integer lev1;
 
-    /**
-     * 婊℃澘
-     */
-    @ApiModelProperty(value= "婊℃澘")
-    @TableField("full_plt")
-    private String fullPlt;
-
     @ApiModelProperty(value= "")
     @TableField("loc_type")
     private String locType;
@@ -101,16 +69,8 @@
     private Short locType3;
 
     @ApiModelProperty(value= "")
-    @TableField("out_enable")
-    private String outEnable;
-
-    @ApiModelProperty(value= "")
     @TableField("io_time")
     private Date ioTime;
-
-    @ApiModelProperty(value= "")
-    @TableField("first_time")
-    private Date firstTime;
 
     /**
      * 淇敼浜哄憳
@@ -148,48 +108,24 @@
     @TableField("error_memo")
     private String errorMemo;
 
-    @ApiModelProperty(value= "")
-    @TableField("ctn_kind")
-    private Integer ctnKind;
-
-    @ApiModelProperty(value= "")
-    @TableField("sc_weight")
-    private Double scWeight;
-
-    @ApiModelProperty(value= "")
-    @TableField("inv_wh")
-    private String invWh;
-
-    @ApiModelProperty(value= "")
-    private String mk;
-
-    @ApiModelProperty(value= "")
-    private String barcode;
-
-    @ApiModelProperty(value= "")
-    @TableField("Pdc_type")
-    private String PdcType;
-
-    @ApiModelProperty(value= "")
-    @TableField("ctn_no")
-    private String ctnNo;
-
     @ApiModelProperty(value= "搴撲綅鐪熷疄浜岀淮鐮�")
     @TableField("qr_code_value")
     private String qrCodeValue;
+
+    public String getLocSts$(){
+        BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
+        BasLocSts basLocSts = service.selectById(this.locSts);
+        if (!Cools.isEmpty(basLocSts)){
+            return String.valueOf(basLocSts.getLocDesc());
+        }
+        return null;
+    }
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
-    }
-
-    public String getFirstTime$(){
-        if (Cools.isEmpty(this.firstTime)){
-            return "";
-        }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
     }
 
     public String getLocType1$() {

--
Gitblit v1.9.1