Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

whycq

2024-07-03 2ee70a38e4c832e3888b12d29ebf962456069cdb

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

@@ -43,8 +43,8 @@
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")
    @ExcelProperty("序列码")
    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    private String batch;

    @ApiModelProperty(value= "单据编号")
@@ -61,7 +61,8 @@
    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "类型")
//    @ApiModelProperty(value= "品牌")
    private String brand;

    @ApiModelProperty(value= "单位")
@@ -157,6 +158,10 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "bom号")
    @TableField("bom_code")
    private String bomCode;

    public String getLocNo$(){
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);