#

lsh

2024-02-18 7ab1bf4c111cbfa3a35685aa9aa0ed3599b6b6c7

#

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

@@ -332,6 +332,13 @@
    @TableField("full_plt")
    private String fullPlt;

    /**
     * 伴生工作号
     */
    @ApiModelProperty(value= "伴生工作号")
    @TableField("work_no_other")
    private Integer workNoOther;

    public String getWrkSts$(){
        BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
        BasWrkStatus entity = mapper.selectById(this.wrkSts);

 src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java

@@ -12,4 +12,7 @@
public interface WrkMastCrnMapper extends BaseMapper<WrkMastCrn> {

    WrkMastCrn selectWrkNoOneAndTwo(@Param("wrkNo")Integer wrkNo);

    WrkMastCrn selectWrkNoCrnAndWrkSts(@Param("crnNo")Integer crnNo,@Param("wrkSts")Integer wrkSts);

}

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

@@ -1085,6 +1085,12 @@
                        // 移动中
                        continue;
                    }
                    if (crnProtocol.getCrnNo()<=2){
                        WrkMastCrn wrkMastCrn = wrkMastCrnMapper.selectWrkNoOneAndTwo(crnProtocol.getTaskNo().intValue());
                        if (!Cools.isEmpty(wrkMastCrn) && wrkMastCrn.getWrkSts().equals(12L)){
                            wrkMast = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNo().intValue());
                        }
                    }
                    //  判断堆垛机状态等待确认
                    if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
                            && crnProtocol.statusType == CrnStatusType.WAITING
@@ -1118,14 +1124,14 @@
                                }

                                // 下发站点信息
                                staProtocolOther.setWorkNo(wrkMast1.getWrkNo());
                                staProtocolOther.setWorkNo(Cools.isEmpty(wrkMast1.getWorkNoOther())? wrkMast1.getWrkNo():wrkMast1.getWorkNoOther());
                                staProtocolOther.setStaNo(wrkMast1.getStaNo());
                                if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocolOther))) {
                                    continue;
                                }

                                // 下发站点信息
                                staProtocol.setWorkNo(wrkMast2.getWrkNo());
                                staProtocol.setWorkNo(Cools.isEmpty(wrkMast2.getWorkNoOther())? wrkMast2.getWrkNo():wrkMast2.getWorkNoOther());
//                                    staProtocol.setStaNo(RouteUtils.CrnStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
                                staProtocol.setStaNo(wrkMast2.getStaNo());
                                if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {

 src/main/resources/mapper/WrkMastMapper.xml

@@ -62,6 +62,7 @@
<!--        <result column="Pdc_type" property="PdcType" />-->
        <result column="ctn_no" property="ctnNo" />
        <result column="full_plt" property="fullPlt" />
        <result column="work_no_other" property="workNoOther" />

    </resultMap>