#

luxiaotao1123

2020-06-13 944c35175669e8af1c4dc47ce7921e0134978c6d

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

@@ -1,11 +1,11 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@
 * Created by vincent on 2020/6/10
 */
@RestController
public class WorkController {
public class WorkController extends BaseController {

    @Autowired
    private WorkService workService;
@@ -26,14 +26,19 @@
    @RequestMapping("/available/put/site")
    @ManagerAuth(memo = "获取有效的入库站点")
    public R availablePutSite(){
        return R.ok().add(basDevpService.getAvailableDevp());
        return R.ok().add(basDevpService.getAvailableInSite());
    }

    @RequestMapping("/available/take/site")
    @ManagerAuth(memo = "获取有效的出库站点")
    public R availableTakeSite(){
        return R.ok().add(basDevpService.getAvailableOutSite());
    }

    @RequestMapping("/full/store/start")
    @ManagerAuth(memo = "全板入库")
    public R start(@RequestBody FullStoreParam fullStoreParam) {
        System.out.println(JSON.toJSONString(fullStoreParam));
        workService.startupFullStore(fullStoreParam);
        workService.startupFullStore(fullStoreParam,getUserId());
        return R.ok();
    }