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/OrderDetl.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 102 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9f51f3c..1922dc7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,11 +1,13 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -43,6 +45,7 @@
*/
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
+ @ExcelProperty({"鍗曟嵁", "鍗曟嵁缂栧彿"})
private String orderNo;
@@ -50,27 +53,42 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
+ @ExcelProperty({"鍗曟嵁", "鏁伴噺"})
private Double anfme;
/**
* 浣滀笟鏁伴噺
*
- * 1. 鍏ュ簱 : qty 馃憜
- * 1. 鍑哄簱 : qty 馃憜
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ @ExcelProperty({"鍗曟嵁", "浣滀笟鏁伴噺"})
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ *
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ExcelProperty({"鍗曟嵁", "瀹屾垚鏁伴噺"})
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
@ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ExcelProperty({"鍗曟嵁", "鍟嗗搧缂栫爜"})
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ExcelProperty({"鍗曟嵁", "鍟嗗搧鍚嶇О"})
private String maktx;
/**
@@ -83,6 +101,7 @@
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty({"鍗曟嵁", "瑙勬牸"})
private String specs;
/**
@@ -170,6 +189,7 @@
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty({"鍗曟嵁", "閲嶉噺"})
private Double weight;
/**
@@ -285,9 +305,76 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @ExcelProperty({"鍗曟嵁", "璐т富ID"})
+ private Integer owner;
+
+ /**
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+ */
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+ @ExcelProperty({"鍗曟嵁", "璐х墿褰㈡�両D"})
+ private Integer payment;
+
+ /**
+ * uuid鏃堕棿鎴�
+ */
+ @ApiModelProperty(value= "uuid")
+ @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
+ @TableField("uuid")
+ private String uuid;
+
+ //鏈�澶х啍鎸�
+ private double fingerMeltingMin;
+ //鏈�灏忕啍鎸�
+ private double fingerMeltingMax;
+ //鏈�澶х啍鐐�
+ private double fusingPointMin;
+ //鏈�灏忕啍鐐�
+ private double fusingPointMax;
+ //鏈�澶ч粍搴�
+ private double yellownessMin;
+ //鏈�澶ч粍搴�
+ private double yellownessMax;
+ //鏈�灏忎笉閫忔槑搴�
+ private double opacityMin;
+ //鏈�澶т笉閫忔槑搴�
+ private double opacityMax;
+
+ 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);
+ }
+ }
+
public OrderDetl() {}
- public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr,
+ String maktx, String batch, String specs, String model, String color,
+ String brand, String unit, Double price, String sku, Double units,
+ String barcode, String origin, String manu, String manuDate, String itemNum,
+ Double safeQty, Double weight, Double length, Double volume, String threeCode,
+ String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn,
+ Integer source, Integer inspect, Integer danger, Integer status, Long createBy,
+ Date createTime, Long updateBy, Date updateTime, String memo,int owner ,int payment,String uuid) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -327,6 +414,9 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.owner = owner;
+ this.payment = payment;
+ this.uuid = uuid;
}
public String getOrderId$(){
@@ -433,14 +523,19 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ Double enableQty = null;
+ if (null != this.anfme && this.workQty != null) {
+ enableQty = this.anfme - this.workQty;
+ if (enableQty <0){
+ enableQty = 0.0D;
+ }
+
}
- return null;
+ return enableQty;
}
public void sync(Object source) {
Synchro.Copy(source, this);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1