#

zwl

21 小时以前 27c184d7af2775a4d647348ee508f4de335df8fb

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

@@ -1,6 +1,7 @@
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;
@@ -9,6 +10,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +48,14 @@
        return R.ok().add(basDevpService.getAvailableEmptyInSite());
    }

    @RequestMapping("/test/station/storage/crn/list")
    @ManagerAuth(memo = "测试站点库区堆垛机顺序")
    public R testStationStorageCrnList(@RequestParam Integer stationId,
                                       @RequestParam(required = false) Integer locType1,
                                       @RequestParam(required = false) String matnr) {
        List<Map<String, Integer>> stationStorageAreaName = Utils.getStationStorageAreaName(stationId, locType1, matnr);
        return R.ok().add(stationStorageAreaName);
    }
    @RequestMapping("/available/take/site")
    @ManagerAuth()
    public R availableTakeSite(){
@@ -67,6 +77,13 @@
        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()
    public R availableTakeCheckSite(){
@@ -82,7 +99,12 @@
    @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")
@@ -118,6 +140,19 @@
                          @RequestParam String targetLocNo) {
        workService.locMove(sourceLocNo, targetLocNo, getUserId());
        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")
@@ -159,3 +194,4 @@
    }

}