#

lsh

2024-06-08 fed3f3bb2be54aefa5aa2aff255901249cd0d152

#

 src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java

@@ -7,13 +7,10 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSplitTwin;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.WrkMastSplitTwinService;
import com.zy.asrs.service.impl.BasDevpServiceImpl;
import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.asrs.task.handler.WrkMastSplitTwinInItHandler;
import com.zy.asrs.utils.LocAndStaCodeUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.enums.CrnStnType;
import com.zy.common.model.enums.WrkMastExecuteType;
import org.slf4j.Logger;
@@ -23,7 +20,6 @@
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -42,22 +38,21 @@
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private BasDevpServiceImpl basDevpService;
    private BasDevpService basDevpService;
    @Autowired
    private WrkMastService wrkMastService;

    public static final List<Integer> SplitTwin_CRN_NO = new ArrayList<Integer>() {{
        add(3);
        add(4);
        add(5);
    }};
    @Autowired
    private WrkMastServiceImpl wrkMastService;


    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute() {
        for (Integer crnNo : SplitTwin_CRN_NO) {
            try {
                List<Integer> integers = WrkMastExecuteType.get(crnNo);
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (!Cools.isEmpty(basCrnp)) {
                    if (basCrnp.getWrkNo() == 0 && basCrnp.getCrnSts() != 3) {
@@ -82,7 +77,7 @@
                        }
                        switch (wrkMastSplitTwin.getIoType()){
                            case 1:
                                Integer count = basDevpService.selectWaitNecessary(integers,wrkMastSplitTwin.getWrkNo().intValue());
                                Integer count = basDevpService.selectWaitNecessary(WrkMastExecuteType.get(crnNo),wrkMastSplitTwin.getWrkNo().intValue());
                                if (basCrnp.getCrnStatusOne() != 20) {//堆垛机工位1有物待作业
                                    break;
                                }

 src/main/java/com/zy/common/model/enums/WrkMastExecuteType.java

@@ -6,9 +6,9 @@

public enum WrkMastExecuteType {

    DEVP_NO_CRN_THREE(3,"DEVP_NO_CRN_THREE", linearSmallToBig(1,3)),
    DEVP_NO_CRN_FOUR(4,"DEVP_NO_CRN_FOUR", linearSmallToBig(1,3)),
    DEVP_NO_CRN_FIVE(5,"DEVP_NO_CRN_FIVE", linearSmallToBig(1,3))
    DEVP_NO_CRN_THREE(3, "DEVP_NO_CRN_THREE", linearSmallToBig(nonlinearSmallToBig(new Integer[]{261}),255,257)),
    DEVP_NO_CRN_FOUR(4,"DEVP_NO_CRN_FOUR", linearSmallToBig(nonlinearSmallToBig(new Integer[]{260}),246,248)),
    DEVP_NO_CRN_FIVE(5,"DEVP_NO_CRN_FIVE", linearSmallToBig(nonlinearSmallToBig(new Integer[]{259}),237,239))
    ;
    private final Integer id;
    private final String code;
@@ -41,8 +41,7 @@
        return new ArrayList<>(Arrays.asList(sites));
    }

    private static List<Integer> linearSmallToBig(Integer smallSta,Integer bigSta){
        List<Integer> integers = new ArrayList<>();
    private static List<Integer> linearSmallToBig(List<Integer> integers,Integer smallSta,Integer bigSta){
        for (int i = smallSta;i<bigSta;i++){
            integers.add(i);
        }