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

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -1566,6 +1566,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -223,6 +223,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.guan_lian_order_status, ",
@@ -707,6 +708,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.guan_lian_order_status, ",
@@ -1135,6 +1137,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -1506,6 +1509,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -1737,6 +1741,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -1953,6 +1958,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -2160,6 +2166,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -2240,6 +2247,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",
@@ -2445,6 +2453,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "rs.abnormal_state, ",
             "rs.in_warehouse_state, ",
             "rs.shipment_state, ",
+            "rs.pick_state, ",
             "rs.audit_type, ",
             "rs.audit_result, ",
             "rs.exception_reason, ",
@@ -2829,6 +2838,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.transport_id, ",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControl/OrderCargoControlMapper.java

@@ -89,6 +89,7 @@ public interface OrderCargoControlMapper extends AbstractMapper<OrderCargoContro
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.to_warehouse_state, ",
             "o.transport_id, ",
             "o.is_cargo_control, ",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControlPick/OrderCargoControlPickMapper.java

@@ -102,6 +102,7 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.to_warehouse_state, ",
             "o.transport_id, ",
             "o.is_cargo_control, ",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderException/OrderExceptionMapper.java

@@ -117,6 +117,7 @@ public interface OrderExceptionMapper extends AbstractMapper<OrderExceptionDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.audit_type, ",
             "o.audit_result, ",
             "o.guan_lian_order_status, ",

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

@@ -693,7 +693,7 @@ public class OrderBackInfoDto {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
 //            this.statusKey = OrderStatusMsgEnum.getStatusKey(this.status, this.inWarehouseState, this.shipmentState);
         }
     }

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

@@ -31,7 +31,7 @@ public enum OrderStatusMsgEnum {
     ADJUST_WAREHOUSE_PRE_INSTALLED(5, 10113, 215, 304, "调仓已到仓", "order.status.adjust.arrived.warehouse", "order.status.adjust.arrived.warehouse"),
     EXIT_WAREHOUSE(5, 10114, 216, 0, "报关退场已入仓", "order.status.adjust.demobilized.warehoused", "order.status.warehousing"),
     PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "已入仓", "order.status.warehousing", "order.status.warehousing"),
-//    PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "预装中", "order.status.pre.install", "order.status.pre.install"),
+    //    PRE_INSTALLED_PROGRESS(5, 10115, 202, 304, "预装中", "order.status.pre.install", "order.status.pre.install"),
     PREINSTALL_EXAMINE(5, 10116, 0, 305, "预装审核中", "order.status.pre.install.review", "order.status.pre.install.review"),
 
     WAREHOUSE_ADJUSTMENT_PRE_INSTALLED(8, 10203, 214, 304, "调仓待入仓", "order.status.adjust.wait.in.warehouse", "order.status.adjust"),
