#

mrzhssss

2022-03-17 c6fb95d1be6057a569a3e2ba8c983c1de72c3264

 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;
@@ -234,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;
    }
@@ -254,14 +267,14 @@
        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){