缓冲区库存调整

skyouc

10 小时以前 97e70fa264df2d3d0ed004137a8c55d9035b10f9

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

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -17,6 +20,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;

@Data
@TableName("man_order_detl_pakin")
@@ -314,19 +318,40 @@
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1;
    private String standby1 = "";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private String standby2;
    private String standby2 = "";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String standby3;
    private String standby3 = "";

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    @TableField("box_type1")
    private String boxType1 = "1";

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

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

    public OrderDetlPakin() {}

@@ -394,6 +419,7 @@
    }

    public String getPakinPakoutStatus$(){
        if (Objects.isNull(pakinPakoutStatus)) {return  null;}
        switch (this.pakinPakoutStatus){
            case 1:
                return "Y";
@@ -443,6 +469,7 @@
        }
    }


    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
@@ -491,9 +518,6 @@
        if (null != this.anfme && this.workQty != null) {
            return this.anfme - this.workQty;
        }
//        if (null != this.anfme && this.qty != null) {
//            return this.anfme - this.qty;
//        }
        return null;
    }

@@ -502,6 +526,24 @@
            return "已完成";
        }
        return "未完成";
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

    public boolean beSimilar(OrderDetlPakin orderDetlPakin){
@@ -513,6 +555,9 @@
                        && this.standby1.equals(orderDetlPakin.getStandby1())
                        && this.standby2.equals(orderDetlPakin.getStandby2())
                        && this.standby3.equals(orderDetlPakin.getStandby3())
                        && this.boxType1.equals(orderDetlPakin.getBoxType1())
                        && this.boxType2.equals(orderDetlPakin.getBoxType2())
                        && this.boxType3.equals(orderDetlPakin.getBoxType3())
        );
    }