From b06dd9bd5d7d834373c29571c77776eb0f87de3b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 22 Oct 2025 16:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 7 +++++++ .../main/java/com/nu/entity/CgdInfoEntity.java | 1 + .../main/java/com/nu/entity/QgdInfoEntity.java | 10 ++++++++++ .../modules/invoicing/api/IInvoicingApi.java | 1 + .../mapper/xml/NuInvoicingCgdInfoMapper.xml | 3 ++- .../impl/NuInvoicingCgdMainServiceImpl.java | 18 ++++++++++++++++-- .../com/nu/modules/qgd/entity/QgdInfo.java | 12 ++++++++++++ .../nu/modules/qgd/mapper/QgdInfoMapper.java | 4 ++++ .../modules/qgd/mapper/xml/QgdInfoMapper.xml | 17 +++++++++++++++++ 9 files changed, 70 insertions(+), 3 deletions(-) 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 f2883a6..bdbe4f2 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 @@ -152,5 +152,12 @@ public class InvoicingApi { return Result.OK("清空成功!"); } + @ApiOperation(value="作废采购单信息", notes="作废采购单信息") + @AutoLog(value = "作废采购单信息") + @PostMapping(value = "/voidedCgdMain") + public Result voidedCgdMain(@RequestBody CgdMainEntity cgdMainEntity, HttpServletRequest req) { + invoicingApi.voidedCgdMain(cgdMainEntity); + return Result.OK("操作成功"); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java index 40d0592..eaf974d 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java @@ -93,4 +93,5 @@ public class CgdInfoEntity implements Serializable { private String tagType; private String tagName; private String wlParamInfo; + private String kcsl; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java index 3137deb..f420d17 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java @@ -1,6 +1,7 @@ package com.nu.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -75,4 +76,13 @@ public class QgdInfoEntity implements Serializable { /**参考单价*/ private String referenceUnitPrice; + private String kcsl; + private String wlParamInfo; + private String categoryId; + private String typeId; + private String medicationId; + private String materialImg; + private String tagType; + private String tagName; + } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 703c468..077695e 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -37,4 +37,5 @@ public interface IInvoicingApi { void emptiedQgInfo(); + void voidedCgdMain(CgdMainEntity cgdMainEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml index 4599aec..1e182f8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml @@ -3,9 +3,10 @@ \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 61c028a..acfb385 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -186,9 +186,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",nuInvoicingQgdInfo, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(qgdInfoEntityDto.getCategoryId()),"c.category_id",nuInvoicingQgdInfo.getCategoryId()); + queryWrapper.eq(StringUtils.isNotBlank(qgdInfoEntityDto.getTypeId()),"c.type_id",nuInvoicingQgdInfo.getTypeId()); + queryWrapper.eq(StringUtils.isNotBlank(qgdInfoEntityDto.getMedicationId()),"c.medication_id",nuInvoicingQgdInfo.getMedicationId()); + queryWrapper.apply(StringUtils.isNotBlank(qgdInfoEntityDto.getWlParamInfo()),"( c.material_name like '%"+qgdInfoEntityDto.getWlParamInfo()+"%' or c.material_no like '%"+qgdInfoEntityDto.getWlParamInfo()+"%' or c.pinyin like '%"+qgdInfoEntityDto.getWlParamInfo()+"%' or c.specification_model like '%"+qgdInfoEntityDto.getWlParamInfo()+"%' ) "); Page page = new Page(pageNo, pageSize); - List list = qgdInfoMapper.selectList(page, queryWrapper); + List list = qgdInfoMapper.queryShoppingCartList(page, queryWrapper); //封装返回结果 IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); entityPage.setRecords(BeanUtil.copyToList(list, QgdInfoEntity.class)); @@ -442,4 +446,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl()); } + + @Override + public void voidedCgdMain(CgdMainEntity cgdMainEntity) { + NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); + BeanUtils.copyProperties(cgdMainEntity,cgdMain); + cgdMain.setStatus("3"); + cgdMain.setCgdType("9"); + baseMapper.updateById(cgdMain); + + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java index 001fe7a..0023f37 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java @@ -110,5 +110,17 @@ public class QgdInfo implements Serializable { private String kcsl; @TableField(exist = false) private String wlParamInfo; + @TableField(exist = false) + private String categoryId; + @TableField(exist = false) + private String typeId; + @TableField(exist = false) + private String medicationId; + @TableField(exist = false) + private String materialImg; + @TableField(exist = false) + private String tagType; + @TableField(exist = false) + private String tagName; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java index 2045df3..ebea659 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java @@ -8,6 +8,8 @@ import com.nu.modules.qgd.entity.QgdInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 请购单-请购信息 * @Author: jeecg-boot @@ -17,4 +19,6 @@ import org.apache.ibatis.annotations.Param; public interface QgdInfoMapper extends BaseMapper { IPage queryListByUser(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List queryShoppingCartList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml index 1547aaa..066eed1 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml @@ -13,4 +13,21 @@ ${ew.customSqlSegment} + + \ No newline at end of file