对单独的提货状态进查询与文案判断转义bug修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderBackInfoDto.java

@@ -593,6 +593,15 @@ public class OrderBackInfoDto {
 
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAbnormalState(Integer abnormalState) {
         this.abnormalState = abnormalState;
         this.getOrderDesc();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderStatusMsgEnum.java

@@ -149,9 +149,9 @@ public enum OrderStatusMsgEnum {
 
     public static String getMsg(Integer pickState, Integer status, Integer inWarehouseState, Integer shipmentState, Integer airShipment,
                                 Integer transportId, Integer userType, Integer lang) {
-        if (Objects.nonNull(pickState)) {
+        if (Objects.nonNull(pickState) && pickState > 0) {
             // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
-            status = pickState > 0 ? (pickState == 1 ? 21 : 20) : status;
+            status = pickState == 1 ? 21 : 20;
         }
         for (OrderStatusMsgEnum value : OrderStatusMsgEnum.values()) {
             String message = userType == 2 ? value.adminSourceName : value.customerSourceName;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java

@@ -606,6 +606,15 @@ public class OrderBackPageVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java

@@ -719,6 +719,15 @@ public class OrderBackVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderExcelVO.java

@@ -411,6 +411,15 @@ public class OrderExcelVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/OrderBackVO.java

@@ -211,6 +211,15 @@ public class OrderBackVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dto/MyAchievementDto.java

@@ -201,6 +201,15 @@ public class MyAchievementDto {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxLoadOrderVO.java

@@ -251,6 +251,15 @@ public class BoxLoadOrderVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxPreloadGoodsBackVO.java

@@ -374,6 +374,15 @@ public class BoxPreloadGoodsBackVO {
         this.getOrderDesc();
     }
 
+    public void setPickState(Integer pickState) {
+        this.pickState = pickState;
+        if (Objects.nonNull(pickState) && pickState > 0) {
+            // 当提货状态不未空时，判断提货状态是否需要转化为对应的原有主状态中的提货状态
+            this.status = pickState == 1 ? 21 : 20;
+        }
+        this.getOrderDesc();
+    }
+
     public void setAuditType(Integer auditType) {
         this.auditType = auditType;
         this.getOrderDesc();