订单功能完善

pang.jiabao

1 天以前 17080b28dc3fb0df12a5a4da76e10dd9203e5725

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

@@ -13,7 +13,6 @@
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;
@@ -46,6 +45,16 @@
    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
        return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
    }

    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaListPage(@RequestParam Long tagId, @RequestParam Long curr){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
        return R.ok().add(mats);
    }

    @RequestMapping(value = "/mat/list/pda/auth")
@@ -167,13 +176,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")