From 6d3b7e69524cdc6fd4c44fe9f37661a19a56c6ff Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 21:08:32 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 5 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..00c536b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -4,10 +4,13 @@
 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.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -154,7 +157,7 @@
     /**
      * 鍘傚
      */
-    @ApiModelProperty(value= "鍘傚")
+    @ApiModelProperty(value= "浠撳簱缂栫爜")
     private String manu;
 
     /**
@@ -335,21 +338,25 @@
      */
     @ApiModelProperty(value= "澶囩敤1")
     @TableField("box_type1")
-    private String boxType1 = "1";
+    private String boxType1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
     @TableField("box_type2")
-    private String boxType2 = "1";
+    private String boxType2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
     @TableField("box_type3")
-    private String boxType3 = "1";
+    private String boxType3 = "";
+
+    @ApiModelProperty(value= "澶囨敞")
+    @TableField("remark")
+    private String remark;
 
     public OrderDetl() {}
 
@@ -578,6 +585,32 @@
         );
     }
 
+
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
+    public boolean beSimilar2(OrderDetl orderDetl){
+        return (
+                this.orderNo.equals(orderDetl.getOrderNo())
+                        && this.matnr.equals(orderDetl.getMatnr())
+                        && this.brand.equals(orderDetl.getBrand())
+                        && this.standby1.equals(orderDetl.getStandby1())
+                        && this.standby2.equals(orderDetl.getStandby2())
+                        && this.standby3.equals(orderDetl.getStandby3())
+                        && this.boxType1.equals(orderDetl.getBoxType1())
+                        && this.boxType2.equals(orderDetl.getBoxType2())
+                        && this.boxType3.equals(orderDetl.getBoxType3())
+        );
+    }
+
+
     public static OrderDetl find(List<OrderDetl> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         if (Cools.isEmpty(matnr)) {
             return null;
@@ -607,6 +640,23 @@
         }
     }
 
+    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);

--
Gitblit v1.9.1