Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-03-26 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de

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

@@ -2,12 +2,14 @@

import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvMobileService;
import com.zy.asrs.service.AgvWorkService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -69,9 +71,18 @@
    }

    /*
    获取输送线站点
     */
    @PostMapping("/getBasDevp/noCacheShelves/auth")
    public R getBasDevpByNoCacheShelves(){
        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
    }

    /*
    启动入库，生成工作档
     */
    @PostMapping("/pakin/auth")
    @Synchronized
    public R pakin(@RequestBody Map<String,Object> map){
        List<String> devNos = (List<String>) map.get("devNo");

@@ -84,5 +95,32 @@
        return R.ok("生成工作档成功");
    }

    /*
    入库
     */
    @PostMapping("/pakin/empty/auth")
    @Synchronized
    public R pakinEmpty(@RequestBody AgvMobileStartParam params){

        for (AgvMobileStartParam.Pad pad : params.getPad()) {
            workService.emptyPlateIn(pad.getDevNo(),pad.getContainerCode(),pad.getContainerType(), getUserId());
        }

        return R.ok();
    }

    /*
    空板出库
     */
    @PostMapping("/pakout/empty/auth")
    @Synchronized
    public R pakoutEmpty(@RequestBody AgvMobileStartParam params){

        for (AgvMobileStartParam.Pad pad : params.getPad()) {
            workService.emptyPlateOut(pad.getDevNo(),pad.getContainerType(), getUserId());
        }

        return R.ok();
    }

}