#

1

4 天以前 4c938d05b234e6142e94869eaec5e6d86efee382

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

@@ -140,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();
    }

@@ -167,13 +169,6 @@
                          @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/out/start")
    @ManagerAuth(memo = "品号移交")
    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {

        return R.ok("品号移交成功");
    }

    @RequestMapping("/mat/turn/over/take/site")
@@ -236,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);
    }
@@ -281,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);