#

Junjie

8 天以前 b67bafd95dc17136ac0eab068ba51cd55e1669f3

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

@@ -10,6 +10,7 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -336,21 +337,21 @@
     */
    @ApiModelProperty(value= "备用1")
    @TableField("box_type1")
    private String boxType1 = "1";
    private String boxType1 = "";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    @TableField("box_type2")
    private String boxType2 = "1";
    private String boxType2 = "";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    @TableField("box_type3")
    private String boxType3 = "1";
    private String boxType3 = "";

    public OrderDetlPakin() {}

@@ -546,6 +547,17 @@
        return this.boxType1;
    }


    public String getStandby1$() {
        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
        StoreType storeType = service.selectById(this.standby1);
        if (!Cools.isEmpty(storeType)) {
            return String.valueOf(storeType.getStoreName());
        }
        return null;
    }


    public boolean beSimilar(OrderDetlPakin orderDetlPakin){
        return (
                this.orderNo.equals(orderDetlPakin.getOrderNo())