#

zjj

2025-02-14 296092f6666919867ac630efd986a60642e3d71e

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

@@ -13,6 +13,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -62,7 +63,8 @@
    public R pdaSearch(@RequestParam(required = false)String condition){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like("matnr", condition).or().like("maktx", condition);
//            wrapper.like("matnr", condition).or().like("maktx", condition);
            wrapper.like("matnr", condition).or().like("specs", condition);
        }
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
@@ -92,10 +94,11 @@
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
        }
        return R.ok(matService.getPage(new Page<>(curr, limit)
        return R.ok(matService.getPage2(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
                , param.get("maktx")
                , param.get("specs"))
        );

    }
@@ -156,6 +159,28 @@
            }
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/turn/over/list/auth")
    @ManagerAuth
    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
    }

    @RequestMapping("/mat/turn/over/take/site")
    @ManagerAuth()
    public R availableTakeSite(@RequestParam(required = false) String matnr){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Mat> mats = matService.selectByMatnrLink(matnr);
        for (Mat mat : mats) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", mat.getId());
            map.put("desc", mat.getMatnr());
            result.add(map);
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/mat/export/auth")
@@ -305,5 +330,15 @@
        return R.ok().add(valueVos);
    }

    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
    }

}