From 6aae989a4000705a247dcf65adb5c2ba54d35580 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 14 Jan 2026 10:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E4=BC=A0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/pad/invoicing/api/InvoicingApi.java | 13 +++++++++++++ .../service/impl/DirectiveOrderPadServiceImpl.java | 6 ++++++ 2 files changed, 19 insertions(+) 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 c444a1e1..ee641d7c 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 @@ -3,15 +3,19 @@ package com.nu.modules.pad.invoicing.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nu.entity.*; import com.nu.modules.invoicing.api.IInvoicingApi; +import com.nu.modules.order.api.IDirectiveOrderApi; import io.netty.util.internal.StringUtil; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.List; import java.util.Map; @@ -26,6 +30,9 @@ public class InvoicingApi { @Autowired private IInvoicingApi invoicingApi; + @Autowired + private IDirectiveOrderApi directiveOrderApi; + @ApiOperation(value = "采购单-查询物料信息-分页列表查询", notes = "采购单-查询物料信息-分页列表查询") @GetMapping(value = "/queryInvoicingList") public Result> queryInvoicingList(MaterialInfoEntity materialInfoEntityDto, @@ -52,6 +59,12 @@ public class InvoicingApi { @AutoLog(value = "采购单-采购信息-添加",clientType="app", operateType = 2) @PostMapping(value = "/addShoppingCartList") public Result addShoppingCartList(@RequestBody List infoList) { + DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); + qgdInfoEntityDto.setBizTypeCode("CGD-CGWL"); + qgdInfoEntityDto.setBizType("采购单添加物料信息"); + qgdInfoEntityDto.setBizNo(""); + qgdInfoEntityDto.setOptType("添加"); + directiveOrderApi.addBizLog(qgdInfoEntityDto); Map pddMap = invoicingApi.queryPddStartInfo(null); if(!toBoolean(pddMap.get("success"))){ return Result.error(pddMap.get("message").toString()); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index 1377ffe8..16071d73 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -21,7 +21,9 @@ import com.nu.modules.biz.order.service.IDirectiveOrderService; import com.nu.modules.order.api.IDirectiveOrderApi; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -292,6 +294,10 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity) { + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + directiveOrderBizLogEntity.setOptEmpId(sysUser.getEmployessId()); + directiveOrderBizLogEntity.setOptTime(new Date()); DirectiveOrderBizLog directiveOrderBizLog = new DirectiveOrderBizLog(); BeanUtils.copyProperties(directiveOrderBizLogEntity, directiveOrderBizLog); String optEmpName = directiveOrderService.getEmployeeName(directiveOrderBizLogEntity.getOptEmpId());