From 47bf4931fc565cf1104abd5513b7bebfebbcec09 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 20 一月 2026 14:02:33 +0800
Subject: [PATCH] #杰克新增税率字段

---
 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index c91c3ab..19e0b73 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -4,8 +4,11 @@
 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.utils.Synchro;
 import com.zy.system.entity.User;
@@ -308,25 +311,89 @@
      */
     @ApiModelProperty(value= "琛屽彿")
     @TableField("line_number")
-    private Integer lineNumber;
+    private Long lineNumber;
 
     /**
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private Integer standby1;
+    private String standby1 = "1";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private Integer standby2;
+    private String standby2 = "1";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private Integer standby3;
+    private String standby3 = "1";
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    @TableField("box_type1")
+    private String boxType1 = "1";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    @TableField("box_type2")
+    private String boxType2 = "1";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    @TableField("box_type3")
+    private String boxType3 = "1";
+
+    /**
+     * 瀹藉害
+     */
+    @ApiModelProperty(value= "瀹藉害")
+    @TableField("width")
+    private Double width;
+
+    /**
+     * 楂樺害
+     */
+    @ApiModelProperty(value= "楂樺害")
+    @TableField("height")
+    private Double height;
+
+    /**
+     * erp鏁伴噺
+     */
+    @ApiModelProperty(value= "erp鏁伴噺")
+    @TableField("erp_anfme")
+    private Double erpAnfme;
+
+
+    /**
+     * 鏁伴噺
+     */
+    @ApiModelProperty(value= "涓嬪彂鍒嗘嫞绾挎暟閲�")
+    @TableField("sorting_anfme")
+    private Double sortingAnfme;
+
+    /**
+     * 绋庣巼
+     */
+    @ApiModelProperty(value= "绋庣巼")
+    @TableField("taxrate")
+    private Double taxrate;
+
+    /**
+     * 鍚◣鍗曚环
+     */
+    @ApiModelProperty(value= "鍚◣鍗曚环")
+    @TableField("priceandtax")
+    private Double priceandtax;
 
     public OrderDetlPakout() {}
 
@@ -453,6 +520,7 @@
     }
 
     public String getPakinPakoutStatus$(){
+        if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
         switch (this.pakinPakoutStatus){
             case 1:
                 return "Y";
@@ -504,6 +572,39 @@
         return "鏈畬鎴�";
     }
 
+    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 boolean beSimilar(OrderDetlPakout orderDetlPakout){
+        return (
+                this.orderNo.equals(orderDetlPakout.getOrderNo())
+                && this.matnr.equals(orderDetlPakout.getMatnr())
+                && this.batch.equals(orderDetlPakout.getBatch())
+                && this.brand.equals(orderDetlPakout.getBrand())
+                && this.standby1.equals(orderDetlPakout.getStandby1())
+                && this.standby2.equals(orderDetlPakout.getStandby2())
+                && this.standby3.equals(orderDetlPakout.getStandby3())
+                        && this.boxType1.equals(orderDetlPakout.getBoxType1())
+                        && this.boxType2.equals(orderDetlPakout.getBoxType2())
+                        && this.boxType3.equals(orderDetlPakout.getBoxType3())
+        );
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1