From 5f25275afcdb768063681be1518a80cabf42a59e Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 20 Nov 2025 16:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 5 +++- .../java/com/nu/entity/CgdInfoEntity.java | 4 +--- .../modules/invoicing/api/IInvoicingApi.java | 2 +- .../cgd/entity/NuInvoicingCgdInfo.java | 2 ++ .../mapper/xml/NuInvoicingCgdInfoMapper.xml | 8 +++---- .../impl/NuInvoicingCgdMainServiceImpl.java | 24 ++++++++++++------- 6 files changed, 27 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 bce5912..b5b9b7e 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 @@ -211,7 +211,10 @@ public class InvoicingApi { @AutoLog(value = "作废采购单信息") @PostMapping(value = "/voidedCgdMain") public Result voidedCgdMain(@RequestBody CgdMainEntity cgdMainEntity, HttpServletRequest req) { - invoicingApi.voidedCgdMain(cgdMainEntity); + String result = invoicingApi.voidedCgdMain(cgdMainEntity); + if ("2".equals( result)){ + return Result.error("不是待入库状态，不可进行作废操作，请刷新页面!"); + } 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 6c127ec..e0d40c8 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 @@ -110,12 +110,10 @@ public class CgdInfoEntity implements Serializable { private BigDecimal totalPrice; - @TableField(exist = false) private java.lang.String categoryName; - @TableField(exist = false) private java.lang.String typeName; - @TableField(exist = false) private java.lang.String medicationName; + private java.lang.String materialUnits; // 格式化getter方法 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 5fd87a6..52ab3d1 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 emptiedQgInfo(); - void voidedCgdMain(CgdMainEntity cgdMainEntity); + String voidedCgdMain(CgdMainEntity cgdMainEntity); void updateWarehouserEnabled(MaterialInfoEntity materialInfoEntity); 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 9e06b6f..697bba3 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 @@ -157,6 +157,8 @@ public class NuInvoicingCgdInfo implements Serializable { private java.lang.String typeName; @TableField(exist = false) private java.lang.String medicationName; + @TableField(exist = false) + private java.lang.String materialUnits; // // 格式化getter方法 diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml index 285f6bb..3ad5d03 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml @@ -3,7 +3,7 @@ - select b.nu_id,b.wl_id,sum(purchase_quantity) as purchase_quantity from nu_invoicing_cgd_main a + select b.nu_id,b.wl_id,sum(purchase_quantity) as purchase_quantity,b.dhbl from nu_invoicing_cgd_main a inner join nu_invoicing_cgd_info b on a.id = b.cgd_id - where a.status in (0,1) + where a.status in (0,1) and a.cgd_type in (0,1) and b.nu_id = #{params.nuId} and b.wl_id = #{params.wlId} - GROUP BY b.nu_id,b.wl_id + GROUP BY b.nu_id,b.wl_id,b.dhbl \ No newline at end of file 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 2f80dbb..ec989f2 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 @@ -193,7 +193,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl listcg = cgdInfoMapper.selectWlNumList(cgdInfoParam); int cgdNum = 0; for(NuInvoicingCgdInfo cgdInfo : listcg){ - cgdNum += cgdInfo.getPurchaseQuantity(); + //cgdNum = 采购数量*兑换比例 + cgdNum += cgdInfo.getPurchaseQuantity() * Integer.parseInt(cgdInfo.getDhbl()); } - if(Integer.parseInt(upperLimit)<(totalQgsl + dqsl + cgdNum)){ - result = "5@"+ (totalQgsl + dqsl + cgdNum); + if(Integer.parseInt(upperLimit)<(totalQgsl + dqsl*Integer.parseInt(info.getDhbl()) + cgdNum)){ + result = "5@"+ (totalQgsl + dqsl*Integer.parseInt(info.getDhbl()) + cgdNum - Integer.parseInt(upperLimit)); break; } } @@ -533,13 +534,18 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl