From 7729a2d6f38542f665567dba021aa5385ce1da5d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 12 十二月 2024 14:23:58 +0800
Subject: [PATCH] 添加`@ManagerAuth`注解memo并优化sellout逻辑
---
src/main/java/com/zy/asrs/entity/LocCheck.java | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 81 insertions(+), 20 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..0fd24a0 100644
--- a/src/main/java/com/zy/asrs/entity/LocCheck.java
+++ b/src/main/java/com/zy/asrs/entity/LocCheck.java
@@ -1,10 +1,14 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
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;
@@ -25,12 +29,14 @@
*/
@ApiModelProperty(value= "鍞竴ID")
@TableId(value = "id", type = IdType.AUTO)
+ @ExcelProperty("id")
private Long id;
/**
* 鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫
*/
@ApiModelProperty(value= "鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫 ")
+ @ExcelProperty({"鐩樼偣鍗�", "鍗曟嵁鐘舵��"})
private Integer type;
/**
@@ -38,33 +44,39 @@
*/
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
+ @ExcelProperty({"鐩樼偣鍗�", "搴撲綅鍙�"})
private String locNo;
/**
* 鐗╂枡鍙�
*/
@ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty({"鐩樼偣鍗�", "鐗╂枡鍙�"})
private String matnr;
+
+ /**
+ * 鐗╂枡鍙�
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚�")
+ @ExcelProperty({"鐩樼偣鍗�", "鐗╂枡鍚�"})
+ private String maktx;
/**
* 鐩樼偣鍓嶆暟閲�
*/
@ApiModelProperty(value= "鐩樼偣鍓嶆暟閲�")
- @TableField("origin_anfme")
- private Double originAnfme;
+ @ExcelProperty({"鐩樼偣鍗�", "鐩樼偣鍓嶆暟閲�"})
+ @TableField("anfme")
+ private Double anfme;
- /**
- * 鐪熷疄鏁伴噺
- */
- @ApiModelProperty(value= "鐪熷疄鏁伴噺")
- @TableField("real_anfme")
- private Double realAnfme;
+
/**
* 鍒涘缓浜�
*/
@ApiModelProperty(value= "鍒涘缓浜�")
@TableField("create_by")
+ @ExcelProperty({"鐩樼偣鍗�", "鍒涘缓浜�"})
private Long createBy;
/**
@@ -73,6 +85,7 @@
@ApiModelProperty(value= "鍒涘缓鏃堕棿")
@TableField("create_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty({"鐩樼偣鍗�", "鍒涘缓鏃堕棿"})
private Date createTime;
/**
@@ -80,6 +93,7 @@
*/
@ApiModelProperty(value= "淇敼浜�")
@TableField("update_by")
+ @ExcelProperty({"鐩樼偣鍗�", "淇敼浜�"})
private Long updateBy;
/**
@@ -88,29 +102,76 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty({"鐩樼偣鍗�", "淇敼鏃堕棿"})
private Date updateTime;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty({"鐩樼偣鍗�", "澶囨敞"})
private String memo;
- public LocCheck() {}
+ @ApiModelProperty(value= "宸紓閲�")
+ @TableField("diff_anfme")
+ @ExcelProperty({"鐩樼偣鍗�", "宸紓閲�"})
+ 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")
+ @ExcelProperty({"鐩樼偣鍗�", "鍗曟嵁鍙�"})
+ private String orderNo;
+
+ @ApiModelProperty(value= "瀹℃牳")
+ @ExcelProperty({"鐩樼偣鍗�", "瀹℃牳"})
+ private Integer examine;
+
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @ExcelProperty({"鐩樼偣鍗�", "璐т富"})
+ private Integer owner;
+
+ /**
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+ */
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+ @ExcelProperty({"鐩樼偣鍗�", "璐х墿褰㈡��"})
+ private Integer payment;
+
+ /**
+ * 鐪熷疄鏁伴噺
+ */
+ @ApiModelProperty(value= "鐪熷疄鏁伴噺")
+ @TableField("real_anfme")
+ @ExcelProperty({"鐩樼偣鍗�", "鐪熷疄鏁伴噺"})
+ private Double realAnfme;
+
+ @ApiModelProperty(value= "鎵规")
+ @TableField("batch")
+ private String batch;
+
+ 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