no message

skyouc

2 天以前 707d414c0e6a8baff3ce7affec820f0fc1a13c19

 src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java

@@ -10,7 +10,9 @@
import com.zy.asrs.service.WorkService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,7 @@

import java.util.List;
import java.util.Map;
import java.util.Objects;


/**
@@ -37,6 +40,9 @@
    @Autowired
    private WorkService workService;

    @Autowired
    private SlaveProperties slaveProperties;

    @Transactional(isolation = Isolation.REPEATABLE_READ)
    public ReturnT<String> start(Integer crnNo, Integer ioType) {
        try {
@@ -47,9 +53,16 @@
                        List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay, lev, crnNo);
                        if (!Cools.isEmpty(locMasts) && locMasts.size() < 4) {
                            for (LocMast locMast : locMasts) {
//                                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
//                                StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
//                                FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);
                                if (Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                                    String shallowLoc = Utils.getShallowLoc(slaveProperties, locMast.getLocNo());
                                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
                                    if (!Objects.isNull(locNo)) {
                                        StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 109 : 126, 1, null, null);
                                        workService.locMove(locNo.getLocNo(), startupDto.getLocNo(), 9527L);
                                        break;
                                    }
                                }

                                StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 109 : 126, 1, null, null);
                                workService.locMove(locMast.getLocNo(), startupDto.getLocNo(), 9527L);
                                break;
@@ -64,6 +77,18 @@
                        List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay, lev, crnNo );
                        if (!Cools.isEmpty(locMasts) && locMasts.size() < 4) {
                            for (LocMast locMast : locMasts) {
//                                if (Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
//                                    String shallowLoc = Utils.getShallowLoc(slaveProperties, locMast.getLocNo());
//                                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>()
//                                            .eq("crn_no", crnNo)
//                                            .eq("loc_no", shallowLoc));
//                                    if (!Objects.isNull(locNo)) {
//                                        StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 205 : 215, 3, null, null);
//                                        workService.locMove(locNo.getLocNo(), startupDto.getLocNo(), 9527L);
//                                        break;
//                                    }
//                                }

//                                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
//                                StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
//                                FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);