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 e4f7e9db..ca9910d8 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 @@ -239,4 +239,20 @@ public class InvoicingThdApi { return Result.error("操作失败"); } } + + /** + * 查询退货单-已退货物料 + * + * @param dto + * @return + */ + @ApiOperation(value = "查询退货单-已退货物料", notes = "查询退货单-已退货物料") + @GetMapping(value = "/thdMaterialList") + public Result> thdMaterialList(InvoicingThdMainEntity dto) { + if (StringUtils.isBlank(dto.getThdNo())) { + return Result.error("缺少参数"); + } + List pageList = tuiHuoApi.thdMaterialList(dto); + return Result.OK(pageList); + } } 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 f9aee339..b434d178 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 @@ -33,4 +33,6 @@ public interface ITuiHuoApi { boolean transRead(InvoicingThdMainEntity dto); boolean requireTH(InvoicingThdMainEntity dto); + + List thdMaterialList(InvoicingThdMainEntity dto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java index afaba47b..3889804c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java @@ -17,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface NuInvoicingNuKcslMapper extends BaseMapper { List thdNuMaterialList(InvoicingThdMainEntity dto); + + List thdMaterialList(InvoicingThdMainEntity dto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml index e3577f48..c1bdd10d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml @@ -53,4 +53,50 @@ + + 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 8acf91c6..fd936067 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 @@ -522,4 +522,8 @@ public class ThdServiceImpl implements ITuiHuoApi { return true; } + @Override + public List thdMaterialList(InvoicingThdMainEntity dto) { + return nuKcslMapper.thdMaterialList(dto); + } }