From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |  248 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 206 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 8db6c7c..eff1c85 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -34,21 +34,33 @@
     private Date ioTime;
 
     /**
+     * 鏁伴噺
+     */
+    @ApiModelProperty(value= "鏁伴噺")
+    private Double anfme;
+
+    /**
+     * 璐ф灦鏉$爜
+     */
+    @ApiModelProperty(value= "璐ф灦鏉$爜")
+    private String zpallet;
+
+    /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String maktx;
 
     /**
-     * 鎵瑰彿
+     * 搴忓垪鐮�
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     /**
@@ -58,72 +70,169 @@
     @TableField("order_no")
     private String orderNo;
 
-
     /**
-     * 浠撳簱鍙�
+     * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
-    private String lgnum;
+    private String specs;
 
     /**
-     * 浠撳簱鍙�
+     * 鎵规
      */
-    @ApiModelProperty(value= "鍨嬪彿")
-    private String type;
+    @ApiModelProperty(value= "鎵规")
+    private String model;
 
     /**
-     * 浠撳簱鍙�
+     * 棰滆壊
      */
-    @ApiModelProperty(value= "鏉$爜")
+    @ApiModelProperty(value= "棰滆壊")
     private String color;
 
     /**
-     * 浠撳簱鍙�
+     * 鍝佺墝
      */
-    @ApiModelProperty(value= "鎵瑰彿")
-    private String supplier;
-
-    /**
-     * 浠撳簱鍙�
-     */
-    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
-    private String warehouse;
-
-    /**
-     * 浠撳簱鍙�
-     */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value= "鍝佺墝")
     private String brand;
-
-    /**
-     * 鏁伴噺
-     */
-    @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    private String altme;
+    private String unit;
 
     /**
-     * 鎵樼洏鏉$爜
+     * 鍗曚环
      */
-    @ApiModelProperty(value= "鎵樼洏鏉$爜")
-    private String zpallet;
+    @ApiModelProperty(value= "鍗曚环")
+    private Double price;
 
     /**
-     * 鐢ㄦ埛ID
+     * sku
      */
-    @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
-    private String bname;
+    @ApiModelProperty(value= "sku")
+    private String sku;
 
     /**
-     * 澶囨敞
+     * 鍖呮暟
      */
-    @ApiModelProperty(value= "澶囨敞")
-    private String memo;
+    @ApiModelProperty(value= "鍖呮暟")
+    private Double units;
+
+    /**
+     * 鏉$爜
+     */
+    @ApiModelProperty(value= "鏉$爜")
+    private String barcode;
+
+    /**
+     * 鐗╂枡鐘舵��
+     */
+    @ApiModelProperty(value= "鐗╂枡鐘舵��")
+    private String origin;
+
+    /**
+     * 鍘傚
+     */
+    @ApiModelProperty(value= "鍘傚")
+    private String manu;
+
+    /**
+     * 鍗曟嵁鏃堕棿
+     */
+    @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+    @TableField("manu_date")
+    private String manuDate;
+
+    /**
+     * 鍝侀」鏁�
+     */
+    @ApiModelProperty(value= "鍝侀」鏁�")
+    @TableField("item_num")
+    private String itemNum;
+
+    /**
+     * 瀹夊叏搴撳瓨閲�
+     */
+    @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+    @TableField("safe_qty")
+    private Double safeQty;
+
+    /**
+     * 閲嶉噺
+     */
+    @ApiModelProperty(value= "閲嶉噺")
+    private Double weight;
+
+    /**
+     * 闀垮害
+     */
+    @ApiModelProperty(value= "闀垮害")
+    private Double length;
+
+    /**
+     * 浣撶Н
+     */
+    @ApiModelProperty(value= "浣撶Н")
+    private Double volume;
+
+    /**
+     * 涓夋柟缂栫爜
+     */
+    @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @TableField("three_code")
+    private String threeCode;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟�")
+    private String supp;
+
+    /**
+     * 渚涘簲鍟嗙紪鐮�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @TableField("supp_code")
+    private String suppCode;
+
+    /**
+     * 鏄惁鎵规 1: 鏄�  0: 鍚�
+     */
+    @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @TableField("be_batch")
+    private Integer beBatch;
+
+    /**
+     * 淇濊川鏈�
+     */
+    @ApiModelProperty(value= "淇濊川鏈�")
+    @TableField("dead_time")
+    private String deadTime;
+
+    /**
+     * 棰勮澶╂暟
+     */
+    @ApiModelProperty(value= "棰勮澶╂暟")
+    @TableField("dead_warn")
+    private Integer deadWarn;
+
+    /**
+     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗
+     */
+    @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    private Integer source;
+
+    /**
+     * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
+     */
+    @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    private Integer inspect;
+
+    /**
+     * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
+     */
+    @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    private Integer danger;
 
     /**
      * 淇敼浜哄憳
@@ -153,6 +262,11 @@
     @TableField("appe_time")
     private Date appeTime;
 
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -161,6 +275,56 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
+    public String getBeBatch$(){
+        if (null == this.beBatch){ return null; }
+        switch (this.beBatch){
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.beBatch);
+        }
+    }
+
+    public String getSource$(){
+        if (null == this.source){ return null; }
+        switch (this.source){
+            case 1:
+                return "鍒堕��";
+            case 2:
+                return "閲囪喘";
+            case 3:
+                return "澶栧崗";
+            default:
+                return String.valueOf(this.source);
+        }
+    }
+
+    public String getInspect$(){
+        if (null == this.inspect){ return null; }
+        switch (this.inspect){
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.inspect);
+        }
+    }
+
+    public String getDanger$(){
+        if (null == this.danger){ return null; }
+        switch (this.danger){
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.danger);
+        }
+    }
+
     public String getModiUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);

--
Gitblit v1.9.1