From e62569856fdfb0c7c31ee88cf96628af08eabf85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 12:34:15 +0800
Subject: [PATCH] 标准wms2.0

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index a0a5065..9d064bd 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
@@ -12,12 +13,12 @@
 import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.LocOwnerService;
-import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -31,42 +32,49 @@
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
-    private Long id;
-
+    @TableId(value = "loc_id", type = IdType.AUTO)
     @TableField("loc_id")
     private Long locId;
+
 
     @ApiModelProperty(value = "搴撲綅鍙�")
     @TableField("loc_no")
     private String locNo;
 
     @ApiModelProperty("area_id")
+    @TableField
     private Long areaId;
 
     @ApiModelProperty("area_name")
+    @TableField
     private String areaName;
 
     @ApiModelProperty(value = "鎵樼洏鏉＄爜")
+    @TableField
     private String zpallet;
 
     @ApiModelProperty(value = "鏁伴噺")
+    @TableField
     @ExcelProperty("鏁伴噺")
     private Double anfme;
 
     @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+    @TableField
     @ExcelProperty("鍟嗗搧缂栧彿")
     private String matnr;
 
     @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+    @TableField
     @ExcelProperty("鍟嗗搧鍚嶇О")
     private String maktx;
 
     @ApiModelProperty(value = "瑙勬牸")
+    @TableField
     @ExcelProperty("瑙勬牸")
     private String specs;
 
     @ApiModelProperty(value = "璐у搧鐗瑰緛")
+    @TableField
     @ExcelProperty("璐у搧鐗瑰緛")
     private String batch;
 
@@ -76,33 +84,43 @@
     private String orderNo;
 
     @ApiModelProperty(value = "鍨嬪彿")
+    @TableField
     private String model;
 
     @ApiModelProperty(value = "棰滆壊")
+    @TableField
     private String color;
 
     @ApiModelProperty(value = "鍝佺墝")
+    @TableField
     private String brand;
 
     @ApiModelProperty(value = "鍗曚綅")
+    @TableField
     private String unit;
 
     @ApiModelProperty(value = "鍗曚环")
+    @TableField
     private Double price;
 
     @ApiModelProperty(value = "sku")
+    @TableField
     private String sku;
 
     @ApiModelProperty(value = "鍗曚綅閲�")
+    @TableField
     private Double units;
 
     @ApiModelProperty(value = "鏉＄爜")
+    @TableField
     private String barcode;
 
     @ApiModelProperty(value = "浜у湴")
+    @TableField
     private String origin;
 
     @ApiModelProperty(value = "鍘傚")
+    @TableField
     private String manu;
 
     @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@@ -118,12 +136,15 @@
     private Double safeQty;
 
     @ApiModelProperty(value = "閲嶉噺")
+    @TableField
     private Double weight;
 
     @ApiModelProperty(value = "闀垮害")
-    private Double man_length;
+    @TableField(value = "man_length")
+    private Double manLength;
 
     @ApiModelProperty(value = "浣撶Н")
+    @TableField
     private Double volume;
 
     @ApiModelProperty(value = "涓夋柟缂栫爜")
@@ -131,6 +152,7 @@
     private String threeCode;
 
     @ApiModelProperty(value = "渚涘簲鍟�")
+    @TableField
     private String supp;
 
     @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@@ -150,12 +172,15 @@
     private Integer deadWarn;
 
     @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    @TableField
     private Integer source;
 
     @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    @TableField
     private Integer inspect;
 
     @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    @TableField
     private Integer danger;
 
     @ApiModelProperty(value = "淇敼浜哄憳")
@@ -175,30 +200,35 @@
     private Date appeTime;
 
     @ApiModelProperty(value = "澶囨敞")
+    @TableField
     private String memo;
 
     /**
      * 鎷ユ湁鑰�
      */
     @ApiModelProperty(value = "鎷ユ湁鑰� 1: 鏉板厠   ")
+    @TableField
     private Integer owner;
 
     /**
      * 澶囩敤1
      */
     @ApiModelProperty(value = "澶囩敤1")
+    @TableField
     private String standby1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value = "澶囩敤2")
+    @TableField
     private String standby2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value = "澶囩敤3")
+    @TableField
     private String standby3 = "";
 
     /**
@@ -206,26 +236,27 @@
      */
     @ApiModelProperty(value = "澶囩敤1")
     @TableField("box_type1")
-    private String boxType1 = "1";
+    private String boxType1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value = "澶囩敤2")
     @TableField("box_type2")
-    private String boxType2 = "1";
+    private String boxType2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value = "澶囩敤3")
     @TableField("box_type3")
-    private String boxType3 = "1";
+    private String boxType3 = "";
 
     /**
      * 鏄惁鍐荤粨
      */
     @ApiModelProperty(value = "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+    @TableField
     private Integer frozen;
 
     public String getLocNo$() {
@@ -347,7 +378,7 @@
     }
 
     public void sync(Object source) {
-        Synchro.Copy(source, this);
+        BeanUtils.copyProperties(source, this);
     }
 
     public String getFrozen$() {

--
Gitblit v1.9.1