From 8ec308c1d23be654f8b515658be93e9c7c243ec8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 21 Nov 2025 14:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 23 ++++++++-- .../java/com/nu/entity/CgdMainEntity.java | 3 ++ .../modules/invoicing/api/IInvoicingApi.java | 6 ++- .../cgd/entity/NuInvoicingCgdMain.java | 9 ++++ .../impl/NuInvoicingCgdMainServiceImpl.java | 46 ++++++++++++++++++- 5 files changed, 81 insertions(+), 6 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index b5b9b7e..0d70cfd 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -357,14 +357,31 @@ public class InvoicingApi { @ApiOperation(value="请购单改价", notes="请购单改价") @AutoLog(value = "请购单改价") @PostMapping(value = "/editPrice") - public Result editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) { - String result = invoicingApi.editPrice(cgdInfoEntityDto); + public Result> editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) { + Map 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 editIzNew(@RequestBody CgdMainEntity cgdMainEntityDto) { + String result = invoicingApi.editIzNew(cgdMainEntityDto); + return Result.OK("操作成功"); + } + + + @ApiOperation(value="修改采购单分享人信息", notes="修改采购单分享人信息") + @AutoLog(value = "修改采购单分享人信息") + @PostMapping(value = "/editShareInfo") + public Result editShareInfo(@RequestBody CgdMainEntity cgdMainEntityDto) { + String result = invoicingApi.editShareInfo(cgdMainEntityDto); + return Result.OK("操作成功"); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 714f3ef..500f431 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -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; } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 52ab3d1..01626ef 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -74,7 +74,11 @@ public interface IInvoicingApi { String pickingInfo(CgdInfoEntity cgdInfoEntityDto); - String editPrice(CgdInfoEntity cgdInfoEntityDto); + Map editPrice(CgdInfoEntity cgdInfoEntityDto); IPage queryPickingRecordList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); + + String editIzNew(CgdMainEntity cgdMainEntityDto); + + String editShareInfo(CgdMainEntity cgdMainEntityDto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java index efd62b2..3377f6a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -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 diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index cfe3c8e..0812f72 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -364,6 +364,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = cgdMain.getCgdInfoList(); for (NuInvoicingCgdInfo cgdInfo : cgdInfoList){ @@ -399,6 +400,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); List list = cgdMainMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); @@ -1030,13 +1032,33 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl editPrice(CgdInfoEntity cgdInfoEntityDto) { + Map 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 cgdInfoList = cgdInfoMapper.selectList(new QueryWrapper().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