@@ -147,27 +147,28 @@ public enum OrderStatusMsgEnum {
     private final String customerSourceName;
 
 
-    public static String getMsg(Integer status, Integer inWarehouseState, Integer shipmentState, Integer airShipment,
+    public static String getMsg(Integer pickState, Integer status, Integer inWarehouseState, Integer shipmentState, Integer airShipment,
                                 Integer transportId, Integer userType, Integer lang) {
+        status = pickState > 0 ? (pickState == 1 ? 21 : 20) : status;
         for (OrderStatusMsgEnum value : OrderStatusMsgEnum.values()) {
             String message = userType == 2 ? value.adminSourceName : value.customerSourceName;
             if (Objects.equals(value.status, status) && shipmentState != 0 && Objects.equals(value.shipmentState, shipmentState)) {
-                if (inWarehouseState != 0){
-                    if (Objects.equals(value.inWarehouseState, inWarehouseState)){
+                if (inWarehouseState != 0) {
+                    if (Objects.equals(value.inWarehouseState, inWarehouseState)) {
                         // 返回定义出货状态
                         return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
                     }
-                }else {
+                } else {
                     // 返回定义出货状态
                     return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
                 }
             } else if (Objects.equals(value.status, status) && inWarehouseState != 0 && Objects.equals(value.inWarehouseState, inWarehouseState)) {
-                if (shipmentState != 0){
-                    if (Objects.equals(value.shipmentState, shipmentState)){
+                if (shipmentState != 0) {
+                    if (Objects.equals(value.shipmentState, shipmentState)) {
                         // 返回定义出货状态
                         return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
                     }
-                }else {
+                } else {
                     // 空运订单，且不是入仓中订单，需要判断订单备货状态
                     if ((Objects.equals(TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue(), transportId)
                             || Objects.equals(TransportTypeShortEnum.AIR_SEA_COMBINED_TRANSPORT.getValue(), transportId))

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -761,7 +761,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
         pickedNum = orderPickupDOS.stream().mapToInt(item -> item.getPickNum()).sum();
         if (orderDO.getStatus() != 16 && orderDO.getStatus() != 21) {
 //            DictDataRespDTO orderStatusDict = DictFrameworkUtils.getDictDataFromCache("order_status", String.valueOf(orderDO.getStatus()));
-            String statusMsg = OrderStatusMsgEnum.getMsg(orderDO.getStatus(), orderDO.getInWarehouseState(), orderDO.getShipmentState(), orderDO.getAirShipment(), orderDO.getTransportId(), 2, 0);
+            String statusMsg = OrderStatusMsgEnum.getMsg(orderDO.getPickState(), orderDO.getStatus(), orderDO.getInWarehouseState(), orderDO.getShipmentState(), orderDO.getAirShipment(), orderDO.getTransportId(), 2, 0);
             stringBuffer2.append(orderDO.getOrderNo());
             if (StringUtils.isNotBlank(orderDO.getTidanNo())) {
                 stringBuffer2.append("(").append(orderDO.getTidanNo()).append(")");

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

@@ -686,7 +686,7 @@ public class OrderBackPageVO {
         } else if (null != this.status && null != this.inWarehouseState &&
                 null != this.shipmentState && null != this.airShipment &&
                 null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status,
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status,
                     this.inWarehouseState, this.shipmentState,
                     this.airShipment, this.transportId,
                     this.userType, lang);

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

@@ -802,7 +802,7 @@ public class OrderBackVO {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
 //            this.statusKey = OrderStatusMsgEnum.getStatusKey(this.status, this.inWarehouseState, this.shipmentState);
         }
     }

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

@@ -229,6 +229,10 @@ public class OrderExcelVO {
     @ApiModelProperty(value = "空运可出货状态： 0 默认值 1 待出 2 可出 3 备货中 4 已备货")
     private Integer airShipment;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "提货状态： 0 未提货 1 部分提货 2 已提货")
+    private Integer pickState;
+
     @ExcelIgnore
     @ApiModelProperty(value = "订单出货状态(字典 order_shipment_state)")
     private Integer shipmentState;
@@ -471,7 +475,7 @@ public class OrderExcelVO {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
         }
     }
 

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

@@ -162,6 +162,11 @@ public class OrderBackVO {
     @ApiModelProperty(value = "订单入仓状态(字典 order_warehouse_in_status)")
     private Integer inWarehouseState;
 
+
+    @ExcelProperty("提货状态")
+    @ApiModelProperty(value = "提货状态：0 未提货 1 部分提货 2 已提货")
+    private Integer pickState;
+
     @ExcelProperty("订单出货状态")
     @ApiModelProperty(value = "订单出货状态(字典 order_shipment_state)")
     private Integer shipmentState;
@@ -317,7 +322,7 @@ public class OrderBackVO {
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
 
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
 //            this.statusKey = OrderStatusMsgEnum.getStatusKey(this.status, this.inWarehouseState, this.shipmentState);
         }
 

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1507,6 +1507,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -1653,6 +1654,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -4469,6 +4471,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -4596,6 +4599,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -4749,6 +4753,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -4884,6 +4889,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -4993,6 +4999,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.guan_lian_order_status,
@@ -5129,6 +5136,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.transport_id,
@@ -6071,6 +6079,7 @@
         rs.abnormal_state,
         rs.in_warehouse_state,
         rs.shipment_state,
+        rs.pick_state,
         rs.audit_type,
         rs.audit_result,
         rs.exception_reason,
@@ -7080,6 +7089,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.transport_id,
@@ -7179,6 +7189,7 @@
         o.abnormal_state,
         o.in_warehouse_state,
         o.shipment_state,
+        o.pick_state,
         o.audit_type,
         o.audit_result,
         o.transport_id,

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/orderException/OrderExceptionMapper.xml

@@ -14,6 +14,7 @@
                a.is_cargo_control AS is_cargo_control,
                a.in_warehouse_state as in_warehouse_state,
                a.shipment_state as shipment_state,
+               a.pick_state as pick_state,
                a.air_shipment as air_shipment,
                a.exception_reason as exception_reason,
                a.audit_type as audit_type,

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

@@ -129,6 +129,9 @@ public class MyAchievementDto {
     @ApiModelProperty(value = "空运可出货状态： 0 默认值 1 待出 2 可出 3 备货中 4 已备货")
     private Integer airShipment;
 
+    @ApiModelProperty(value = "提货状态： 0 未提货 1 部分提货 2 已提货")
+    private Integer pickState;
+
     @ApiModelProperty(value = "不阻塞流程的异常说明(支持多个异常说明)")
     private String exceptionReason;
 
@@ -280,7 +283,7 @@ public class MyAchievementDto {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
         }
     }
 }

yudao-module-sale/yudao-module-sale-core/src/main/resources/mapper/deptTarget/DeptTargetMapper.xml

@@ -56,6 +56,7 @@
         t1.abnormal_state,
         t1.in_warehouse_state,
         t1.shipment_state,
+        t1.pick_state,
         t1.audit_type,
         t1.audit_result,
         t1.guan_lian_order_status,
@@ -143,6 +144,7 @@
         t1.abnormal_state,
         t1.in_warehouse_state,
         t1.shipment_state,
+        t1.pick_state,
         t1.audit_type,
         t1.audit_result,
         t1.guan_lian_order_status,
@@ -235,6 +237,7 @@
         t1.abnormal_state,
         t1.in_warehouse_state,
         t1.shipment_state,
+        t1.pick_state,
         t1.audit_type,
         t1.audit_result,
         t1.guan_lian_order_status,
@@ -323,6 +326,7 @@
         t1.abnormal_state,
         t1.in_warehouse_state,
         t1.shipment_state,
+        t1.pick_state,
         t1.audit_type,
         t1.audit_result,
         t1.guan_lian_order_status,

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxPreloadGoodsMapper.java

@@ -81,6 +81,7 @@ public interface BoxPreloadGoodsMapper extends AbstractMapper<BoxPreloadGoodsDO>
             "eo.abnormal_state, ",
             "eo.in_warehouse_state, ",
             "eo.shipment_state, ",
+            "eo.pick_state, ",
             "eo.audit_type, ",
             "eo.audit_result, ",
             "eo.guan_lian_order_status, ",
@@ -208,6 +209,7 @@ public interface BoxPreloadGoodsMapper extends AbstractMapper<BoxPreloadGoodsDO>
             "eo.abnormal_state, ",
             "eo.in_warehouse_state, ",
             "eo.shipment_state, ",
+            "eo.pick_state, ",
             "eo.audit_type, ",
             "eo.audit_result, ",
             "eo.guan_lian_order_status, ",

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

@@ -169,6 +169,9 @@ public class BoxLoadOrderVO {
     @ApiModelProperty(value = "空运可出货状态： 0 默认值 1 待出 2 可出 3 备货中 4 已备货")
     private Integer airShipment;
 
+    @ApiModelProperty(value = "提货状态： 0 未提货 1 部分提货 2 已提货")
+    private Integer pickState;
+
     @ApiModelProperty(value = "不阻塞流程的异常说明(支持多个异常说明)")
     private String exceptionReason;
 
@@ -324,7 +327,7 @@ public class BoxLoadOrderVO {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
         }
     }
 

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

@@ -293,6 +293,9 @@ public class BoxPreloadGoodsBackVO {
     @ApiModelProperty(value = "空运可出货状态： 0 默认值 1 待出 2 可出 3 备货中 4 已备货")
     private Integer airShipment;
 
+    @ApiModelProperty(value = "提货状态： 0 未提货 1 部分提货 2 已提货")
+    private Integer pickState;
+
     @ApiModelProperty(value = "不阻塞流程的异常说明(支持多个异常说明)")
     private String exceptionReason;
 
@@ -447,7 +450,7 @@ public class BoxPreloadGoodsBackVO {
                     this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(guanlianOrderStatusVO.getStatusMsg()) : I18nMessage.getEnMessage(guanlianOrderStatusVO.getStatusMsg());
             }
         } else if (null != this.status && null != this.inWarehouseState && null != this.shipmentState && null != this.airShipment && null != this.transportId) {
-            this.statusMsg = OrderStatusMsgEnum.getMsg(this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
+            this.statusMsg = OrderStatusMsgEnum.getMsg(this.pickState, this.status, this.inWarehouseState, this.shipmentState, this.airShipment, this.transportId, this.userType, lang);
         }
     }
 

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/mysql/receivable/ReceivableMapper.java

@@ -96,6 +96,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.to_warehouse_state, ",
             "o.tidan_no, ",
             "o.container_number as container_number, ",
@@ -180,6 +181,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.to_warehouse_state, ",
             "o.tidan_no, ",
             "o.container_number as container_number, ",
@@ -208,6 +210,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.to_warehouse_state, ",
             "o.tidan_no, ",
             "nor.name as consignor_name, ",
@@ -240,6 +243,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.transport_id, ",
             "o.channel_id, ",
             "de.departure_id, ",
@@ -273,6 +277,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.transport_id, ",
             "o.channel_id, ",
             "de.departure_id, ",
@@ -307,6 +312,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",
             "o.shipment_state, ",
+            "o.pick_state, ",
             "o.transport_id, ",
             "o.channel_id, ",
             "de.departure_id, ",