From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0

---
 src/main/java/com/zy/asrs/entity/TaskDetl.java |  187 +++++++++++++++++++++++-----------------------
 1 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/TaskDetl.java b/src/main/java/com/zy/asrs/entity/TaskDetl.java
index 2467477..4377775 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetl.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetl.java
@@ -1,27 +1,19 @@
 package com.zy.asrs.entity;
 
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
 import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
 import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Data
 @Accessors(chain = true)
@@ -35,284 +27,285 @@
     /**
      * 宸ヤ綔鍙�
      */
-    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @ApiModelProperty(value = "宸ヤ綔鍙�")
     @TableField("wrk_no")
     private Integer wrkNo;
 
     /**
      * 宸ヤ綔鏃堕棿
      */
-    @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+    @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
     @TableField("io_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ioTime;
 
     /**
      * 鏁伴噺
      */
-    @ApiModelProperty(value= "鏁伴噺")
+    @ApiModelProperty(value = "鏁伴噺")
     private Double anfme;
 
     /**
      * 鎵樼洏鏉＄爜
      */
-    @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+    @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;
 
     /**
      * 鍗曟嵁缂栧彿
      */
-    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    @ApiModelProperty(value = "鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
     /**
      * 瑙勬牸
      */
-    @ApiModelProperty(value= "瑙勬牸")
+    @ApiModelProperty(value = "瑙勬牸")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
      * 棰滆壊
      */
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value = "棰滆壊")
     private String color;
 
     /**
      * 鍝佺墝
      */
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
      * 鍗曚綅
      */
-    @ApiModelProperty(value= "鍗曚綅")
+    @ApiModelProperty(value = "鍗曚綅")
     private String unit;
 
     /**
      * 鍗曚环
      */
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value = "鍗曚环")
     private Double price;
 
     /**
      * sku
      */
-    @ApiModelProperty(value= "sku")
+    @ApiModelProperty(value = "sku")
     private String sku;
 
     /**
      * 鍗曚綅閲�
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value = "鍗曚綅閲�")
     private Double units;
 
     /**
      * 鏉＄爜
      */
-    @ApiModelProperty(value= "鏉＄爜")
+    @ApiModelProperty(value = "鏉＄爜")
     private String barcode;
 
     /**
      * 浜у湴
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value = "浜у湴")
     private String origin;
 
     /**
      * 鍘傚
      */
-    @ApiModelProperty(value= "鍘傚")
+    @ApiModelProperty(value = "鍘傚")
     private String manu;
 
     /**
      * 鐢熶骇鏃ユ湡
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
 
     /**
      * 鍝侀」鏁�
      */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
     /**
      * 瀹夊叏搴撳瓨閲�
      */
-    @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+    @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
     @TableField("safe_qty")
     private Double safeQty;
 
     /**
      * 閲嶉噺
      */
-    @ApiModelProperty(value= "閲嶉噺")
+    @ApiModelProperty(value = "閲嶉噺")
     private Double weight;
 
     /**
      * 闀垮害
      */
-    @ApiModelProperty(value= "闀垮害")
+    @ApiModelProperty(value = "闀垮害")
     @TableField("man_length")
     private Double manLength;
 
     /**
      * 浣撶Н
      */
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
-    @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @ApiModelProperty(value = "涓夋柟缂栫爜")
     @TableField("three_code")
     private String threeCode;
 
     /**
      * 渚涘簲鍟�
      */
-    @ApiModelProperty(value= "渚涘簲鍟�")
+    @ApiModelProperty(value = "渚涘簲鍟�")
     private String supp;
 
     /**
      * 渚涘簲鍟嗙紪鐮�
      */
-    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
     @TableField("supp_code")
     private String suppCode;
 
     /**
-     * 鏄惁鎵规 1: 鏄�  0: 鍚�  
+     * 鏄惁鎵规 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     @TableField("be_batch")
     private Integer beBatch;
 
     /**
      * 淇濊川鏈�
      */
-    @ApiModelProperty(value= "淇濊川鏈�")
+    @ApiModelProperty(value = "淇濊川鏈�")
     @TableField("dead_time")
     private String deadTime;
 
     /**
      * 棰勮澶╂暟
      */
-    @ApiModelProperty(value= "棰勮澶╂暟")
+    @ApiModelProperty(value = "棰勮澶╂暟")
     @TableField("dead_warn")
     private Integer deadWarn;
 
     /**
-     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  
+     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗
      */
-    @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
     private Integer source;
 
     /**
-     * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  
+     * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
     private Integer inspect;
 
     /**
-     * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�  
+     * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("modi_user")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("modi_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modiTime;
 
     /**
      * 娣诲姞浜哄憳
      */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @ApiModelProperty(value = "娣诲姞浜哄憳")
     @TableField("appe_user")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("appe_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date appeTime;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("line_number")
     private Long lineNumber;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby1;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     private String standby3;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type1")
     private String boxType1;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type2")
     private String boxType2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value = "")
     @TableField("box_type3")
     private String boxType3;
 
-    public TaskDetl() {}
+    public TaskDetl() {
+    }
 
-    public TaskDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+    public TaskDetl(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         this.wrkNo = wrkNo;
         this.ioTime = ioTime;
         this.anfme = anfme;
@@ -410,16 +403,18 @@
 //            null    // 
 //    );
 
-    public String getIoTime$(){
-        if (Cools.isEmpty(this.ioTime)){
+    public String getIoTime$() {
+        if (Cools.isEmpty(this.ioTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
-    public String getBeBatch$(){
-        if (null == this.beBatch){ return null; }
-        switch (this.beBatch){
+    public String getBeBatch$() {
+        if (null == this.beBatch) {
+            return null;
+        }
+        switch (this.beBatch) {
             case 1:
                 return "鏄�";
             case 0:
@@ -429,9 +424,11 @@
         }
     }
 
-    public String getSource$(){
-        if (null == this.source){ return null; }
-        switch (this.source){
+    public String getSource$() {
+        if (null == this.source) {
+            return null;
+        }
+        switch (this.source) {
             case 1:
                 return "鍒堕��";
             case 2:
@@ -443,9 +440,11 @@
         }
     }
 
-    public String getInspect$(){
-        if (null == this.inspect){ return null; }
-        switch (this.inspect){
+    public String getInspect$() {
+        if (null == this.inspect) {
+            return null;
+        }
+        switch (this.inspect) {
             case 1:
                 return "鏄�";
             case 0:
@@ -455,9 +454,11 @@
         }
     }
 
-    public String getDanger$(){
-        if (null == this.danger){ return null; }
-        switch (this.danger){
+    public String getDanger$() {
+        if (null == this.danger) {
+            return null;
+        }
+        switch (this.danger) {
             case 1:
                 return "鏄�";
             case 0:
@@ -467,33 +468,33 @@
         }
     }
 
-    public String getModiUser$(){
+    public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
-    public String getAppeUser$(){
+    public String getAppeUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getNickname());
         }
         return null;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);

--
Gitblit v1.9.1