双伸出库改成订单出库 完成转订单

zwl

3 天以前 2a2f094b447c604ca2884922586df32f0665b81c

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

@@ -22,6 +22,7 @@
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
@@ -43,6 +44,9 @@
    private LocDetlMapper locDetlMapper;
    @Autowired
    private MatService matService;

    @Autowired
    private LocMastService locMastService;

    @Autowired
    private LocOwnerService locOwnerService;
@@ -209,8 +213,13 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                if (entry.getKey().equals("locNo") || entry.getKey().equals("loc_no")) {
                    List<String> locNos = locMastService.selectLocNosByNoOrAlias(String.valueOf(entry.getValue()));
                    if (locNos.isEmpty()) {
                        wrapper.eq("loc_no", "__NO_MATCH__");
                    } else {
                        wrapper.in("loc_no", locNos);
                    }
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }