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/WrkDetlLog.java | 116 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0f663b5..351bdc1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -1,6 +1,7 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -33,48 +34,42 @@
@TableField("io_time")
private Date ioTime;
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no")
+ private String matNo;
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "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 color;
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
+
/**
- * 浠撳簱鍙�
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "浠撳簱")
- private String warehouse;
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("bill_no")
+ private String billNo;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value= "搴忓彿")
+ @TableField("seq_no")
+ private String seqNo;
/**
* 浠撳簱鍙�
@@ -86,13 +81,13 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Double qty;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
/**
* 鎵樼洏鏉＄爜
@@ -140,6 +135,63 @@
@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 getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
--
Gitblit v1.9.1