From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量
---
src/main/java/com/zy/asrs/entity/LocMast.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..471d978 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -14,6 +14,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -80,6 +81,12 @@
private Integer lev1;
/**
+ * 缁�
+ */
+ @ApiModelProperty(value= "缁�")
+ private Integer gro1;
+
+ /**
* 婊℃澘
*/
@ApiModelProperty(value= "婊℃澘")
@@ -90,7 +97,7 @@
@TableField("loc_type")
private String locType;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:绌烘墭鐩樺厹搴曞簱浣峿")
@TableField("loc_type1")
private Short locType1;
@@ -156,7 +163,7 @@
@ApiModelProperty(value= "")
@TableField("sc_weight")
- private Double scWeight;
+ private BigDecimal scWeight;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -172,9 +179,22 @@
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1.鏁ｈ揣 2.鏁存澘 3.绌烘墭鐩� ")
@TableField("ctn_no")
private String ctnNo;
+
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ private Integer frozen;
+
+ /**
+ * 鍐荤粨澶囨敞
+ */
+ @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @TableField("frozen_memo")
+ private String frozenMemo;
public String getWhsType$(){
@@ -290,4 +310,16 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return "鏈喕缁�"; }
+ switch (this.frozen){
+ case 0:
+ return "鏈喕缁�";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "鏈喕缁�";
+ }
+ }
+
}
--
Gitblit v1.9.1