#1

dubin

4 天以前 864c18c46c2db1ae92220181e40b291b3b0d9446

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -13,12 +13,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,9 +57,27 @@
        if (!locNos.isEmpty()) {
            List<LocDetl> res = new ArrayList<>();
            for (String locNo : new HashSet<>(locNos)) {
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                if (!locDetls.isEmpty()) {
                    res.addAll(locDetls);
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                    if (!locDetls.isEmpty()) {
                        res.addAll(locDetls);
                    }
                }
            return R.ok().add(res);
        }
        return R.parse(BaseRes.EMPTY);
    }

    @RequestMapping(value = "/locDetlOut/auth")
    @ManagerAuth
    public R stockOutListAll(@RequestParam(value = "locNos[]") List<String> locNos,@RequestParam(value = "matnrs[]",required = false) List<String> matnrs){
        if (!locNos.isEmpty()&&!matnrs.isEmpty()) {
            List<LocDetl> res = new ArrayList<>();
            for (String locNo : new HashSet<>(locNos)) {
                for (String matnr : new HashSet<>(matnrs)) {
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr).eq("loc_no",locNo));
                    if (!locDetls.isEmpty()) {
                        res.addAll(locDetls);
                    }
                }
            }
            return R.ok().add(res);