#

lsh

2024-04-14 2983f5990702d55d025fee37d80fa43f2cc73e72

#

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

@@ -70,6 +70,13 @@
    private String loading;

    /**
     * 有物
     */
    @ApiModelProperty(value= "超级有物")
    @TableField("loading_super")
    private String loadingSuper;

    /**
     * 空板
     */
    @ApiModelProperty(value= "空板")

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -3696,6 +3696,11 @@
                        if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                            continue;
                        }
                        if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                            if (basDevp.getLoadingSuper().equals("Y")){
                                continue;
                            }
                        }
                        if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                            if (!basDevp.getEmptyMk().equals("Y")){
                                continue;
@@ -3773,6 +3778,11 @@
                            BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
                            if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                                continue;
                            }
                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                                if (basDevp.getLoadingSuper().equals("Y")){
                                    continue;
                                }
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!basDevp.getEmptyMk().equals("Y")){
@@ -3856,6 +3866,11 @@
                            if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                                continue;
                            }
                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                                if (basDevp.getLoadingSuper().equals("Y")){
                                    continue;
                                }
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (!basDevp.getEmptyMk().equals("Y")){
                                    continue;

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -87,6 +87,7 @@
        basDevp.setWrkNo(workNo);
        basDevp.setAutoing(autoing?"Y":"N");
        basDevp.setLoading(loading?"Y":"N");
        basDevp.setLoadingSuper(loadingSuper?"Y":"N");
        basDevp.setEmptyMk(emptyMk?"Y":"N");
        if (autoing && !loadingSuper && !loading){
            basDevp.setReportSign(0);

 src/main/resources/mapper/BasDevpMapper.xml

@@ -43,6 +43,7 @@
        <result column="cart_pos" property="cartPos" />
        <result column="report_sign" property="reportSign" />
        <result column="empty_mk" property="emptyMk" />
        <result column="loading_super" property="loadingSuper" />

    </resultMap>