From 7204baeea8ec45bf90113f7d812db30de65d1229 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:10 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/entity/Order.java |   93 +++++++++++++++++++++++++++-------------------
 1 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/Order.java b/src/main/java/zy/cloud/wms/manager/entity/Order.java
index 394e253..3bc30bd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Order.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Order.java
@@ -7,6 +7,9 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import zy.cloud.wms.manager.service.CstmrService;
 import zy.cloud.wms.manager.service.DocTypeService;
 import zy.cloud.wms.manager.service.ItemService;
@@ -20,6 +23,9 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName("man_order")
 public class Order implements Serializable {
 
@@ -268,45 +274,56 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
-    public Order() {}
+    /**
+     * 璁㈠崟缂栧彿
+     */
+    @ApiModelProperty(value= "娉㈡缂栧彿")
+    @TableField("wave_no")
+    private String waveNo;
 
-    public Order(Long hostId, String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.hostId = hostId;
-        this.uuid = uuid;
-        this.orderNo = orderNo;
-        this.orderTime = orderTime;
-        this.docType = docType;
-        this.itemId = itemId;
-        this.itemName = itemName;
-        this.allotItemId = allotItemId;
-        this.defNumber = defNumber;
-        this.number = number;
-        this.cstmr = cstmr;
-        this.cstmrName = cstmrName;
-        this.tel = tel;
-        this.operMemb = operMemb;
-        this.totalFee = totalFee;
-        this.discount = discount;
-        this.discountFee = discountFee;
-        this.otherFee = otherFee;
-        this.actFee = actFee;
-        this.payType = payType;
-        this.salesman = salesman;
-        this.accountDay = accountDay;
-        this.postFeeType = postFeeType;
-        this.postFee = postFee;
-        this.payTime = payTime;
-        this.sendTime = sendTime;
-        this.shipName = shipName;
-        this.shipCode = shipCode;
-        this.settle = settle;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.updateTime = updateTime;
-        this.memo = memo;
-    }
+//    public Order() {}
+
+//    public Order(Long hostId, String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,
+//                 String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,
+//                 Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,
+//                 Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,
+//                 Long updateBy,Date updateTime,String memo, String waveNo) {
+//        this.hostId = hostId;
+//        this.uuid = uuid;
+//        this.orderNo = orderNo;
+//        this.orderTime = orderTime;
+//        this.docType = docType;
+//        this.itemId = itemId;
+//        this.itemName = itemName;
+//        this.allotItemId = allotItemId;
+//        this.defNumber = defNumber;
+//        this.number = number;
+//        this.cstmr = cstmr;
+//        this.cstmrName = cstmrName;
+//        this.tel = tel;
+//        this.operMemb = operMemb;
+//        this.totalFee = totalFee;
+//        this.discount = discount;
+//        this.discountFee = discountFee;
+//        this.otherFee = otherFee;
+//        this.actFee = actFee;
+//        this.payType = payType;
+//        this.salesman = salesman;
+//        this.accountDay = accountDay;
+//        this.postFeeType = postFeeType;
+//        this.postFee = postFee;
+//        this.payTime = payTime;
+//        this.sendTime = sendTime;
+//        this.shipName = shipName;
+//        this.shipCode = shipCode;
+//        this.settle = settle;
+//        this.status = status;
+//        this.createBy = createBy;
+//        this.createTime = createTime;
+//        this.updateBy = updateBy;
+//        this.updateTime = updateTime;
+//        this.memo = memo;
+//    }
 
 //    Order order = new Order(
 //            null,    // 缂栧彿[闈炵┖]

--
Gitblit v1.9.1