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-19 14:06:52 +08:00
parent 9c53a7db92
commit f74e4081d4
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,13 +284,13 @@ public class InvoicingApi {
return Result.OK(pageList); return Result.OK(pageList);
} }
@ApiOperation(value = "查询出入库记录", notes = "查询出入库记录") @ApiOperation(value = "查询拣货记录", notes = "查询拣货记录")
@GetMapping(value = "/queryCrkList") @GetMapping(value = "/queryPickingRecordList")
public Result<IPage<WarehouseMaterialCrkInfoEntity>> queryCrkList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, public Result<IPage<WarehouseMaterialCrkInfoEntity>> queryPickingRecordList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
IPage<WarehouseMaterialCrkInfoEntity> pageList = invoicingApi.queryCrkList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req); IPage<WarehouseMaterialCrkInfoEntity> pageList = invoicingApi.queryPickingRecordList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req);
return Result.OK(pageList); return Result.OK(pageList);
} }

1
nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialCrkInfoEntity.java
View File

@ -62,6 +62,7 @@ public class WarehouseMaterialCrkInfoEntity implements Serializable {
private String jhPic; private String jhPic;
private BigDecimal oldPrice; private BigDecimal oldPrice;
private BigDecimal newPrice; private BigDecimal newPrice;
@Dict(dicCode = "crk_status")
private String crkStatus; private String crkStatus;
} }

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

@ -76,5 +76,5 @@ public interface IInvoicingApi {
String editPrice(CgdInfoEntity cgdInfoEntityDto); String editPrice(CgdInfoEntity cgdInfoEntityDto);
IPage<WarehouseMaterialCrkInfoEntity> queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); IPage<WarehouseMaterialCrkInfoEntity> queryPickingRecordList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req);
} }

1
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java
View File

@ -93,5 +93,6 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
private String jhPic; private String jhPic;
private BigDecimal oldPrice; private BigDecimal oldPrice;
private BigDecimal newPrice; private BigDecimal newPrice;
@Dict(dicCode = "crk_status")
private String crkStatus; private String crkStatus;
} }

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

@ -857,6 +857,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String pickingInfo(CgdInfoEntity cgdInfoEntityDto) { public String pickingInfo(CgdInfoEntity cgdInfoEntityDto) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<NuInvoicingCgdInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<NuInvoicingCgdInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id",cgdInfoEntityDto.getJhId()); queryWrapper.eq("id",cgdInfoEntityDto.getJhId());
//请购信息 //请购信息
@ -884,6 +886,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
} }
//-------------------------记录出入库记录-------------------------- //-------------------------记录出入库记录--------------------------
NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo(); NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo();
crkInfo.setCreateBy(loginUser.getRealname());
crkInfo.setCgdId(cgdInfo.getCgdId()); crkInfo.setCgdId(cgdInfo.getCgdId());
crkInfo.setNuId(cgdInfo.getNuId()); crkInfo.setNuId(cgdInfo.getNuId());
crkInfo.setWlId(cgdInfo.getWlId()); crkInfo.setWlId(cgdInfo.getWlId());
@ -945,7 +948,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdInfoMapper.updateById(cgdInfo); cgdInfoMapper.updateById(cgdInfo);
//更新主表拣货人信息 //更新主表拣货人信息
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//判断拣货人信息是否为空，不为空就给值 //判断拣货人信息是否为空，不为空就给值
if(StringUtils.isEmpty(cgdMain.getJhBy())){ if(StringUtils.isEmpty(cgdMain.getJhBy())){
cgdMain.setJhBy(loginUser.getRealname()); cgdMain.setJhBy(loginUser.getRealname());
@ -994,11 +996,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
} }
@Override @Override
public IPage<WarehouseMaterialCrkInfoEntity> queryCrkList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) { public IPage<WarehouseMaterialCrkInfoEntity> queryPickingRecordList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) {
NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo(); NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo();
BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo); BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo);
QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap()); QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap());
queryWrapper.eq("nu_id",warehouseMaterialCrkInfo.getNuId()); queryWrapper.eq("cgd_id",warehouseMaterialCrkInfo.getCgdId());
queryWrapper.eq("wl_id",warehouseMaterialCrkInfo.getWlId()); queryWrapper.eq("wl_id",warehouseMaterialCrkInfo.getWlId());
List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(queryWrapper); List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(queryWrapper);