From e1e1adc9c8c8b75e1d8539d71154ce001ac08391 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 12 Jan 2026 15:00:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/modules/pad/invoicing/api/InvoicingApi.java | 2 +- .../modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 5a54b60a..c444a1e1 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 @@ -365,7 +365,7 @@ public class InvoicingApi { return Result.error("购物车最大可添加"+maxCount+"条采购信息，已超出限制，不可再进行采购"); } if("5".equals( result)){ - return Result.error("没有符合的物料数据，或物料重用中"); + return Result.error("当前物料已在购物车中，本次库存预警「添加全部」操作完成，购物车数量未变化"); } return Result.OK("添加成功！"); } 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 658d7c18..f0927a92 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 @@ -928,7 +928,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = mterialInfoMapper.queryCgdWaringList(page,queryWrapper); //供应商集合 List gysList = gysMapper.selectList(new QueryWrapper().eq("del_flag","0")); - int count = listqg.size(); + int count = 0; for(BlWarehouseMaterialInfo info : list){ String wlupperlimit = info.getUpperLimit()+"";