.

18516761980

2022-03-28 58bccbc9d1a23c8184217317a9a37345d98883c2

 src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java

@@ -2,7 +2,10 @@

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
@@ -43,6 +46,11 @@
import io.swagger.annotations.ApiModelProperty;

import com.baomidou.mybatisplus.annotations.TableName;
import zy.cloud.wms.manager.service.PickoutService;
import zy.cloud.wms.manager.service.impl.PickoutServiceImpl;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.UserService;

import java.io.Serializable;

@Data
@@ -69,7 +77,7 @@
     * 库位ID
     */
    @ApiModelProperty(value= "库位ID")
    @TableField("node_id")
    @TableField("nodeId")
    private Long nodeId;

    /**
@@ -217,13 +225,17 @@
    @ApiModelProperty(value= "修改人员ID")
    @TableField("update_by")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateBy;
    private Integer updateBy;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    @TableField("wrk_no")
    private String wrkNo;


    public PickoutDetl() {}

@@ -399,6 +411,21 @@
        return pickStaff;
    }

    public String getPickStaff$(){
        PickoutService pickoutService = SpringUtils.getBean(PickoutService.class);
        Pickout pickout = pickoutService.selectOne(new EntityWrapper<Pickout>()
                .eq("id", this.headId));
        if (!Cools.isEmpty(pickout)) {
            UserService service = SpringUtils.getBean(UserService.class);
            User user = service.selectOne(new EntityWrapper<User>()
                    .eq("id", pickout.getPickStaff()));
            if (!Cools.isEmpty(user)) {
                return user.getNickname();
            }
        }
        return "";
    }

    public void setPickStaff(Long pickStaff) {
        this.pickStaff = pickStaff;
    }
@@ -408,11 +435,16 @@
    }

    public String getPickStart$(){
        if (Cools.isEmpty(this.pickStart)){
            return "";
        PickoutService service = SpringUtils.getBean(PickoutService.class);
        Pickout pickout = service.selectOne(new EntityWrapper<Pickout>()
                .eq("id", this.headId));
        if (!Cools.isEmpty(pickout)) {
            return pickout.getPickStart$();
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickStart);
        return "";
    }



    public void setPickStart(Date pickStart) {
        this.pickStart = pickStart;
@@ -423,10 +455,13 @@
    }

    public String getPickEnd$(){
        if (Cools.isEmpty(this.pickEnd)){
            return "";
        PickoutService service = SpringUtils.getBean(PickoutService.class);
        Pickout pickout = service.selectOne(new EntityWrapper<Pickout>()
                .eq("id", this.headId));
        if (!Cools.isEmpty(pickout)) {
            return pickout.getPickEnd$();
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickEnd);
        return "";
    }

    public void setPickEnd(Date pickEnd) {
@@ -471,20 +506,9 @@
        this.updateTime = updateTime;
    }

    public Date getUpdateBy() {
        return updateBy;
    }

    public String getUpdateBy$(){
        if (Cools.isEmpty(this.updateBy)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateBy);
    }

    public void setUpdateBy(Date updateBy) {
        this.updateBy = updateBy;
    }


    public String getMemo() {
        return memo;