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/WrkDetl.java | 333 ++++++++++++++++--------------------------------------
1 files changed, 100 insertions(+), 233 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index db9451b..cbe66df 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,17 +1,20 @@
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.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_wrk_detl")
public class WrkDetl implements Serializable {
@@ -31,59 +34,62 @@
@TableField("io_time")
private Date ioTime;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no")
+ @TableField("mat_no")
+ private String matNo;
+
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "mat_name")
+ @TableField("mat_name")
+ private String matName;
+
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty(value= "灏哄")
+ private String size;
+
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String supplier;
+
+ @ApiModelProperty(value= "姣忕閲嶉噺(KG)")
+ private Double weight;
+
/**
- * 鐗╂枡
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("bill_no")
+ private String billNo;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value= "搴忓彿")
+ @TableField("seq_no")
+ private Integer seqNo;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
-
- /**
- * 琛岄」鐩�
- */
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
-
- /**
- * 鐗╂枡鏍囩ID
- */
- @ApiModelProperty(value= "棰滆壊")
- private String zmatid;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
-
- /**
- * 宸ュ巶
- */
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Double qty;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
/**
* 鎵樼洏鏉＄爜
@@ -131,65 +137,67 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- private Double nista;
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField(exist = false)
+ private String locNo;
- public WrkDetl() {}
+ /**
+ * 鎬绘暟閲�
+ */
+ @ApiModelProperty(value= "鎬绘暟閲�")
+ @TableField("all_qty")
+ private Double allQty;
- public WrkDetl(Integer wrkNo,Date ioTime,String matnr,String lgnum,Integer tbnum,Integer tbpos,String zmatid,String maktx,String werks,Double anfme,String altme,String zpallet,String bname,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double nista) {
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- this.matnr = matnr;
- this.lgnum = lgnum;
- this.tbnum = tbnum;
- this.tbpos = tbpos;
- this.zmatid = zmatid;
- this.maktx = maktx;
- this.werks = werks;
- this.anfme = anfme;
- this.altme = altme;
- this.zpallet = zpallet;
- this.bname = bname;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.nista = nista;
- }
+ /**
+ * 鎬婚噸
+ */
+ @ApiModelProperty(value= "鎬婚噸閲�")
+ @TableField("all_weight")
+ private Double allWeight;
-// WrkDetl wrkDetl = new WrkDetl(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鐗╂枡[闈炵┖]
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID[闈炵┖]
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
+ @ApiModelProperty(value= "鏉ユ簮")
+ @TableField("source")
+ private String source;
- public Integer getWrkNo() {
- return wrkNo;
- }
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @TableField("vendor")
+ private String vendor;
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
+ @ApiModelProperty(value= "姣忕鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
- public Date getIoTime() {
- return ioTime;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @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$(){
@@ -197,110 +205,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- public String getMatnr() {
- return matnr;
- }
-
- public void setMatnr(String matnr) {
- this.matnr = matnr;
- }
-
- public String getLgnum() {
- return lgnum;
- }
-
- public void setLgnum(String lgnum) {
- this.lgnum = lgnum;
- }
-
- public Integer getTbnum() {
- return tbnum;
- }
-
- public void setTbnum(Integer tbnum) {
- this.tbnum = tbnum;
- }
-
- public Integer getTbpos() {
- return tbpos;
- }
-
- public void setTbpos(Integer tbpos) {
- this.tbpos = tbpos;
- }
-
- public String getZmatid() {
- return zmatid;
- }
-
- public void setZmatid(String zmatid) {
- this.zmatid = zmatid;
- }
-
- public String getMaktx() {
- return maktx;
- }
-
- public void setMaktx(String maktx) {
- this.maktx = maktx;
- }
-
- public String getWerks() {
- return werks;
- }
-
- public void setWerks(String werks) {
- this.werks = werks;
- }
-
- public Double getAnfme() {
- return anfme;
- }
-
- public void setAnfme(Double anfme) {
- this.anfme = anfme;
- }
-
- public String getAltme() {
- return altme;
- }
-
- public void setAltme(String altme) {
- this.altme = altme;
- }
-
- public String getZpallet() {
- return zpallet;
- }
-
- public void setZpallet(String zpallet) {
- this.zpallet = zpallet;
- }
-
- public String getBname() {
- return bname;
- }
-
- public void setBname(String bname) {
- this.bname = bname;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
}
public String getModiUser$(){
@@ -312,27 +216,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
}
public String getAppeUser$(){
@@ -344,32 +232,11 @@
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Double getNista() {
- return nista;
- }
-
- public void setNista(Double nista) {
- this.nista = nista;
- }
-
}
--
Gitblit v1.9.1