From 448e5b139e803002547552b989e32c0392d59e4b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 12 七月 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs

---
 src/main/java/com/zy/asrs/entity/WrkDetl.java |   79 ++++++++++++++++++++++-----------------
 1 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 304a28c..37c368d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,19 +1,24 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName("asr_wrk_detl")
 public class WrkDetl implements Serializable {
 
@@ -33,65 +38,59 @@
     @TableField("io_time")
     private Date ioTime;
 
-    /**
-     * 鐗╂枡
-     */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    private String matnr;
+    @ApiModelProperty(value= "浜у搧缂栫爜")
+    @TableId(value = "mat_no")
+    @TableField("mat_no")
+    private String matNo;
 
-    /**
-     * 鐗╂枡鎻忚堪
-     */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
-    private String maktx;
+    @ApiModelProperty(value= "浜у搧鍚嶇О")
+    @TableId(value = "mat_name")
+    @TableField("mat_name")
+    private String matName;
 
-    /**
-     * 浠撳簱鍙�
-     */
     @ApiModelProperty(value= "瑙勬牸")
-    private String lgnum;
+    private String specs;
 
-    /**
-     * 浠撳簱鍙�
-     */
-    @ApiModelProperty(value= "鍨嬪彿")
-    private String type;
+    @ApiModelProperty(value= "灏哄")
+    private String size;
 
-    /**
-     * 鏉＄爜
-     */
-    @ApiModelProperty(value= "鏉＄爜")
+    @ApiModelProperty(value= "棰滆壊")
     private String color;
 
-    /**
-     * 鎵瑰彿
-     */
-    @ApiModelProperty(value= "鎵瑰彿")
-    private String supplier;
+    @ApiModelProperty(value= "鍗曢噸")
+    private Double weight;
 
     /**
      * 鍗曟嵁缂栧彿
      */
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
-    private String warehouse;
+    @TableField("bill_no")
+    private String billNo;
 
     /**
-     * 鍝侀」鏁�
+     * 搴忓彿
      */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value= "搴忓彿")
+    @TableField("seq_no")
+    private Integer seqNo;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
     /**
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
+    private Double qty;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    private String altme;
+    private String unit;
 
     /**
      * 鎵樼洏鏉＄爜
@@ -100,9 +99,9 @@
     private String zpallet;
 
     /**
-     * 瀹㈡埛鍚嶇О
+     * 鐢ㄦ埛ID
      */
-    @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+    @ApiModelProperty(value= "鐢ㄦ埛ID")
     private String bname;
 
     /**
@@ -139,6 +138,16 @@
     @TableField("appe_time")
     private Date appeTime;
 
+    @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableField(exist = false)
+    private String locNo;
+
+    @TableField("Item_batch")
+    private String itemBatch;
+
+    @TableField("order_no")
+    private String orderNo;
+
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
             return "";

--
Gitblit v1.9.1