#

yxFwq

2024-11-28 c376b2ed79feec9612a1c35ad7d370ea15508bc8

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

@@ -5,6 +5,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.WrkMastSplitTwinInItHandler;
import com.zy.asrs.utils.TimeCalculatorUtils;
import com.zy.common.model.enums.CrnStnType;
import com.zy.common.model.enums.WrkMastExecuteType;
import org.slf4j.Logger;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Component;

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

/**
@@ -99,6 +101,7 @@
                            case 2:
                                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 12L).eq("crn_no", crnNo));
                                if (wrkMasts.size()==1){
                                    Integer wrkNo = wrkMasts.get(0).getWrkNo();
                                    wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11L).eq("crn_no", crnNo));
                                    if (wrkMasts.isEmpty()){
                                        if (basCrnp.getCrnStatusOne() != 20) {//堆垛机工位1有物待作业
@@ -119,7 +122,8 @@
                                                if (Cools.isEmpty(rgvOneSign)){
                                                    continue;
                                                }
                                                if (rgvOneSign.getRgvOneSign()>=2){
                                                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
                                                if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
                                                    continue;
                                                }
//                                                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
@@ -147,6 +151,21 @@
//                                            }
                                            break;
                                        }
                                        WrkMastSplitTwin wrkMastSplitTwin1 = wrkMastSplitTwinService.selectOne(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkNo));
                                        if (!Cools.isEmpty(wrkMastSplitTwin1)){
                                            long differenceInSeconds = TimeCalculatorUtils.differenceInSeconds(wrkMastSplitTwin1.getUpdateTime(), new Date());
                                            if (differenceInSeconds>180){
                                                if (basCrnp.getCrnStatusOne() != 20) {//堆垛机工位1有物待作业
                                                    break;
                                                }
                                                if (wrkMastSplitTwin.getWrkSts()!=2){
                                                    break;
                                                }
                                                wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin);
                                                break;
                                            }
                                        }

//                                        signBigTurn++;
//                                        if (signBigTurn > 2){
//                                            signBigTurn = 0;