.
18516761980
2022-03-19 9ff5e64187837a3bbd78370c1cfaadf2329f97f0
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.entity;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -26,6 +27,7 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.core.common.SpringUtils;
import zy.cloud.wms.manager.service.ReceiveService;
import zy.cloud.wms.system.service.UserService;
import zy.cloud.wms.system.entity.User;
import java.text.SimpleDateFormat;
@@ -67,6 +69,13 @@
    @ApiModelProperty(value= "订单内码")
    @TableField("order_id")
    private Long orderId;
    /**
     * 订单编号
     */
    @ApiModelProperty(value= "订单编号")
    @TableField("order_no")
    private String orderNo;
    /**
     * 数量
@@ -199,6 +208,9 @@
    @TableField("in_qty")
    private int inQty;
    @TableField("qua_status")
    private int quaStatus;
//    ReceiveDetl receiveDetl = new ReceiveDetl(
//            null,    // 
//            null,    // 订单内码
@@ -224,6 +236,17 @@
//            null    // 备注
//    );
    public String getOrderId$(){
        ReceiveService receiveService = SpringUtils.getBean(ReceiveService.class);
        Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
                .eq("id", orderId));
        if (!Cools.isEmpty(receive)) {
            return receive.getOrderNo();
        }else {
            return orderId + "";
        }
    }
    public Long getId() {
        return id;
    }
@@ -244,29 +267,49 @@
        return orderId;
    }
    public String getOrderId$(){
        OrderService service = SpringUtils.getBean(OrderService.class);
        Order order = service.selectById(this.orderId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getId());
        }
        return null;
    }
//    public String getOrderId$(){
//        OrderService service = SpringUtils.getBean(OrderService.class);
//        Order order = service.selectById(this.orderId);
//        if (!Cools.isEmpty(order)){
//            return String.valueOf(order.getId());
//        }
//        return null;
//    }
    public String getState$(){
        if (this.inQty == 0){
            return "未入库";
        }
        if (count - inQty != 0){
        if (anfme - inQty != 0){
            return "入库中";
        }
        return "已完成";
    }
    public String getQuaStatus$(){
        if (this.quaStatus == 0){
            return "待检";
        } else if (this.quaStatus == 1){
            return "合格";
        } else if (this.quaStatus == 2) {
            return "不合格";
        }
        return "未知";
    }
    public void setOrderId(Long orderId) {
        this.orderId = orderId;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public Double getAnfme() {
        return anfme;
    }