From ee7f52ca3b9d2068ddaeb426a5282a518942f7ee Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 30 Apr 2026 13:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 4 ++-- .../java/com/nu/entity/CgdInfoEntity.java | 2 ++ .../java/com/nu/entity/CgdMainEntity.java | 2 ++ .../modules/invoicing/api/IInvoicingApi.java | 2 +- .../cgd/entity/NuInvoicingCgdInfo.java | 4 ++++ .../cgd/entity/NuInvoicingCgdMain.java | 2 ++ .../impl/NuInvoicingCgdMainServiceImpl.java | 22 +++++++++---------- .../NuConfigSuppliersApplyServiceImpl.java | 17 ++++++++++---- 8 files changed, 37 insertions(+), 18 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 5bb3a915..53691ec9 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 @@ -266,8 +266,8 @@ public class InvoicingApi { @AutoLog(value = "采购单-清空全部采购信息",clientType="app") @ApiOperation(value="采购单-清空全部采购信息", notes="采购单-清空全部采购信息") @DeleteMapping(value = "/emptiedQgInfo") - public Result emptiedQgInfo() { - invoicingApi.emptiedQgInfo(); + public Result emptiedQgInfo(@RequestParam(name="nuId",required=true) String nuId) { + invoicingApi.emptiedQgInfo(nuId); return Result.OK("清空成功!"); } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java index 7d97e152..86828c67 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java @@ -118,6 +118,8 @@ public class CgdInfoEntity implements Serializable { private java.lang.String typeName; private java.lang.String medicationName; private java.lang.String materialUnits; + private BigDecimal xjOrgPrice;//机构物料采购小计 + private BigDecimal xjSupPrice;//供应商物料到货小计 // 格式化getter方法 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 168e1521..341b55f5 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 @@ -77,6 +77,8 @@ public class CgdMainEntity implements Serializable { private String gysName; // 总价 private BigDecimal totalPrice; + // 供应商改价后的价格总价 + private BigDecimal arrivalTotlaPrice; /**审核时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 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 9fc469a4..7f663983 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 @@ -38,7 +38,7 @@ public interface IInvoicingApi { void deleteQgInfoById(String id); - void emptiedQgInfo(); + void emptiedQgInfo(String nuId); String voidedCgdMain(CgdMainEntity cgdMainEntity); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java index 4b4388d0..f4f30ad4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java @@ -198,6 +198,10 @@ public class NuInvoicingCgdInfo implements Serializable { private String manufacturer; private String materialImg; + private BigDecimal xjOrgPrice;//机构物料采购小计 + private BigDecimal xjSupPrice;//供应商物料到货小计 + + @TableField(exist = false) private Double kcsl; 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 4e1fb17d..0e21eb6c 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 @@ -204,6 +204,8 @@ public class NuInvoicingCgdMain implements Serializable { // 总价 private BigDecimal totalPrice; + // 供应商改价后的价格总价 + private BigDecimal arrivalTotlaPrice; /** * 是否是新的单子 Y是 N不是 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 8c5212c7..e42b89ab 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 @@ -449,7 +449,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl-1){ @@ -589,8 +591,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl()); + public void emptiedQgInfo(String nuId) { + qgdInfoMapper.delete(new QueryWrapper().eq(StringUtils.isNotBlank(nuId),"nu_id",nuId)); } @Override @@ -1683,24 +1685,22 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdMainList = BeanUtil.copyToList(mapList,CgdMainEntity.class); - - - - - List mapList2 = BeanUtil.copyToList(cgdMainList,NuInvoicingCgdMain.class); + List mapList2 = mapList; for (NuInvoicingCgdMain cgdMain : mapList2){ cgdMain.setIzNew("Y"); List cgdInfoList = cgdMain.getCgdInfoList(); @@ -1766,7 +1766,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getCkWlList(Page page, QueryWrapper queryWrapper) { queryWrapper.orderByAsc("pd_type"); - queryWrapper.orderByDesc("d.create_time"); + queryWrapper.orderByDesc("a.create_time"); return configMaterialInfoMapper.getCkWlList(page,queryWrapper); } @@ -1837,7 +1837,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = cgdBeanDto.getList(); for (CgdMainDto cgdMainDto : list) { - NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); - cgdMain.setIzGysConfirmed(cgdMainDto.getIzGysConfirmed()); - cgdMain.setId(cgdMainDto.getId()); - cgdMainMapper.updateById(cgdMain); List cgdInfoList = cgdMainDto.getCgdInfoList(); + BigDecimal totalPrice = new BigDecimal(0); for (CgdInfoDto cgdInfoDto : cgdInfoList) { NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo(); cgdInfo.setId(cgdInfoDto.getId()); cgdInfo.setArrivalPrice(cgdInfoDto.getArrivalPrice()); + BigDecimal sl = new BigDecimal(cgdInfoDto.getPurchaseQuantity()); + BigDecimal dj = cgdInfoDto.getArrivalPrice(); + BigDecimal wlzj = sl.multiply(dj); + cgdInfo.setXjSupPrice(wlzj); cgdInfoMapper.updateById(cgdInfo); + totalPrice = totalPrice.add(wlzj); } + //修改采购单总价 + NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); + cgdMain.setIzGysConfirmed(cgdMainDto.getIzGysConfirmed()); + cgdMain.setId(cgdMainDto.getId()); + cgdMain.setArrivalTotlaPrice(totalPrice); + cgdMainMapper.updateById(cgdMain); } } }