From 46f8920cdcbff803b8b51a927ad40f33ce060b32 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 20:43:49 +0800
Subject: [PATCH] 出库下发流程按照进仓编号的前后顺序下发；配置一个出库进仓编号出库数量阀值； 当运行中的进仓编号任务WrkSts=25、14、15并且小于该阀值时下发下一个进仓编号的出库任务

---
 src/main/java/com/zy/asrs/entity/Mat.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 8a14362..53bba2a 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -123,7 +124,7 @@
      * sku
      */
     @ApiModelProperty(value= "sku")
-    @ExcelProperty(value = "sku")
+    @ExcelProperty(value = "宸ュ簭")
     private String sku;
 
     /**
@@ -151,7 +152,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -190,7 +191,22 @@
      */
     @ApiModelProperty(value= "闀垮害")
     @ExcelProperty(value = "闀垮害")
-    private Double length;
+    @TableField("man_length")
+    private Double manLength;
+
+    /**
+     * 閲嶉噺
+     */
+    @ApiModelProperty(value= "瀹藉害")
+    @ExcelProperty(value = "瀹藉害")
+    private Double width;
+
+    /**
+     * 閲嶉噺
+     */
+    @ApiModelProperty(value= "楂樺害")
+    @ExcelProperty(value = "楂樺害")
+    private Double height;
 
     /**
      * 浣撶Н
@@ -255,7 +271,7 @@
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
@@ -306,9 +322,27 @@
     @ExcelProperty(value = "澶囨敞")
     private String memo;
 
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓婇檺
+     */
+    @TableField("store_max")
+    private Double storeMax;
+
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓嬮檺
+     */
+    @TableField("store_min")
+    private Double storeMin;
+
+    /**
+     * 搴撻緞棰勮涓婇檺
+     */
+    @TableField("store_max_date")
+    private Integer storeMaxDate;
+
     public Mat() {}
 
-    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,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 length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,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,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.uuid = uuid;
         this.tagId = tagId;
         this.matnr = matnr;
@@ -329,7 +363,7 @@
         this.itemNum = itemNum;
         this.safeQty = safeQty;
         this.weight = weight;
-        this.length = length;
+        this.manLength = manLength;
         this.volume = volume;
         this.threeCode = threeCode;
         this.supp = supp;
@@ -338,7 +372,7 @@
         this.deadTime = deadTime;
         this.deadWarn = deadWarn;
         this.source = source;
-        this.check = check;
+        this.inspect = inspect;
         this.danger = danger;
         this.status = status;
         this.createBy = createBy;
@@ -423,15 +457,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);
         }
     }
 
@@ -491,5 +525,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 
 }

--
Gitblit v1.9.1