#

yxFwq

2024-11-29 a878aff23eb8a8fc83b625024257973a7251a6f7

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

@@ -58,14 +58,9 @@
public class MainServiceImpl {

    public static final long COMMAND_TIMEOUT = 5 * 1000;
//    private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
    private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};

//    private static final Integer jarMaxLoc1 = 7;
    private static  Integer jarMaxLoc = 0;
//    private static  Integer trunBig = 0;
//    private static  Integer signBigTurn = 0;
//    private static  Integer signSmallTurn = 0;
    private static final Float jarTemperature = 50F;
    @Autowired
    private CommonService commonService;
@@ -3106,7 +3101,7 @@
                if (Cools.isEmpty(rgvOneSign)){
                    continue;
                }
                RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig");
                RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
                if (Cools.isEmpty(trunBig)){
                    continue;
                }
@@ -3276,8 +3271,8 @@
                    crnCommand.setDestinationPosX((short)0);     // 目标库位排
                    crnCommand.setDestinationPosY((short)0);     // 目标库位列
                    crnCommand.setDestinationPosZ((short)0);     // 目标库位层
                    if (!Cools.isEmpty(wrkMast.getStaNo()) && (wrkMast.getStaNo().equals(312) || wrkMast.getStaNo().equals(310))){
                        updateRgvOneSign("TrunBig",turnBigInt+1);
                    if (wrkMast.booleanStaNoSign()){
                        updateRgvOneSign("TrunBig"+wrkMast.getStaNo(),turnBigInt+1);
                    }
                    if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(crnStation==1? 2:5, crnCommand))) {
                        log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSONString(crnCommand));
@@ -8452,7 +8447,10 @@
     *  ste充电任务创建   //完成
     */
    public synchronized void signTrunBig() {
        updateRgvOneSign("TrunBig",0);
        updateRgvOneSign("TrunSma126",0);
        updateRgvOneSign("TrunSma131",0);
        updateRgvOneSign("TrunBig310",0);
        updateRgvOneSign("TrunBig312",0);
    }

    public synchronized boolean jarChargeGenerate() {