add:新增库位下拉查询功能
This commit is contained in:
@@ -90,6 +90,14 @@ public class PdaIosInController {
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/getPdaStruct")
|
||||
@Log("PDA获取库位")
|
||||
public ResponseEntity<Object> getPdaStruct(@RequestBody JSONObject whereJson) {
|
||||
assertNotBlankJson(whereJson, "请求参数不能为空", "sect_code");
|
||||
return new ResponseEntity<>(pdaIosInService.getPdaStruct(whereJson), HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping("/getRegion")
|
||||
@Log("获取区域")
|
||||
|
||||
@@ -101,6 +101,12 @@ public interface PdaIosInService {
|
||||
*/
|
||||
PdaResponse getPdaSect(JSONObject whereJson);
|
||||
|
||||
/**
|
||||
* 查询库位
|
||||
*
|
||||
* @return PdaResponse
|
||||
*/
|
||||
PdaResponse getPdaStruct(JSONObject whereJson);
|
||||
|
||||
/**
|
||||
* 查询区域
|
||||
|
||||
@@ -370,6 +370,26 @@ public class PdaIosInServiceImpl implements PdaIosInService {
|
||||
return PdaResponse.requestParamOk(selectList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PdaResponse getPdaStruct(JSONObject whereJson) {
|
||||
List<Structattr> structattrList = iStructattrService.list(new LambdaQueryWrapper<Structattr>()
|
||||
.eq(Structattr::getOccupancy_state, 3)
|
||||
.eq(Structattr::getLock_type, "0")
|
||||
.and(wp -> wp
|
||||
.eq(Structattr::getSect_id, whereJson.getString("sect_code"))
|
||||
.or()
|
||||
.eq(Structattr::getSect_code, whereJson.getString("sect_code"))
|
||||
)
|
||||
.isNotNull(Structattr::getStoragevehicle_code)
|
||||
.isNull(Structattr::getTask_code));
|
||||
|
||||
List<SelectItemVo> selectList = new ArrayList<>();
|
||||
structattrList.forEach(r ->
|
||||
selectList.add(SelectItemVo.builder().text(r.getStruct_code() + "-" + r.getStruct_name()).value(r.getSect_code()).build())
|
||||
);
|
||||
return PdaResponse.requestParamOk(selectList);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public PdaResponse getRegion(JSONObject whereJson) {
|
||||
|
||||
Reference in New Issue
Block a user