From 298285bf63c0cec97fab0c64df4c010c5d2aebe6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 五月 2023 12:47:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test
---
src/main/java/com/zy/asrs/entity/LocCheck.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocCheck.java b/src/main/java/com/zy/asrs/entity/LocCheck.java
index aa7ba3e..e504aaf 100644
--- a/src/main/java/com/zy/asrs/entity/LocCheck.java
+++ b/src/main/java/com/zy/asrs/entity/LocCheck.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -47,11 +50,17 @@
private String matnr;
/**
+ * 鐗╂枡鍙�
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚�")
+ private String maktx;
+
+ /**
* 鐩樼偣鍓嶆暟閲�
*/
@ApiModelProperty(value= "鐩樼偣鍓嶆暟閲�")
- @TableField("origin_anfme")
- private Double originAnfme;
+ @TableField("anfme")
+ private Double anfme;
/**
* 鐪熷疄鏁伴噺
@@ -96,21 +105,49 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public LocCheck() {}
+ @ApiModelProperty(value= "宸紓閲�")
+ @TableField("diff_anfme")
+ private Double diffAnfme;
- public LocCheck(Integer type,String locNo,String matnr,Double originAnfme,Double realAnfme,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.type = type;
- this.locNo = locNo;
- this.matnr = matnr;
- this.originAnfme = originAnfme;
- this.realAnfme = realAnfme;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @TableField("order_no")
+ private String orderNo;
+
+ @ApiModelProperty(value= "瀹℃牳")
+ private Integer examine;
+
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ private Integer owner;
+
+ /**
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+ */
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+ private Integer payment;
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
}
+ public String getPayment$(){
+ if (null == this.payment){ return null; }
+ switch (this.payment){
+ case 1:
+ return "浠撳偍";
+ case 0:
+ return "浠ｉ噰";
+ default:
+ return String.valueOf(this.payment);
+ }
+ }
+
+
+
// LocCheck locCheck = new LocCheck(
// null, // 鐘舵��
// null, // 搴撲綅鍙�
--
Gitblit v1.9.1