双伸出库优先筛选浅库位的任务进行出库，浅库位任务不足二十个则补上深库位出库的任务

zwl

2 天以前 44522f08bff3abc3c34c77215eacd2cb3a484a0d

 src/main/java/com/zy/asrs/entity/OrderDetlPakout.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;
@@ -308,25 +311,157 @@
     */
    @ApiModelProperty(value= "行号")
    @TableField("line_number")
    private Integer lineNumber;
    private Long lineNumber;

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1;
    private String standby1 = "1";

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

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

    /**
     * 备用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";

    /**
     * 宽度
     */
    @ApiModelProperty(value= "宽度")
    @TableField("width")
    private Double width;

    /**
     * 高度
     */
    @ApiModelProperty(value= "高度")
    @TableField("height")
    private Double height;

    /**
     * erp数量
     */
    @ApiModelProperty(value= "erp数量")
    @TableField("erp_anfme")
    private Double erpAnfme;


    /**
     * 数量
     */
    @ApiModelProperty(value= "下发分拣线数量")
    @TableField("sorting_anfme")
    private Double sortingAnfme;

    /**
     * 同订单中批次标识
     */
    @ApiModelProperty(value= "同订单中批次标识")
    @TableField("batch_seq")
    private String batchSeq;

    /**
     * 出库顺序
     */
    @ApiModelProperty(value= "出库顺序")
    private Integer seq;

    /**
     * 托盘编码
     */
    @ApiModelProperty(value= "托盘编码")
    @TableField("pallet_id")
    private String palletId;

    /**
     * 出库口编码
     */
    @ApiModelProperty(value= "出库口编码")
    @TableField("station_id")
    private String stationId;

    /**
     * 进仓编号
     */
    @ApiModelProperty(value= "进仓编号")
    @TableField("entry_wms_code")
    private String entryWmsCode;

    /**
     * 集装箱号
     */
    @ApiModelProperty(value= "集装箱号")
    @TableField("container_no")
    private String containerNo;

    /**
     * 外库门号
     */
    @ApiModelProperty(value= "外库门号")
    @TableField("out_door_no")
    private String outDoorNo;

    /**
     * 车牌号
     */
    @ApiModelProperty(value= "车牌号")
    @TableField("plate_no")
    private String plateNo;

    /**
     * 车次号
     */
    @ApiModelProperty(value= "车次号")
    @TableField("train_no")
    private String trainNo;

    /**
     * 货物频次
     */
    @ApiModelProperty(value= "货物频次")
    @TableField("freq_type")
    private Integer freqType;

    /**
     * 立方数
     */
    @ApiModelProperty(value= "立方数")
    @TableField("cube_number")
    private Double cubeNumber;

    /**
     * TEU
     */
    @ApiModelProperty(value= "TEU")
    private Integer teu;

    public OrderDetlPakout() {}

@@ -505,6 +640,24 @@
        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(OrderDetlPakout orderDetlPakout){
        return (
                this.orderNo.equals(orderDetlPakout.getOrderNo())
@@ -514,6 +667,9 @@
                && this.standby1.equals(orderDetlPakout.getStandby1())
                && this.standby2.equals(orderDetlPakout.getStandby2())
                && this.standby3.equals(orderDetlPakout.getStandby3())
                        && this.boxType1.equals(orderDetlPakout.getBoxType1())
                        && this.boxType2.equals(orderDetlPakout.getBoxType2())
                        && this.boxType3.equals(orderDetlPakout.getBoxType3())
        );
    }

@@ -521,4 +677,4 @@
        Synchro.Copy(source, this);
    }

}
}