完善erp上报流程

野心家

2024-12-23 fffcf8f632eb551f11d018184547ce01dcc4907f

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

@@ -1,9 +1,15 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -17,6 +23,7 @@

    private static final long serialVersionUID = 1L;

    @TableId("zpallet")
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

@@ -27,12 +34,14 @@
    @TableField("loc_no")
    private String locNo;

    @TableId("matnr")
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @TableId("batch")
    @ApiModelProperty(value= "批号")
    private String batch;

@@ -152,6 +161,56 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 拥有者
     */
    @ApiModelProperty(value= "拥有者 1: 杰克   ")
    private Integer owner;

    /**
     * 货物形态:0：代采、1：仓储
     */
    @ApiModelProperty(value= "货物形态:0：代采、1：仓储")
    private Integer payment;

    /**
     * uuid时间戳
     */
    @ApiModelProperty(value= "uuid")
    @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
    @TableField("uuid")
    private String uuid;

    public String getUserName$(){
        UserService service = SpringUtils.getBean(UserService.class);
       User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getOwner$(){
        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
        LocOwner locOwner = service.selectById(this.owner);
        if (!Cools.isEmpty(locOwner)){
            return String.valueOf(locOwner.getOwner());
        }
        return null;
    }

    public String getPayment$(){
        if (null == this.payment){ return null; }
        switch (this.payment){
            case 1:
                return "仓储";
            case 0:
                return "代采";
            default:
                return String.valueOf(this.payment);
        }
    }

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){