#

LSH

2023-05-22 4c8c41b153db001d80a990090e2cce1669af72dc

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

@@ -13,9 +13,11 @@
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.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;
@@ -31,6 +33,7 @@

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocDetlMapper locDetlMapper;
    @Autowired
@@ -83,47 +86,47 @@
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }

    @RequestMapping(value = "/locDetl/list/auth")
    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param,
                  @RequestParam(required = false)Boolean unreason){
        if (unreason) {

            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
                    .where(" DATALENGTH( batch ) != 11 or\n" +
                            "            batch LIKE '%[a-z]%'")));
        }
        param.remove("unreason");
        String row = "";
                  @RequestParam Map<String, Object> param){
//        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (param.get("row") != null) {
            String chooseRow = (String) param.get("row");
            if (chooseRow.length() == 1) {
                row = "0" + chooseRow;
                param.remove("row");
            }else {
                row = chooseRow;
                param.remove("row");
            }
        }
//        if (param.get("row") != null) {
//            String chooseRow = (String) param.get("row");
//            if (chooseRow.length() == 1) {
//                row = "0" + chooseRow;
//                param.remove("row");
//            }else {
//                row = chooseRow;
//                param.remove("row");
//            }
//        }
        excludeTrash(param);
        convert(param, wrapper);
        String locNo = convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!row.equals("")){
            wrapper.and()
                    .where("loc_no like '" +row +"%'");
        Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
        if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
            List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
            return R.ok(locDetlPage.setRecords(locDetls));
        }else {
            return R.ok(locDetlPage);
        }

        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
//        if (!row.equals("")){
//            wrapper.and()
//                    .where("loc_no like '" +row +"%'");
//        }
//        return R.ok();
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){

    private <T> String convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        String locNo=null;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
@@ -131,13 +134,15 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("locNo")) {
                if (entry.getKey().equals("loc_no")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                    locNo=String.valueOf(entry.getValue());
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }
            }
        }
        return locNo;
    }

    @RequestMapping(value = "/locDetl/add/auth")