From 4e6f445e9d62eaa465f74b9f2c339e49b7d07929 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 14:14:30 +0800
Subject: [PATCH] 出库单下发根据订单号去重

---
 src/main/java/com/zy/asrs/entity/Order.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 99abc64..5aebc90 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -261,6 +261,13 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鐘舵�� 1: 杩涜涓�  0: 鍒濆  2:宸插畬鎴�
+     */
+    @ApiModelProperty(value= "鐘舵��  2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆  ")
+    @TableField("move_status")
+    private Integer moveStatus;
+
     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) {
@@ -405,6 +412,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);

--
Gitblit v1.9.1