Merge remote-tracking branch 'origin/lggslasrs' into lggslasrs

cl

4 天以前 79eb9321e21e873a373c10480f8066cbc0407eb8

 src/main/java/com/zy/api/controller/WcsApiController.java

@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Objects;

@@ -48,15 +49,23 @@
//    @ManagerAuth
    @ApiOperation("设备执行状态回写-wcs任务完成回写")
    @PostMapping("/openapi/report")
    public R receviceTaskFromWcs(@RequestBody ReceviceTaskParams params) {
    public R receviceTaskFromWcs(@RequestBody ReceviceTaskParams params, HttpServletRequest request) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        request.setAttribute("cache", params);
        return wcsApiService.receviceTaskFromWcs(params);

    }

    @ManagerAuth
    @ApiOperation("主动同步WCS设备状态")
    @PostMapping("/sync/deviceStatus")
    public R syncDeviceStatusFromWcs() {
        return wcsApiService.syncDeviceStatusFromWcs();
    }

    @ManagerAuth
    @ApiOperation("获取组托入库托盘信息")
    @PostMapping("/openapi/waitPakins")
    public R waitPakins() {