From 2d81a78ae1924b20066ae8ff9557fd4bbe6d893b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 04 二月 2026 08:38:33 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 61acbd7..886330b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -374,9 +374,31 @@
     @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 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 manLength, 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,Double width,Double height) {
+    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 manLength, 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,Double width,Double height,Double taxrate,Double priceandtax) {
         this.orderId = orderId;
         this.orderNo = orderNo;
         this.anfme = anfme;
@@ -418,6 +440,8 @@
         this.memo = memo;
         this.width = width;
         this.height = height;
+        this.taxrate = taxrate;
+        this.priceandtax = priceandtax;
     }
 
     public OrderDetl(OrderDetl orderDetl) {
@@ -467,6 +491,63 @@
         this.standby3 = orderDetl.getStandby3();
         this.width = orderDetl.getWidth();
         this.height = orderDetl.getHeight();
+        this.taxrate = orderDetl.getTaxrate();
+        this.priceandtax = orderDetl.getPriceandtax();
+    }
+
+    public OrderDetl(OrderDetlPakin orderDetl) {
+        this.orderId = orderDetl.getOrderId();
+        this.orderNo = orderDetl.getOrderNo();
+        this.anfme = orderDetl.getAnfme();
+        this.qty = orderDetl.getQty();
+        this.matnr = orderDetl.getMatnr();
+        this.maktx = orderDetl.getMaktx();
+        this.batch = orderDetl.getBatch();
+        this.specs = orderDetl.getSpecs();
+        this.model = orderDetl.getModel();
+        this.color = orderDetl.getColor();
+        this.brand = orderDetl.getBrand();
+        this.unit = orderDetl.getUnit();
+        this.price = orderDetl.getPrice();
+        this.sku = orderDetl.getSku();
+        this.units = orderDetl.getUnits();
+        this.barcode = orderDetl.getBarcode();
+        this.origin = orderDetl.getOrigin();
+        this.manu = orderDetl.getManu();
+        this.manuDate = orderDetl.getManuDate();
+        this.itemNum = orderDetl.getItemNum();
+        this.safeQty = orderDetl.getSafeQty();
+        this.weight = orderDetl.getWeight();
+        this.manLength = orderDetl.getManLength();
+        this.volume = orderDetl.getVolume();
+        this.threeCode = orderDetl.getThreeCode();
+        this.supp = orderDetl.getSupp();
+        this.suppCode = orderDetl.getSuppCode();
+        this.beBatch = orderDetl.getBeBatch();
+        this.deadTime = orderDetl.getDeadTime();
+        this.deadWarn = orderDetl.getDeadWarn();
+        this.source = orderDetl.getSource();
+        this.inspect = orderDetl.getInspect();
+        this.danger = orderDetl.getDanger();
+        this.status = orderDetl.getStatus();
+        this.createBy = orderDetl.getCreateBy();
+        this.createTime = orderDetl.getCreateTime();
+        this.updateBy = orderDetl.getUpdateBy();
+        this.updateTime = orderDetl.getUpdateTime();
+        this.memo = orderDetl.getMemo();
+        this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
+        this.lineNumber = orderDetl.getLineNumber();
+        this.standby1 = orderDetl.getStandby1();
+        this.standby2 = orderDetl.getStandby2();
+        this.standby3 = orderDetl.getStandby3();
+        this.boxType1 = orderDetl.getBoxType1();
+        this.boxType2 = orderDetl.getBoxType2();
+        this.boxType3 = orderDetl.getBoxType3();
+        this.erpAnfme = orderDetl.getErpAnfme();
+        this.width = orderDetl.getWidth();
+        this.height = orderDetl.getHeight();
+        this.taxrate = orderDetl.getTaxrate();
+        this.priceandtax = orderDetl.getPriceandtax();
     }
 
 

--
Gitblit v1.9.1