#

18516761980

2021-12-06 7203d67cfa3a2fc1cab9b8985dfd35c1797207b1

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

@@ -24,6 +24,7 @@
import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,7 @@
/**
 * Created by vincent on 2020/6/11
 */
@Slf4j
@Service
public class WorkServiceImpl implements WorkService {
    static int i =1;
@@ -858,14 +860,14 @@
                LocMast loc = null;
                for (Integer row : rows) {
                    if (Utils.isDeepLoc(slaveProperties, row)) {
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
                        if (null != loc) { break; }
                    }
                }
                if (null == loc) {
                    for (Integer row : rows) {
                        if (Utils.isShallowLoc(slaveProperties, row)) {
                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());
                            if (null != loc) { break; }
                        }
                    }