From f1b97dcec8e07a5c72d240114b3908b8df5b1e44 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 13 十月 2023 10:25:12 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 478 +++++++++++++++++++++++++++++------------------------------
1 files changed, 232 insertions(+), 246 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 7f41257..c283e3d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -7,11 +7,13 @@
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_log")
public class WrkDetlLog implements Serializable {
@@ -32,58 +34,10 @@
private Date ioTime;
/**
- * 鐗╂枡缂栧彿
- */
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
- private String matnr;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "浠撳簱鍙�")
- private String lgnum;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
-
- /**
- * 琛岄」鐩�
- */
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
-
- /**
- * 鐗╂枡鏍囩ID
- */
- @ApiModelProperty(value= "鐗╂枡鏍囩ID")
- private String zmatid;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
-
- /**
- * 宸ュ巶
- */
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
-
- /**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String altme;
/**
* 鎵樼洏鏉＄爜
@@ -92,16 +46,193 @@
private String zpallet;
/**
- * 鐢ㄦ埛ID
+ * 鐗╂枡
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
- private String bname;
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ private String matnr;
/**
- * 澶囨敞
+ * 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ private String maktx;
+
+ /**
+ * 搴忓垪鐮�
+ */
+ @ApiModelProperty(value= "搴忓垪鐮�")
+ private String batch;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鎵规
+ */
+ @ApiModelProperty(value= "鎵规")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ private String sku;
+
+ /**
+ * 鍖呮暟
+ */
+ @ApiModelProperty(value= "鍖呮暟")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 鐗╂枡鐘舵��
+ */
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ /**
+ * 鍗曟嵁鏃堕棿
+ */
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
/**
* 淇敼浜哄憳
@@ -131,66 +262,11 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- private Double nista;
-
- public WrkDetlLog() {}
-
- public WrkDetlLog(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;
- }
-
-// WrkDetlLog wrkDetlLog = new WrkDetlLog(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鐗╂枡缂栧彿[闈炵┖]
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -199,108 +275,54 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
}
- public String getMatnr() {
- return matnr;
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
}
- public void setMatnr(String matnr) {
- this.matnr = matnr;
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
}
- 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 getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
public String getModiUser$(){
@@ -312,27 +334,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,31 +350,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