|
@@ -470,8 +470,11 @@ public class DbStockController extends AbstractController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@ApiOperation(value = "按气体名称分组")
|
|
@ApiOperation(value = "按气体名称分组")
|
|
|
- @GetMapping(value = "/groupName")
|
|
|
|
|
- public ResultData groupName(DbStockBo bo) {
|
|
|
|
|
|
|
+ @PostMapping(value = "/groupName")
|
|
|
|
|
+ public ResultData groupName(@RequestBody DbStockBo bo) {
|
|
|
|
|
+ if(bo.getSubjectId()==null){
|
|
|
|
|
+ ResultData.success(new ArrayList<>());
|
|
|
|
|
+ }
|
|
|
//气瓶分类后显示的长度
|
|
//气瓶分类后显示的长度
|
|
|
int num=4;
|
|
int num=4;
|
|
|
List<DbStockVo> backList = new ArrayList<>();
|
|
List<DbStockVo> backList = new ArrayList<>();
|
|
@@ -509,8 +512,11 @@ public class DbStockController extends AbstractController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@ApiOperation(value = "查询实验室下气体列表(信息牌使用)")
|
|
@ApiOperation(value = "查询实验室下气体列表(信息牌使用)")
|
|
|
- @GetMapping(value = "/getListByName")
|
|
|
|
|
- public ResultData getListByName(DbStockBo bo) {
|
|
|
|
|
|
|
+ @PostMapping(value = "/getListByName")
|
|
|
|
|
+ public ResultData getListByName(@RequestBody DbStockBo bo) {
|
|
|
|
|
+ if(bo.getSubjectId()==null || bo.getGasName()==null){
|
|
|
|
|
+ return ResultData.success(new ArrayList<>());
|
|
|
|
|
+ }
|
|
|
List<DbInOutRecordVo> backList = new ArrayList<>();
|
|
List<DbInOutRecordVo> backList = new ArrayList<>();
|
|
|
//实验室下根据气体名称查询未出库的气瓶集合
|
|
//实验室下根据气体名称查询未出库的气瓶集合
|
|
|
paramCheck.notNull(bo.getSubjectId()).notNull(bo.getGasName());
|
|
paramCheck.notNull(bo.getSubjectId()).notNull(bo.getGasName());
|