From 3babe039d11eeadeace6e4a8c8505b4270592b69 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 二月 2025 08:32:43 +0800
Subject: [PATCH] 登录页去除字体加载

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index fe8f30b..1922dc7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,5 +1,6 @@
 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;
@@ -44,6 +45,7 @@
      */
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
     @TableField("order_no")
+    @ExcelProperty({"鍗曟嵁", "鍗曟嵁缂栧彿"})
     private String orderNo;
 
 
@@ -51,6 +53,7 @@
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
+    @ExcelProperty({"鍗曟嵁", "鏁伴噺"})
     private Double anfme;
 
     /**
@@ -61,6 +64,7 @@
      */
     @ApiModelProperty(value= "浣滀笟鏁伴噺")
     @TableField("work_qty")
+    @ExcelProperty({"鍗曟嵁", "浣滀笟鏁伴噺"})
     private Double workQty;
 
     /**
@@ -70,18 +74,21 @@
      *  鍑哄簱 : qty 馃憜
      */
     @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+    @ExcelProperty({"鍗曟嵁", "瀹屾垚鏁伴噺"})
     private Double qty;
 
     /**
      * 鍟嗗搧缂栫爜
      */
     @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+    @ExcelProperty({"鍗曟嵁", "鍟嗗搧缂栫爜"})
     private String matnr;
 
     /**
      * 鍟嗗搧鍚嶇О
      */
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ExcelProperty({"鍗曟嵁", "鍟嗗搧鍚嶇О"})
     private String maktx;
 
     /**
@@ -94,6 +101,7 @@
      * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
+    @ExcelProperty({"鍗曟嵁", "瑙勬牸"})
     private String specs;
 
     /**
@@ -181,6 +189,7 @@
      * 閲嶉噺
      */
     @ApiModelProperty(value= "閲嶉噺")
+    @ExcelProperty({"鍗曟嵁", "閲嶉噺"})
     private Double weight;
 
     /**
@@ -300,12 +309,14 @@
      * 鎷ユ湁鑰�
      */
     @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
+    @ExcelProperty({"鍗曟嵁", "璐т富ID"})
     private Integer owner;
 
     /**
      * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
      */
     @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+    @ExcelProperty({"鍗曟嵁", "璐х墿褰㈡�両D"})
     private Integer payment;
 
     /**
@@ -315,6 +326,23 @@
     @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);
@@ -495,11 +523,15 @@
     }
 
     public Double getEnableQty() {
+        Double enableQty = null;
+        if (null != this.anfme && this.workQty != null) {
+            enableQty = this.anfme  - this.workQty;
+           if (enableQty <0){
+               enableQty = 0.0D;
+           }
 
-        if (null != this.anfme && this.qty != null) {
-            return this.anfme - this.qty;
         }
-        return null;
+        return enableQty;
     }
 
     public void sync(Object source) {

--
Gitblit v1.9.1