From 5fa6c07ed3f47cc73b6fa93a83d3f4402b0d1263 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 3 Dec 2025 15:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E9=A2=86=E5=8D=95=EF=BC=9A=E5=90=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingQldApi.java | 19 +++++++++++++++---- .../qld/service/impl/QingLingServiceImpl.java | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java index 1d54408b..dad1ed0b 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java @@ -1,6 +1,7 @@ package com.nu.modules.pad.invoicing.api; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Maps; import com.nu.entity.*; import com.nu.modules.invoicing.api.IQinglingApi; import io.swagger.annotations.ApiOperation; @@ -270,7 +271,10 @@ public class InvoicingQldApi { } boolean result = qinglingApi.cancellation(dto); if (result) { - return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); + Map r_ = Maps.newHashMap(); + r_.put("result", qinglingApi.queryQldByQldNo(dto.getQldNo())); + r_.put("message","作废成功"); + return Result.OK(r_); } else { return Result.error("作废失败"); } @@ -312,7 +316,10 @@ public class InvoicingQldApi { } boolean result = qinglingApi.confirmReceipt(dto); if (result) { - return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); + Map r_ = Maps.newHashMap(); + r_.put("result", qinglingApi.queryQldByQldNo(dto.getQldNo())); + r_.put("message","收货成功"); + return Result.OK(r_); } else { return Result.error("收货失败"); } @@ -333,7 +340,10 @@ public class InvoicingQldApi { } boolean result = qinglingApi.orderReturn(dto); if (result) { - return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); + Map r_ = Maps.newHashMap(); + r_.put("result", qinglingApi.queryQldByQldNo(dto.getQldNo())); + r_.put("message","回退成功"); + return Result.OK(r_); } else { return Result.error("回退失败"); } @@ -353,7 +363,8 @@ public class InvoicingQldApi { return Result.error("缺少参数"); } Map result = qinglingApi.outbound(dto); - if("success".equals(result.get("status"))){ + if ("success".equals(result.get("status"))) { + result.put("message","出库成功"); result.put("result", qinglingApi.queryQldByQldNo(dto.getQldNo())); } return Result.ok(result); 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 e1360463..35040215 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 @@ -297,6 +297,7 @@ public class QingLingServiceImpl implements IQinglingApi { invoicingQldMainService.updateById(one); result.put("status", "success"); + result.put("message", "提交成功"); result.put("result",ownService.queryQldByQldNo(dto.getQldNo())); return result; } else {