yxFwq
2024-08-07 39060333ba395b8be8920f7382bf4c0e07847603
#翻转回库标记
5个文件已修改
74 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RgvOneSignMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RgvOneSign;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@@ -10,6 +11,6 @@
@Repository
public interface RgvOneSignMapper extends BaseMapper<RgvOneSign> {
    RgvOneSign selectOneSign();
    RgvOneSign selectOneSign(@Param("sign") String sign);
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2556,7 +2556,7 @@
            }
            //退库模式跳过118、119出库任务
            if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("oneSign");
                if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
                    continue;
                }
@@ -2861,7 +2861,7 @@
            }
            //退库模式跳过118、119出库任务
            if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("oneSign");
                if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
                    continue;
                }
@@ -3849,7 +3849,13 @@
                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0)  && staProtocol.isPakMk()) {
                    //回库标记
                    if (emptyInSta.getStaNo()==126 || emptyInSta.getStaNo()==131){
                        RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+emptyInSta.getStaNo());
                        if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
                            continue;
                        }
                    }
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -3906,7 +3912,13 @@
                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0)  && staProtocol.isPakMk()) {
                    //回库标记
                    if (emptyInSta.getStaNo()==310 || emptyInSta.getStaNo()==312){
                        RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+emptyInSta.getStaNo());
                        if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
                            continue;
                        }
                    }
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -3986,7 +3998,7 @@
     */
    public synchronized void storeEmptyPlt3() {
        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("oneSign");
            if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
                return;
            }
src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java
@@ -1,5 +1,9 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.ScaleEscalationHandler;
import com.zy.asrs.task.handler.StaEscalationHandler;
@@ -34,4 +38,19 @@
        }
    }
    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeOverturn(){//2楼翻转倒料后回库标记清除
        int[] staNos =new int[]{126,131,310,312};
        for (int staNo : staNos){
            try{
                ReturnT<String> result = scaleEscalationHandler.start2(staNo);
                if (result.getCode()==200){
                    break;
                }
            }catch (Exception e){
                log.error("站点"+staNo+"2楼翻转倒料信息上传处理失败,异常信息:"+e);
            }
        }
    }
}
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -6,8 +6,10 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -45,6 +47,8 @@
    private ApiLogService apiLogService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private RgvOneSignMapper rgvOneSignMapper;
//    @Value("${srHangJia.url}")
    private String erpUrl = "10.10.11.100:8580";
@@ -85,6 +89,30 @@
        }
        return FAIL;
    }
    public ReturnT<String> start2(int staNo) {
        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
            if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
                return FAIL;
            }
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
            StaProtocol staProtocol = devpThread.getStation().get(staNo);
            if (staProtocol == null) {
                return FAIL;
            } else {
                staProtocol = staProtocol.clone();
            }
            if (!staProtocol.isLoading()){
                rgvOneSign.setRgvOneSign(0);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        }catch (Exception e){
            log.error("异常!!!"+e);
            return FAIL;
        }
        return FAIL;
    }
    private ReturnT<String> postMesData(String erpPath,Object combParam){
        if(combParam != null){
src/main/resources/mapper/RgvOneSignMapper.xml
@@ -11,6 +11,6 @@
    </resultMap>
    <select id="selectOneSign" resultMap="BaseResultMap">
        SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type='oneSign'
        SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type=#{sign}
    </select>
</mapper>