From bc20e7dc43b97367b7b70b678e71140a33846ff0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:36:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   64 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index fe18307..3f8c1f9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -34,10 +34,16 @@
     private Date ioTime;
 
     /**
-     * 鏁伴噺
+     * 浣滀笟鏁伴噺
      */
-    @ApiModelProperty(value= "鏁伴噺")
+    @ApiModelProperty(value= "浣滀笟鏁伴噺")
     private Double anfme;
+
+    /**
+     * 鎬诲簱瀛�
+     */
+    @ApiModelProperty(value= "鎬诲簱瀛�")
+    private Double stock;
 
     /**
      * 鎵樼洏鏉＄爜
@@ -48,19 +54,19 @@
     /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String maktx;
 
     /**
-     * 鎵瑰彿
+     * 搴忓垪鐮�
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     /**
@@ -77,9 +83,9 @@
     private String specs;
 
     /**
-     * 鍨嬪彿
+     * 鎵规
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鎵规")
     private String model;
 
     /**
@@ -113,9 +119,9 @@
     private String sku;
 
     /**
-     * 鍗曚綅閲�
+     * 鍖呮暟
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value= "鍖呮暟")
     private Double units;
 
     /**
@@ -125,9 +131,9 @@
     private String barcode;
 
     /**
-     * 浜у湴
+     * 鐗╂枡鐘舵��
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "鐗╂枡鐘舵��")
     private String origin;
 
     /**
@@ -137,9 +143,9 @@
     private String manu;
 
     /**
-     * 鐢熶骇鏃ユ湡
+     * 鍗曟嵁鏃堕棿
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
     @TableField("manu_date")
     private String manuDate;
 
@@ -226,7 +232,7 @@
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
@@ -268,6 +274,26 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @TableField("proddate")
+    private Date proddate;
+    @ApiModelProperty(value= "鍒版湡鏃ユ湡")
+    @TableField("deadline")
+    private Date deadline;
+    public String getProddate$(){
+        if (Cools.isEmpty(this.proddate)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.proddate);
+    }
+    public String getDeadline$(){
+        if (Cools.isEmpty(this.deadline)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.deadline);
+    }
+
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
             return "";
@@ -301,15 +327,15 @@
         }
     }
 
-    public String getCheck$(){
-        if (null == this.check){ return null; }
-        switch (this.check){
+    public String getInspect$(){
+        if (null == this.inspect){ return null; }
+        switch (this.inspect){
             case 1:
                 return "鏄�";
             case 0:
                 return "鍚�";
             default:
-                return String.valueOf(this.check);
+                return String.valueOf(this.inspect);
         }
     }
 

--
Gitblit v1.9.1