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-21 14:35:53 +08:00
parent c45e82aaca
commit 8ec308c1d2
5 changed files with 81 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,14 +357,31 @@ public class InvoicingApi {
@ApiOperation(value="请购单改价", notes="请购单改价")
@AutoLog(value = "请购单改价")
@PostMapping(value = "/editPrice")
public Result<String> editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
String result = invoicingApi.editPrice(cgdInfoEntityDto);
public Result<Map<String,String>> editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
Map<String,String> result = invoicingApi.editPrice(cgdInfoEntityDto);
// if(StringUtils.equals("2",result)){
// return Result.error("入库数量错误，超过请购数量");
// }else if(StringUtils.equals("3",result)){
// return Result.error("销账数量错误，超过请购数量");
// }
return Result.OK("操作成功！");
return Result.OK(result);
}
@ApiOperation(value="修改订单不是新单子", notes="修改订单不是新单子")
@AutoLog(value = "修改订单不是新单子")
@PostMapping(value = "/editIzNew")
public Result<String> editIzNew(@RequestBody CgdMainEntity cgdMainEntityDto) {
String result = invoicingApi.editIzNew(cgdMainEntityDto);
return Result.OK("操作成功");
}
@ApiOperation(value="修改采购单分享人信息", notes="修改采购单分享人信息")
@AutoLog(value = "修改采购单分享人信息")
@PostMapping(value = "/editShareInfo")
public Result<String> editShareInfo(@RequestBody CgdMainEntity cgdMainEntityDto) {
String result = invoicingApi.editShareInfo(cgdMainEntityDto);
return Result.OK("操作成功");
}
}

3
nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
View File

@ -104,4 +104,7 @@ public class CgdMainEntity implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审核时间")
private Date wjTime;
private String izNew;
}

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

@ -74,7 +74,11 @@ public interface IInvoicingApi {
String pickingInfo(CgdInfoEntity cgdInfoEntityDto);
String editPrice(CgdInfoEntity cgdInfoEntityDto);
Map<String,String> editPrice(CgdInfoEntity cgdInfoEntityDto);
IPage<WarehouseMaterialCrkInfoEntity> queryPickingRecordList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req);
String editIzNew(CgdMainEntity cgdMainEntityDto);
String editShareInfo(CgdMainEntity cgdMainEntityDto);
}

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

@ -148,6 +148,15 @@ public class NuInvoicingCgdMain implements Serializable {
// 总价
private BigDecimal totalPrice;
/**是否是新的单子 Y是 N不是*/
private String izNew;
private String shareBy;
private String shareTel;
@TableField(exist = false)
private String qgdId;//临时变量，用于清空购物车id

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

@ -364,6 +364,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
qgdXlhInt++;
String cgdNo = sysUser.getOrgCode() + new SimpleDateFormat("yyyyMMdd").format(new Date()) + String.format("%03d", qgdXlhInt);
cgdMain.setCgdNo(cgdNo);
cgdMain.setIzNew("Y");
cgdMainMapper.insert(cgdMain);
List<NuInvoicingCgdInfo> cgdInfoList = cgdMain.getCgdInfoList();
for (NuInvoicingCgdInfo cgdInfo : cgdInfoList){
@ -399,6 +400,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
}
}
queryWrapper.orderByDesc("create_time");
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@ -1030,13 +1032,33 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
}
@Override
public String editPrice(CgdInfoEntity cgdInfoEntityDto) {
public Map<String,String> editPrice(CgdInfoEntity cgdInfoEntityDto) {
Map<String,String> map = new HashMap<>();
NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo();
cgdInfo.setId(cgdInfoEntityDto.getId());
cgdInfo.setArrivalPrice(cgdInfoEntityDto.getArrivalPrice());
// BeanUtils.copyProperties(cgdInfoEntityDto,cgdInfo);
cgdInfoMapper.updateById(cgdInfo);
return "1";
//查询采购单id
String cgdId = cgdInfoMapper.selectById(cgdInfo.getId()).getCgdId();
//查询采购单下的采购信息
List<NuInvoicingCgdInfo> cgdInfoList = cgdInfoMapper.selectList(new QueryWrapper<NuInvoicingCgdInfo>().eq("cgd_id",cgdId));
//汇总采购单的总价
BigDecimal totalPrice = new BigDecimal("0");
for (NuInvoicingCgdInfo info : cgdInfoList) {
BigDecimal price = new BigDecimal(info.getPurchaseQuantity()+"");
totalPrice = totalPrice.add(price.multiply(info.getArrivalPrice()));
}
//修改采购单总价
NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
cgdMain.setId(cgdId);
cgdMain.setTotalPrice(totalPrice);
cgdMainMapper.updateById(cgdMain);
map.put("totalPrice",totalPrice.toString());
return map;
}
@Override
@ -1055,4 +1077,24 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
return entityPage;
}
@Override
public String editIzNew(CgdMainEntity cgdMainEntityDto) {
NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
cgdMain.setId(cgdMainEntityDto.getId());
cgdMain.setIzNew("N");
cgdMainMapper.updateById(cgdMain);
return "1";
}
@Override
public String editShareInfo(CgdMainEntity cgdMainEntityDto) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
cgdMain.setId(cgdMainEntityDto.getId());
cgdMain.setShareBy(loginUser.getRealname());
cgdMain.setShareTel(loginUser.getUsername());
cgdMainMapper.updateById(cgdMain);
return "1";
}
}