From 2996cb6844dcc26a37e243a7ab81758167cd111d Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 3 Dec 2025 16:52:58 +0800 Subject: [PATCH] =?UTF-8?q?pad=E6=8E=A5=E5=8F=A3-=E8=AF=B7=E9=A2=86?= =?UTF-8?q?=E5=8D=95-=E8=AF=B7=E9=A2=86=E8=BD=A6=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=9A=E8=BF=94=E5=9B=9E=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qld/service/impl/QingLingServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 3504021..9461e13 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -298,7 +298,7 @@ public class QingLingServiceImpl implements IQinglingApi { result.put("status", "success"); result.put("message", "提交成功"); - result.put("result",ownService.queryQldByQldNo(dto.getQldNo())); + result.put("result", ownService.queryQldByQldNo(dto.getQldNo())); return result; } else { //购物车-提交 @@ -311,6 +311,7 @@ public class QingLingServiceImpl implements IQinglingApi { //请购车未添加物料 if (CollectionUtils.isEmpty(gwcList)) { result.put("status", "empty"); + result.put("message", "请选择请领物料"); return result; } @@ -326,11 +327,19 @@ public class QingLingServiceImpl implements IQinglingApi { // 过滤disabledWlList，只保留在gwcList中也存在的wlId disabledWlList = disabledWlList.stream() + .filter(item -> item != null && item.getWlId() != null) .filter(item -> gwcWlIds.contains(item.getWlId())) .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(disabledWlList)) { result.put("status", "exist"); result.put("existList", disabledWlList); + + // 将materialName用顿号拼接 + String materialNames = disabledWlList.stream() + .map(InvoicingQldInfoEntity::getMaterialName) + .collect(Collectors.joining("、")); + result.put("message", "以下物料请领中，请勿重复请领：" + materialNames); return result; } } @@ -419,6 +428,7 @@ public class QingLingServiceImpl implements IQinglingApi { invoicingQldLogMapper.insert(logData); result.put("status", "success"); + result.put("message", "提交成功"); return result; }