From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化

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

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 7235dd1..34be8e5 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,24 +1,29 @@
 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.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.OrderService;
-import com.zy.common.model.DetlDto;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Data
 @TableName("man_order_detl")
@@ -44,6 +49,7 @@
      * 鍗曟嵁缂栧彿
      */
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    @ExcelProperty(index = 0, value = "鍗曞彿")
     @TableField("order_no")
     private String orderNo;
 
@@ -52,6 +58,7 @@
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
+    @ExcelProperty(value = "鏁伴噺")
     private Double anfme;
 
     /**
@@ -77,30 +84,35 @@
      * 鍟嗗搧缂栫爜
      */
     @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+    @ExcelProperty(value = "鍟嗗搧缂栫爜")
     private String matnr;
 
     /**
      * 鍟嗗搧鍚嶇О
      */
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ExcelProperty(value = "鍟嗗搧鍚嶇О")
     private String maktx;
 
     /**
      * 鎵瑰彿
      */
     @ApiModelProperty(value= "鎵瑰彿")
+    @ExcelProperty(value = "鎵瑰彿")
     private String batch;
 
     /**
      * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
+    @ExcelProperty(value = "瑙勬牸")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
     @ApiModelProperty(value= "鍨嬪彿")
+    @ExcelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
@@ -113,12 +125,14 @@
      * 鍝佺墝
      */
     @ApiModelProperty(value= "鍝佺墝")
+    @ExcelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
+    @ExcelProperty(value = "鍗曚綅")
     private String unit;
 
     /**
@@ -143,6 +157,7 @@
      * 鏉＄爜
      */
     @ApiModelProperty(value= "鏉＄爜")
+    @ExcelProperty(value = "SN鐮�")
     private String barcode;
 
     /**
@@ -607,9 +622,28 @@
         }
     }
 
+    public String getBoxType1$(){
+        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(processProcedures)){
+            return String.valueOf(processProcedures.getBoxSpecs());
+        }
+        return this.boxType1;
+    }
+
+    public String getBoxType2$(){
+        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(basQualityTesting)){
+            return String.valueOf(basQualityTesting.getBoxSpecs());
+        }
+        return this.boxType1;
+    }
 
     public void sync(Object source) {
-        Synchro.Copy(source, this);
+        if (!Objects.isNull(source)) {
+            BeanUtils.copyProperties(source, this);
+        }
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1