13

zhang

1 天以前 82de5a307466894bbb0258f8a63a26a7bb96d80d

 src/main/java/com/zy/common/service/CommonService.java

@@ -3,16 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -20,9 +17,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;

@@ -982,11 +976,11 @@
                    for (LocMast locMastGro1 : locMasts1) {
                        if (locMastGro1.getLocSts().equals("F")) {
                            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
                            if (!Cools.isEmpty(locDetl.getSku())){
                            if (!Cools.isEmpty(locDetl.getSku())) {
                                if (!locDetl.getMatnr().equals(matnr) || !locDetl.getSku().equals(batch)) {
                                    continue;
                                }
                            }else {
                            } else {
                                if (!locDetl.getMatnr().equals(matnr)) {
                                    continue;
                                }