yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加接口

This commit is contained in:
yangjun 2025-11-18 09:23:25 +08:00
parent b502c62b50
commit 517bf8b0a1
3 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
View File

@ -271,11 +271,21 @@ public class InvoicingApi {
@ApiOperation(value = "查询拣货照片集合", notes = "查询拣货照片集合")
@GetMapping(value = "/queryJhzpList")
public Result<IPage<WarehouseMaterialCrkInfoEntity>> queryCgdInfoList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto,
public Result<List<Map<String,Object>>> queryCgdInfoList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<WarehouseMaterialCrkInfoEntity> pageList = invoicingApi.queryJhzpList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req);
List<Map<String,Object>> pageList = invoicingApi.queryJhzpList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req);
return Result.OK(pageList);
}
@ApiOperation(value = "查询出入库记录", notes = "查询出入库记录")
@GetMapping(value = "/queryCrkList")
public Result<IPage<WarehouseMaterialCrkInfoEntity>> queryCrkList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<WarehouseMaterialCrkInfoEntity> pageList = invoicingApi.queryCrkList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req);
return Result.OK(pageList);
}

4
nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java
View File

@ -63,7 +63,7 @@ public interface IInvoicingApi {
List<Map<String,Object>> getCgrList(CgdMainEntity cgdMainEntityDto);
IPage<WarehouseMaterialCrkInfoEntity> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req);
List<Map<String,Object>> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req);
String addSxd(CgdSxdEntity cgdSxdEntityDto);
@ -74,4 +74,6 @@ public interface IInvoicingApi {
String pickingInfo(CgdInfoEntity cgdInfoEntityDto);
String editPrice(CgdInfoEntity cgdInfoEntityDto);
IPage<WarehouseMaterialCrkInfoEntity> queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req);
}

44
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -645,18 +645,35 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
}
@Override
public IPage<WarehouseMaterialCrkInfoEntity> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) {
public List<Map<String,Object>> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) {
NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo();
BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo);
QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap());
Page<NuWarehouseMaterialCrkInfo> page = new Page<>(pageNo, pageSize);
queryWrapper.eq("cgd_id",warehouseMaterialCrkInfo.getCgdId());
queryWrapper.isNotNull("jh_pic");
queryWrapper.eq("crk_status","1");
List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(page,queryWrapper);
IPage<WarehouseMaterialCrkInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
entityPage.setRecords(BeanUtil.copyToList(list, WarehouseMaterialCrkInfoEntity.class));
return entityPage;
List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(queryWrapper);
List<Map<String,Object>> jhlist = new ArrayList<>();
for(NuWarehouseMaterialCrkInfo crkInfo : list){
if(StringUtils.isNotBlank(crkInfo.getJhPic())){
if(crkInfo.getJhPic().indexOf(",")>-1){
for (String jhPicParam : crkInfo.getJhPic().split(",")){
Map<String,Object> map = new HashMap<>();
map.put("jhPic",jhPicParam);
map.put("createTime",crkInfo.getCreateTime());
map.put("createBy",crkInfo.getCreateBy());
jhlist.add(map);
}
}else{
Map<String,Object> map = new HashMap<>();
map.put("jhPic",crkInfo.getJhPic());
map.put("createTime",crkInfo.getCreateTime());
map.put("createBy",crkInfo.getCreateBy());
jhlist.add(map);
}
}
}
return jhlist;
}
@Override
@ -887,4 +904,19 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
return "1";
}
@Override
public IPage<WarehouseMaterialCrkInfoEntity> queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) {
NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo();
BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo);
QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap());
queryWrapper.eq("nu_id",warehouseMaterialCrkInfo.getNuId());
queryWrapper.eq("wl_id",warehouseMaterialCrkInfo.getWlId());
List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(queryWrapper);
Page<WarehouseMaterialCrkInfoEntity> page = new Page<>(pageNo, pageSize);
IPage<WarehouseMaterialCrkInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
entityPage.setRecords(BeanUtil.copyToList(list, WarehouseMaterialCrkInfoEntity.class));
return entityPage;
}
}