From f6a44a553e1e0c58608d63d275feb1e465946682 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 14 Jan 2026 11:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=B5=81=E7=A8=8B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=9A=E5=9B=9E=E9=80=80=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E3=80=81=E5=87=BA=E5=BA=93=E3=80=81=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=B8=89=E4=B8=AA=E7=8E=AF=E8=8A=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=20=E9=80=80=E8=B4=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=9A=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=8E=AF=E8=8A=82=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qld/service/impl/QingLingServiceImpl.java | 30 +++++++++++++++++++ .../thd/service/impl/ThdServiceImpl.java | 16 +++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) 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 d3968469..d229490f 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 @@ -22,6 +22,7 @@ import com.nu.modules.nu.entity.NuInvoicingNuCrkLog; import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.nu.modules.nu.service.INuInvoicingNuCrkLogService; import com.nu.modules.nu.service.INuInvoicingNuKcslService; +import com.nu.modules.order.api.IDirectiveOrderApi; import com.nu.modules.qld.entity.*; import com.nu.modules.qld.mapper.NuInvoicingQldGwcMapper; import com.nu.modules.qld.mapper.NuInvoicingQldInfoMapper; @@ -103,6 +104,8 @@ public class QingLingServiceImpl implements IQinglingApi { @Lazy @Autowired private QingLingServiceImpl ownService; + @Autowired + private IDirectiveOrderApi directiveOrderApi; @Override public List> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) { @@ -325,6 +328,14 @@ public class QingLingServiceImpl implements IQinglingApi { one.setTjTime(new Date());//作废时间 invoicingQldMainService.updateById(one); + //服务指令工单业务日志 + DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); + qgdInfoEntityDto.setBizTypeCode("QLD-TJ");// 业务类型编码 + qgdInfoEntityDto.setBizType("请领");// 业务类型名称 + qgdInfoEntityDto.setBizNo(dto.getQldNo());//业务主表单号 + qgdInfoEntityDto.setOptType("提交");//操作类型 + directiveOrderApi.addBizLog(qgdInfoEntityDto); + result.put("success", true); result.put("message", "提交成功"); result.put("result", ownService.queryQldByQldNo(dto.getQldNo())); @@ -910,6 +921,16 @@ public class QingLingServiceImpl implements IQinglingApi { } }); warehouseMaterialInfoService.updateBatchById(kfUpdateList); + + + //服务指令工单业务日志 + DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); + qgdInfoEntityDto.setBizTypeCode("QLD-SH");// 业务类型编码 + qgdInfoEntityDto.setBizType("请领");// 业务类型名称 + qgdInfoEntityDto.setBizNo(dto.getQldNo());//业务主表单号 + qgdInfoEntityDto.setOptType("收货");//操作类型 + directiveOrderApi.addBizLog(qgdInfoEntityDto); + result.put("success", true); result.put("message", "收货完成"); return result; @@ -1056,6 +1077,15 @@ public class QingLingServiceImpl implements IQinglingApi { qldData.setCkBy(sysUser.getId());//出库人 qldData.setCkTime(new Date());//出库时间 invoicingQldMainService.update(qldData, qw); + + //服务指令工单业务日志 + DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); + qgdInfoEntityDto.setBizTypeCode("QLD-CK");// 业务类型编码 + qgdInfoEntityDto.setBizType("请领");// 业务类型名称 + qgdInfoEntityDto.setBizNo(dto.getQldNo());//业务主表单号 + qgdInfoEntityDto.setOptType("出库");//操作类型 + directiveOrderApi.addBizLog(qgdInfoEntityDto); + map.put("success", true); map.put("message", "出库成功"); return map; 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 fa04ed73..efb18572 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 @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; -import com.nu.entity.InvoicingThdGwcEntity; -import com.nu.entity.InvoicingThdLogEntity; -import com.nu.entity.InvoicingThdMainEntity; -import com.nu.entity.NuKcslEntity; +import com.nu.entity.*; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; @@ -20,6 +17,7 @@ import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.nu.modules.nu.mapper.NuInvoicingNuKcslMapper; import com.nu.modules.nu.service.INuInvoicingNuCrkLogService; import com.nu.modules.nu.service.INuInvoicingNuKcslService; +import com.nu.modules.order.api.IDirectiveOrderApi; import com.nu.modules.thd.entity.NuInvoicingThdGwc; import com.nu.modules.thd.entity.NuInvoicingThdInfo; import com.nu.modules.thd.entity.NuInvoicingThdLog; @@ -78,6 +76,8 @@ public class ThdServiceImpl implements ITuiHuoApi { private INuWarehouseMaterialCrkInfoService warehouseMaterialCrkInfoService; @Autowired private ConfigMaterialInfoMapper configMaterialInfoMapper; + @Autowired + private IDirectiveOrderApi directiveOrderApi; @Override public IPage thdList(Integer pageNo, Integer pageSize, InvoicingThdMainEntity dto) { @@ -548,6 +548,14 @@ public class ThdServiceImpl implements ITuiHuoApi { // orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明 // invoicingThOrdersApi.updateOrderBizId(orderEntity); + //服务指令工单业务日志 + DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); + qgdInfoEntityDto.setBizTypeCode("THD-RK");// 业务类型编码 + qgdInfoEntityDto.setBizType("退货");// 业务类型名称 + qgdInfoEntityDto.setBizNo(main.getThdNo());//业务主表单号 + qgdInfoEntityDto.setOptType("入库");//操作类型 + directiveOrderApi.addBizLog(qgdInfoEntityDto); + return result; }