*

lsh

1 天以前 054b36d1437864e90d69d99c698a6fa7e9421165

 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java

@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasBoxTypeService;
import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -259,7 +260,7 @@
    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    @ApiModelProperty(value= "状态 1: 未上报  0: 禁用  2: 等待上报  3: 上报完成")
    private Integer status;

    /**
@@ -354,8 +355,8 @@
    }

    public String getOrderId$(){
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        OrderPakoutService service = SpringUtils.getBean(OrderPakoutService.class);
        OrderPakout order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getId());
        }
@@ -440,6 +441,8 @@
                return "禁用";
            case 2:
                return "等待上报";
            case 3:
                return "上报完成";
            default:
                return String.valueOf(this.status);
        }