From 559b2321be06967f32eb40ba434790b735d7fa33 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 16:53:55 +0800
Subject: [PATCH] 出库时，检测到选择的站点没有空的暂存位，则等成等待任务，等待任务的出库站点暂时不分配。 新增定时处理等待任务

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index fc0fd35..2d20f94 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.OrderService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,21 +62,21 @@
     private Double qty;
 
     /**
-     * 鍟嗗搧缂栫爜
+     * 鐗╂枡鍙�
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String matnr;
 
     /**
-     * 鍟嗗搧鍚嶇О
+     * 鐗╂枡鍙�
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String maktx;
 
     /**
-     * 鎵瑰彿
+     * 搴忓垪鐮�
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     /**
@@ -85,9 +86,9 @@
     private String specs;
 
     /**
-     * 鍨嬪彿
+     * 鎵规
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鎵规")
     private String model;
 
     /**
@@ -121,9 +122,9 @@
     private String sku;
 
     /**
-     * 鍗曚綅閲�
+     * 鍖呮暟
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value= "鍖呮暟")
     private Double units;
 
     /**
@@ -133,9 +134,9 @@
     private String barcode;
 
     /**
-     * 浜у湴
+     * 鐗╂枡鐘舵��
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "鐗╂枡鐘舵��")
     private String origin;
 
     /**
@@ -145,9 +146,9 @@
     private String manu;
 
     /**
-     * 鐢熶骇鏃ユ湡
+     * 鍗曟嵁鏃堕棿
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
     @TableField("manu_date")
     private String manuDate;
 
@@ -234,7 +235,7 @@
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
@@ -286,7 +287,7 @@
 
     public OrderDetl() {}
 
-    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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 OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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 inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.orderId = orderId;
         this.orderNo = orderNo;
         this.anfme = anfme;
@@ -318,7 +319,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;
@@ -363,15 +364,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);
         }
     }
 
@@ -432,10 +433,19 @@
     }
 
     public Double getEnableQty() {
+        Double enableQty = null;
         if (null != this.anfme && this.qty != null) {
-            return this.anfme - this.qty;
+            enableQty = this.anfme - this.qty;
+            if (enableQty < 0) {
+                enableQty = 0.0D;
+            }
+//            return this.anfme - this.qty;
         }
-        return null;
+        return enableQty;
+    }
+
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
     }
 
 }

--
Gitblit v1.9.1