Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

@@ -16,6 +16,7 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,15 @@
        return mobileService.pickMats(matnr, orderNo);
    }

    @PostMapping("/scan/order/mats")
    @ManagerAuth(memo = "扫码获取组托物料")
    public R scanMats(@RequestBody PakinMatsByQRParams params) {
        if (Objects.isNull(params)) {
            return R.parse("参数不能为空！！");
        }
        return mobileService.getMatsByQRcode(params);
    }

    // 商品上架
    @RequestMapping("/mat/onSale/auth")
    @ManagerAuth
@@ -138,6 +148,35 @@
    }


    @GetMapping("/cache/locs")
    @ManagerAuth
    @ApiOperation("获取缓存区库位信息")
    public R getCacheLocs() {
        return mobileService.getCacheLocs();
    }


    @PostMapping("/cache/agv/call")
    @ApiOperation("呼叫AGV搬运")
    @ManagerAuth
    public R callAgvMove(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return mobileService.callAgvMove(params, getUserId());
    }


    @PostMapping("/cache/out/call")
    @ApiOperation("呼叫AGV搬运")
    @ManagerAuth
    public R OutCallAgv(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return mobileService.OutCallAgv(params, getUserId());
    }


    // 组托 ----------------------------------------------------------------------------------------------------