From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 94 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 26d40f8..fef6b03 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,21 +27,27 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鐗╂枡")
- @TableId(value = "matnr", type = IdType.INPUT)
- private String matnr;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no", type = IdType.INPUT)
+ @TableField("mat_no")
+ private String matNo;
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "mat_name")
+ @TableField("mat_name")
+ private String matName;
@ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
+ private String specs;
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
- private String type;
+ @ApiModelProperty(value= "灏哄")
+ private String size;
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
@ApiModelProperty(value= "渚涘簲鍟�")
private String supplier;
@@ -53,10 +59,10 @@
private String brand;
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Double qty;
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
@@ -82,6 +88,65 @@
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
+
+ /**
+ * 鎬绘暟閲�
+ */
+ @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;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -124,5 +189,4 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
--
Gitblit v1.9.1