diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java index 1e38d773..5e5e8ba0 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java @@ -116,6 +116,24 @@ public class InvoicingQldApi { } } + /** + * 请领单-移除物料 + * 传请领单号+物料id + * + * @param queryDto + * @return + */ + @ApiOperation(value = "请领单-移除物料", notes = "请领单-移除物料") + @PostMapping(value = "/deleteQldWl") + public Result deleteQldWl(@RequestBody InvoicingQldQueryEntity queryDto) { + boolean result = qinglingApi.deleteQldWl(queryDto); + if (result) { + return Result.OK("移除成功"); + } else { + return Result.error("移除失败"); + } + } + /** * 请领单-购物车-清空 * 传nuid+elderid @@ -330,4 +348,22 @@ public class InvoicingQldApi { } } + /** + * 请领单-调整物料数量 + * 传请领单号+物料id+物料数量 + * + * @param queryDto + * @return + */ + @ApiOperation(value = "请领单-调整物料数量", notes = "请领单-调整物料数量") + @PostMapping(value = "/updateQldWlSl") + public Result updateQldWlSl(@RequestBody InvoicingQldQueryEntity queryDto) { + boolean result = qinglingApi.updateQldWlSl(queryDto); + if (result) { + return Result.OK("修改成功"); + } else { + return Result.error("修改失败"); + } + } + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldQueryEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldQueryEntity.java index d15a8eb9..08ec6820 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldQueryEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldQueryEntity.java @@ -56,4 +56,9 @@ public class InvoicingQldQueryEntity{ */ private String searchContent; + /** + * 请领数量 + */ + private Integer qlNum; + } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java index 6851ae33..3b89a6ae 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java @@ -44,4 +44,8 @@ public interface IQinglingApi { boolean orderReturn(InvoicingQldMainEntity dto); boolean outbound(InvoicingQldMainEntity dto); + + boolean deleteQldWl(InvoicingQldQueryEntity queryDto); + + boolean updateQldWlSl(InvoicingQldQueryEntity queryDto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldInfoMapper.java index 1eb49876..7eb3ce84 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldInfoMapper.java @@ -23,4 +23,8 @@ public interface NuInvoicingQldInfoMapper extends BaseMapper List queryWlInfo(InvoicingQldQueryEntity queryDto); IPage pages(Page page, @Param("dto") NuInvoicingQldInfo dto); + + int deleteQldWl(InvoicingQldQueryEntity queryDto); + + int updateQldWlSl(InvoicingQldQueryEntity queryDto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml index 6fb7bd0b..2b0ee89c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml @@ -93,4 +93,12 @@ where info.qld_no = #{dto.qldNo} order by info.create_time desc + + + delete from nu_invoicing_qld_info where qld_no = #{qldNo} and wl_id = #{wlId} + + + + update nu_invoicing_qld_info set ql_num = #{qlNum} where qld_no = #{qldNo} and wl_id = #{wlId} + 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 dfe7487a..2dec3dd2 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 @@ -184,6 +184,14 @@ public class QingLingServiceImpl implements IQinglingApi { return invoicingQldGwcService.deletePhysics(queryDto.getGwcId()) > 0 ? true : false; } + @Override + public boolean deleteQldWl(InvoicingQldQueryEntity queryDto) { + if (StringUtils.isBlank(queryDto.getQldNo()) || StringUtils.isBlank(queryDto.getWlId())) { + return false; + } + return invoicingQldInfoMapper.deleteQldWl(queryDto) > 0 ? true : false; + } + @Override public boolean removeAllGwc(InvoicingQldQueryEntity queryDto) { if (StringUtils.isBlank(queryDto.getNuId()) || StringUtils.isBlank(queryDto.getElderId())) { @@ -787,4 +795,11 @@ public class QingLingServiceImpl implements IQinglingApi { return invoicingQldMainService.update(qldData, qw); } + @Override + public boolean updateQldWlSl(InvoicingQldQueryEntity queryDto) { + if (StringUtils.isBlank(queryDto.getQldNo()) || StringUtils.isBlank(queryDto.getWlId()) || queryDto.getQlNum() == null) { + return false; + } + return invoicingQldInfoMapper.updateQldWlSl(queryDto) > 0 ? true : false; + } }