From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index f318964..161f657 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -53,7 +53,10 @@
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍗曢噸")
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String supplier;
+
+ @ApiModelProperty(value= "姣忕閲嶉噺(KG)")
private Double weight;
/**
@@ -138,6 +141,31 @@
@TableField(exist = false)
private String locNo;
+ /**
+ * 鎬绘暟閲�
+ */
+ @ApiModelProperty(value= "鎬绘暟閲�")
+ @TableField("all_qty")
+ private Double allQty;
+
+ /**
+ * 鎬婚噸
+ */
+ @ApiModelProperty(value= "鎬婚噸閲�")
+ @TableField("all_weight")
+ private Double allWeight;
+
+ @ApiModelProperty(value= "鏉ユ簮")
+ @TableField("source")
+ private String source;
+
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @TableField("vendor")
+ private String vendor;
+
+ @ApiModelProperty(value= "姣忕鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
--
Gitblit v1.9.1