Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2025-03-19 830b5f394b6f5c41d259be38272d578467b53cf1

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

@@ -396,13 +396,8 @@

    @RequestMapping(value = "/orderDetl/pakout/workNum")
    @ManagerAuth
    public R listWorkDetl(@RequestParam OrderDetl param) {
        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr(param.getMatnr(), param.getThreeCode(), param.getOrderNo());
        if (agvWrkDetls != null) {
            for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {

            }
        }
    public R listWorkDetl() {
        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
        return R.ok(agvWrkDetls);

    }