From eb98331dd1e42b05198dd0db12eeb8bc6ebf46ab Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 24 Dec 2025 11:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=80=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E5=90=84=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingThdApi.java | 16 ++--- .../nu/modules/invoicing/api/ITuiHuoApi.java | 4 +- .../thd/service/impl/ThdServiceImpl.java | 58 ++++++++++++++----- 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java index 1f5ebba1..66ac1e94 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java @@ -74,11 +74,11 @@ public class InvoicingThdApi { if (StringUtils.isBlank(dto.getId())) { return Result.error("缺少参数"); } - boolean result = tuiHuoApi.startDirectiveServe(dto); - if (result) { - return Result.OK("操作成功"); + Map result = tuiHuoApi.startDirectiveServe(dto); + if ("0".equals(result.get("error_code"))) { + return Result.OK(result.get("msg")); } else { - return Result.error("操作失败"); + return Result.error(result.get("msg")); } } @@ -221,11 +221,11 @@ public class InvoicingThdApi { if (StringUtils.isBlank(dto.getId())) { return Result.error("缺少参数"); } - boolean result = tuiHuoApi.finishDirectiveServe(dto); - if (result) { - return Result.OK("操作成功"); + Map result = tuiHuoApi.finishDirectiveServe(dto); + if ("0".equals(result.get("error_code"))) { + return Result.OK(result.get("msg")); } else { - return Result.error("操作失败"); + return Result.error(result.get("msg")); } } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java index 329ba740..e3c1f79b 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java @@ -16,7 +16,7 @@ public interface ITuiHuoApi { List thdNuMaterialList(InvoicingThdMainEntity dto); - boolean startDirectiveServe(InvoicingThdMainEntity dto); + Map startDirectiveServe(InvoicingThdMainEntity dto); boolean startServe(InvoicingThdMainEntity dto); @@ -30,7 +30,7 @@ public interface ITuiHuoApi { Map submitThd(InvoicingThdMainEntity dto); - boolean finishDirectiveServe(InvoicingThdMainEntity dto); + Map finishDirectiveServe(InvoicingThdMainEntity dto); boolean finishServe(InvoicingThdMainEntity dto); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 9ffe5177..576b6cca 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -135,15 +135,34 @@ public class ThdServiceImpl implements ITuiHuoApi { @Override @Transactional(rollbackFor = Exception.class) - public boolean startDirectiveServe(InvoicingThdMainEntity dto) { + public Map startDirectiveServe(InvoicingThdMainEntity dto) { + Map r_ = Maps.newHashMap(); + InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); + p_.setId(dto.getId()); + InvoicingOrdersEntity v_ = invoicingOrdersApi.getDyThOrderInfo(p_); + if (v_ == null || StringUtils.isBlank(v_.getPoolId())) { + r_.put("error_code", "1"); + r_.put("msg", "此工单不存在"); + return r_; + } + String mainId = v_.getPoolId();//退货主表id + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity(); orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明 - orderEntity.setId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号） + orderEntity.setId(dto.getId());//退货指令id orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id - invoicingOrdersApi.beginDyThOrder(orderEntity); - - return true; + Map result = invoicingOrdersApi.beginDyThOrder(orderEntity); + if ("0".equals(result.get("error_code"))) { + //将状态改为已开始 + UpdateWrapper thUW = new UpdateWrapper<>(); + thUW.eq("id", mainId); + NuInvoicingThdMain m = new NuInvoicingThdMain(); + m.setId(mainId); + m.setStatus("1"); + thdMainMapper.updateById(m); + } + return result; } @@ -539,12 +558,15 @@ public class ThdServiceImpl implements ITuiHuoApi { @Override @Transactional(rollbackFor = Exception.class) - public boolean finishDirectiveServe(InvoicingThdMainEntity dto) { + public Map finishDirectiveServe(InvoicingThdMainEntity dto) { + Map r_ = Maps.newHashMap(); InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); p_.setId(dto.getId()); InvoicingOrdersEntity v_ = invoicingOrdersApi.getDyThOrderInfo(p_); - if(v_ == null || StringUtils.isBlank(v_.getPoolId())){ - return false; + if (v_ == null || StringUtils.isBlank(v_.getPoolId())) { + r_.put("error_code", "1"); + r_.put("msg", "此工单不存在"); + return r_; } String mainId = v_.getPoolId();//退货单id @@ -555,8 +577,10 @@ public class ThdServiceImpl implements ITuiHuoApi { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //检测是否已入库 - if(main == null || !"2".equals(main.getStatus())){ - return false; + if (main == null || !"2".equals(main.getStatus())) { + r_.put("error_code", "1"); + r_.put("msg", "退货单未入库"); + return r_; } InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity(); @@ -564,9 +588,17 @@ public class ThdServiceImpl implements ITuiHuoApi { orderEntity.setId(dto.getId());//退货指令的id orderEntity.setBizId(main.getThdNo()); orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id - invoicingOrdersApi.finishDyThOrder(orderEntity); - - return true; + Map result = invoicingOrdersApi.finishDyThOrder(orderEntity); + if ("0".equals(result.get("error_code"))) { + //将状态改为已开始 + UpdateWrapper thUW = new UpdateWrapper<>(); + thUW.eq("id", mainId); + NuInvoicingThdMain m = new NuInvoicingThdMain(); + m.setId(mainId); + m.setStatus("3"); + thdMainMapper.updateById(m); + } + return result; } @Override