#

1

4 天以前 4c938d05b234e6142e94869eaec5e6d86efee382

 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;
@@ -93,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"))
        );

    }
@@ -138,9 +140,11 @@
        if (Cools.isEmpty(mat) || null==mat.getId()){
            return R.error();
        }
        String oldMatnr = matService.getOldMatnr(mat.getId());
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(new Date());
        matService.updateById(mat);

        return R.ok();
    }

@@ -157,6 +161,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")
@@ -205,6 +231,8 @@
        }
        OrderDetl orderDetl = new OrderDetl();
        orderDetl.sync(mat);
        orderDetl.setStandby1(mat.getSupp());
        orderDetl.setStandby2(mat.getSku());
        orderDetl.setAnfme(0.0D);
        return R.ok().add(orderDetl);
    }
@@ -250,6 +278,8 @@
            print.setBarcode(mat.getBarcode());
            print.setMaktx(mat.getMaktx());
            print.setSpecs(mat.getSpecs());
            print.setSupp(mat.getSupp());
            print.setSku(mat.getSku());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());
            res.add(print);