#

18516761980

2021-12-06 5d550b5a752e515fced5d11279aad6c3b31fa1bc

#

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

@@ -12,11 +12,13 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.service.IoCompleteService;
@@ -71,6 +73,8 @@
    private WaitMatchkLogService waitMatchkLogService;
    @Autowired
    private IoCompleteService ioCompleteService;
    @Autowired
    private SlaveProperties slaveProperties;

    @Override
    @Transactional
@@ -217,6 +221,20 @@
            }
            int workNo = commonService.getWorkNo(rok);

            // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级
            boolean reduce = false;
            if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
                String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
                if (locNos.contains(shallowLoc)) {
                    reduce = true;
                }
            }

            // 深库位移库
            if (!reduce) {
                moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
            }

            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);