缓存线pad接口更新

This commit is contained in:
2023-03-24 17:48:23 +08:00
parent 3edd05b982
commit 1d0be8e2a3
3 changed files with 510 additions and 636 deletions

View File

@@ -1,5 +1,4 @@
package org.nl.wms.pda.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@@ -119,11 +117,9 @@ public class CacheLineHandController{
@ApiOperation("缓存线料箱条码查询料箱信息")
public CommonResult<JSONArray> cacheLineMaterInfoQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线料箱条码查询料箱信息] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.cacheLineMaterInfoQuery(param));
return RestBusinessTemplate.execute(() -> cacheLineHandService.cacheLineMaterInfoQuery(param));
}
@PostMapping("/inOutEmptyBox")
@Log("空箱初始化--出入空箱")
@ApiOperation("空箱初始化--出入空箱")
@@ -134,19 +130,14 @@ public class CacheLineHandController{
});
}
@PostMapping("/inOutExceptionInstQuery")
@Log("缓存线出入箱异常指令查询")
@ApiOperation("缓存线出入箱异常指令查询")
public CommonResult<JSONArray> inOutExceptionInstQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出入箱异常指令查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.inOutExceptionInstQuery(param));
return RestBusinessTemplate.execute(() -> cacheLineHandService.inOutExceptionInstQuery(param));
}
@PostMapping("/inOutExceptionInstConfirm")
@Log("缓存线出入箱异常指令确认")
@ApiOperation("缓存线出入箱异常指令确认")
@@ -167,8 +158,6 @@ public class CacheLineHandController{
});
}
@PostMapping("/setEmptyBox")
@Log("设置空框")
@ApiOperation("设置空框")
@@ -179,19 +168,14 @@ public class CacheLineHandController{
});
}
@PostMapping("/agvInBoxExceptionQuery")
@Log("AGV入箱异常-查询")
@ApiOperation("AGV入箱异常-查询")
public CommonResult<JSONArray> agvInBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV入箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.agvInBoxExceptionQuery(param));
return RestBusinessTemplate.execute(() -> cacheLineHandService.agvInBoxExceptionQuery(param));
}
@PostMapping("/agvInBoxExceptionConfirm")
@Log("AGV入箱异常-确认")
@ApiOperation("AGV入箱异常-确认")
@@ -202,21 +186,14 @@ public class CacheLineHandController{
});
}
@PostMapping("/agvOutBoxExceptionQuery")
@Log("AGV出箱异常-查询")
@ApiOperation("AGV出箱异常-查询")
public CommonResult<JSONArray> agvOutBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV出箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.agvOutBoxExceptionQuery(param));
return RestBusinessTemplate.execute(() -> cacheLineHandService.agvOutBoxExceptionQuery(param));
}
@PostMapping("/agvOutBoxExceptionConfirm")
@Log("AGV出箱异常-确认")
@ApiOperation("AGV出箱异常-确认")
@@ -237,7 +214,6 @@ public class CacheLineHandController{
});
}
@PostMapping("/setBlankPos")
@Log("设置缓存线货位为空位置")
@ApiOperation("设置缓存线货位为空位置")
@@ -248,16 +224,14 @@ public class CacheLineHandController{
});
}
@PostMapping("/cacheLineOutBoxExceptionQuery")
@Log("缓存线出箱异常-查询")
@ApiOperation("缓存线出箱异常-查询")
public CommonResult<JSONArray> cacheLineOutBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.cacheLineOutBoxExceptionQuery(param));
return RestBusinessTemplate.execute(() -> cacheLineHandService.cacheLineOutBoxExceptionQuery(param));
}
@PostMapping("/cacheLineExcepOpt")
@Log("缓存线异常处理")
@ApiOperation("缓存线异常处理")
@@ -268,8 +242,6 @@ public class CacheLineHandController{
});
}
@PostMapping("/pourMaterial")
@Log("倒料操作")
@ApiOperation("倒料操作")
@@ -279,6 +251,4 @@ public class CacheLineHandController{
cacheLineHandService.pourMaterial(param);
});
}
}

View File

@@ -1,10 +1,8 @@
package org.nl.wms.pda.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.pda.dto.MaterialDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;