From 4a2703db125e67a4a9590b55a2b7fa857e87ef45 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 18 八月 2025 14:16:48 +0800
Subject: [PATCH] 合并出库添加日志

---
 src/main/java/com/zy/asrs/entity/WrkDetl.java |   48 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 39ea4d5..764d53b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -35,10 +35,16 @@
     private Date ioTime;
 
     /**
-     * 鏁伴噺
+     * 浣滀笟鏁伴噺
      */
-    @ApiModelProperty(value= "鏁伴噺")
+    @ApiModelProperty(value= "浣滀笟鏁伴噺")
     private Double anfme;
+
+    /**
+     * 鎬诲簱瀛�
+     */
+    @ApiModelProperty(value= "鎬诲簱瀛�")
+    private Double stock;
 
     /**
      * 鎵樼洏鏉＄爜
@@ -49,13 +55,13 @@
     /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String maktx;
 
     /**
@@ -78,9 +84,9 @@
     private String specs;
 
     /**
-     * 鍨嬪彿
+     * 鎵规
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鎵规")
     private String model;
 
     /**
@@ -114,9 +120,9 @@
     private String sku;
 
     /**
-     * 鍗曚綅閲�
+     * 鍖呮暟
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value= "鍖呮暟")
     private Double units;
 
     /**
@@ -126,9 +132,9 @@
     private String barcode;
 
     /**
-     * 浜у湴
+     * 鐗╂枡鐘舵��
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "鐗╂枡鐘舵��")
     private String origin;
 
     /**
@@ -138,9 +144,9 @@
     private String manu;
 
     /**
-     * 鐢熶骇鏃ユ湡
+     * 鍗曟嵁鏃堕棿
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
     @TableField("manu_date")
     private String manuDate;
 
@@ -269,6 +275,24 @@
     @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 "";

--
Gitblit v1.9.1