From e349e0610180d1ba73a629dfe82c6e252877e627 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 11:07:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/Order.java |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 4f8cc19..86e1aa5 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -1,11 +1,14 @@
 package com.zy.asrs.entity;
 
 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.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.DocTypeService;
 import com.zy.asrs.service.OrderSettleService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +29,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -258,6 +262,20 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鐘舵�� 1: 杩涜涓�  0: 鍒濆  2:宸插畬鎴�
+     */
+    @ApiModelProperty(value= "鐘舵��  2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆  ")
+    @TableField("move_status")
+    private Integer moveStatus;
+
+    /**
+     * 鐘舵�� 1: 杩涜涓�  0: 鍒濆  2:宸插畬鎴�
+     */
+    @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+    @TableField("pakin_pakout_status")
+    private Integer pakinPakoutStatus;
+
     public Order() {}
 
     public Order(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) {
@@ -295,6 +313,45 @@
         this.updateBy = updateBy;
         this.updateTime = updateTime;
         this.memo = memo;
+    }
+
+    public Order(Order order) {
+        this.uuid = order.getUuid();
+        this.orderNo = order.getOrderNo();
+        this.orderTime = order.getOrderTime();
+        this.docType = order.getDocType();
+        this.itemId = order.getItemId();
+        this.itemName = order.getItemName();
+        this.allotItemId = order.getAllotItemId();
+        this.defNumber = order.getDefNumber();
+        this.number = order.getNumber();
+        this.cstmr = order.getCstmr();
+        this.cstmrName = order.getCstmrName();
+        this.tel = order.getTel();
+        this.operMemb = order.getOperMemb();
+        this.totalFee = order.getTotalFee();
+        this.discount = order.getDiscount();
+        this.discountFee = order.getDiscountFee();
+        this.otherFee = order.getOtherFee();
+        this.actFee = order.getActFee();
+        this.payType = order.getPayType();
+        this.salesman = order.getSalesman();
+        this.accountDay = order.getAccountDay();
+        this.postFeeType = order.getPostFeeType();
+        this.postFee = order.getPostFee();
+        this.payTime = order.getPayTime();
+        this.sendTime = order.getSendTime();
+        this.shipName = order.getShipName();
+        this.shipCode = order.getShipCode();
+        this.settle = order.getSettle();
+        this.status = order.getStatus();
+        this.createBy = order.getCreateBy();
+        this.createTime = order.getCreateTime();
+        this.updateBy = order.getUpdateBy();
+        this.updateTime = order.getUpdateTime();
+        this.memo = order.getMemo();
+        this.moveStatus = order.getMoveStatus();
+        this.pakinPakoutStatus = order.getPakinPakoutStatus();
     }
 
 //    Order order = new Order(
@@ -355,6 +412,17 @@
         }
     }
 
+    public String getPakinPakoutStatus$(){
+        switch (this.pakinPakoutStatus){
+            case 1:
+                return "Y";
+            case 2:
+                return "N";
+            default:
+                return null;
+        }
+    }
+
     public String getPostFeeType$(){
         if (null == this.postFeeType){ return null; }
         switch (this.postFeeType){
@@ -402,6 +470,20 @@
         }
     }
 
+    public String getMoveStatus$(){
+        if (null == this.moveStatus){ return null; }
+        switch (this.moveStatus){
+            case 2:
+                return "宸插璐�";
+            case 1:
+                return "澶囪揣涓�";
+            case 0:
+                return "鏈垵濮�";
+            default:
+                return String.valueOf(this.moveStatus);
+        }
+    }
+
     public String getCreateBy$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.createBy);
@@ -434,5 +516,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 
 }

--
Gitblit v1.9.1