skyouc
2025-03-10 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -6,6 +6,7 @@
import java.util.Date;
import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -55,6 +56,9 @@
     */
    @ApiModelProperty(value= "货主ID")
    private Long shipperId;
//    @ApiModelProperty(value = "货主编码")
//    private String shipperCode;
    /**
     * 分组ID(*)
@@ -327,10 +331,10 @@
//    );
    public String getShipperId$(){
        ShipperService service = SpringUtils.getBean(ShipperService.class);
        Shipper shipper = service.getById(this.shipperId);
        if (!Cools.isEmpty(shipper)){
            return String.valueOf(shipper.getName());
        CompanysService service = SpringUtils.getBean(CompanysService.class);
        Companys companys = service.getById(this.shipperId);
        if (!Cools.isEmpty(companys)){
            return String.valueOf(companys.getName());
        }
        return null;
    }
@@ -344,7 +348,7 @@
        return null;
    }
    public String getRglarId(){
    public String getRglarId$(){
        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
        BatchRegular batchRegular = service.getById(this.rglarId);
        if (!Cools.isEmpty(batchRegular)){