#

ytfl

7 天以前 f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6

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

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

import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,20 +36,20 @@
    private BasDevpService basDevpService;

    @RequestMapping("/available/put/site")
    @ManagerAuth(memo = "获取入库站点")
    public R availablePutSite(){
    @ManagerAuth()
    public R availablePutSite() {
        return R.ok().add(basDevpService.getAvailableInSite());
    }

    @RequestMapping("/available/empty/put/site")
    @ManagerAuth(memo = "获取空板入库站点")
    public R availableEmptyPutSite(){
    @ManagerAuth()
    public R availableEmptyPutSite() {
        return R.ok().add(basDevpService.getAvailableEmptyInSite());
    }

    @RequestMapping("/available/take/site")
    @ManagerAuth(memo = "获取出库站点")
    public R availableTakeSite(){
    @ManagerAuth()
    public R availableTakeSite() {
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
@@ -65,27 +68,49 @@
        return R.ok().add(result);
    }

    @RequestMapping("/turn/over/out/start")
    @ManagerAuth(memo = "客户转换")
    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
        workService.turnOverOut(param, getUserId());
        return R.ok("客户转换成功");
    }

    @RequestMapping("/available/take/check/site")
    @ManagerAuth(memo = "获取盘点出库站点")
    public R availableTakeCheckSite(){
        return R.ok().add(basDevpService.getAvailableOutSite(103));
    @ManagerAuth()
    public R availableTakeCheckSite() {
        return R.ok().add(basDevpService.getAvailableOutSite(107));
    }

    @RequestMapping("/available/empty/take/site")
    @ManagerAuth(memo = "获取空板出库站点")
    public R availableEmptyTakeSite(){
    @ManagerAuth()
    public R availableEmptyTakeSite() {
        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
    }

    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
        return R.ok("入库启动成功").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
        try {
            String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
            return R.ok("入库启动成功").add(locNo);
        } catch (Exception e) {
            return R.error("入库启动失败==>" + e.getMessage());
        }
    }

    @RequestMapping("/plate/out/start")
    @ManagerAuth(memo = "出库作业")
    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
        workService.startupFullTakeStore(param, getUserId());
        return R.ok("出库启动成功");
    }

    @RequestMapping("/plate/out/start/v2")
    @ManagerAuth(memo = "出库作业2")
    public R fullStoreTakeStartV2(@RequestBody StockOutParam param) {
        if (Cools.isEmpty(param.getItemId())) {
            return R.error("转入仓库不能为空");
        }
        workService.startupFullTakeStore(param, getUserId());
        return R.ok("出库启动成功");
    }
@@ -118,6 +143,19 @@
        return R.ok("移库启动成功");
    }

    @RequestMapping("/mat/turn/over/out/start")
    @ManagerAuth(memo = "品号移交")
    public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
            return R.error("参数为空");
        }
        if (param.getLocDetls().size() > 1) {
            return R.error("请单条数据修改，谨慎操作！");
        }
        workService.turnMatLocDetl(param, getUserId());
        return R.ok("品号移交成功");
    }

    @RequestMapping("/locDdetl/adjust/start")
    @ManagerAuth(memo = "库存调整")
    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
@@ -128,7 +166,7 @@
    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type){
                                @RequestParam Integer type) {
        if (type == 1) {
            workService.completeWrkMast(workNo, getUserId());
            return R.ok("工作档已完成");
@@ -137,9 +175,23 @@
            return R.ok("工作档已取消");
        } else if (type == 3) {
            workService.pickWrkMast(workNo, getUserId());
            return R.ok();
            return R.ok("工作档已拣料");
        }
        return R.ok();
    }

    @RequestMapping("/create/waitPain/wrkMast/start")
    @ManagerAuth(memo = "生成任务")
    public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
        StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
        return R.ok("任务号：" + startupDto.getWorkNo() + ";目标库位：" + startupDto.getLocNo());
    }

    @RequestMapping("/deal/preHave/start")
    @ManagerAuth(memo = "先入品处理")
    public R dealPreHave(@RequestParam Integer wrkNo) {
        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
        return R.ok("任务重新入库，目标库位：" + locNo);
    }

}