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 1268c9a..d2f3947 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 @@ -1,6 +1,8 @@ package com.nu.modules.pad.invoicing.api; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.InvoicingQldGwcEntity; +import com.nu.entity.InvoicingQldQueryEntity; import com.nu.entity.MaterialCategoryEntity; import com.nu.entity.MaterialInfoEntity; import com.nu.modules.invoicing.api.IQinglingApi; @@ -28,6 +30,7 @@ public class InvoicingQldApi { /** * 物料树查询（库房中已有物料） + * * @param configMaterialCategory * @return */ @@ -41,18 +44,20 @@ public class InvoicingQldApi { /** * 获取物料三级分类对应类别下物料种类数量 + * * @param configMaterialCategory * @return */ - @ApiOperation(value="获取物料三级分类对应类别下物料种类数量", notes="获取物料三级分类对应类别下物料种类数量") + @ApiOperation(value = "获取物料三级分类对应类别下物料种类数量", notes = "获取物料三级分类对应类别下物料种类数量") @GetMapping(value = "/getTreeDataWlnum") - public Result> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { - Map pageList = qinglingApi.getTreeDataWlnum(configMaterialCategory); + public Result> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = qinglingApi.getTreeDataWlnum(configMaterialCategory); return Result.OK(pageList); } /** * 查询物料信息 + * * @param materialInfoEntityDto * @return */ @@ -62,8 +67,21 @@ public class InvoicingQldApi { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - IPage pageList = qinglingApi.queryInvoicingList(pageNo, pageSize, materialInfoEntityDto,req); + IPage pageList = qinglingApi.queryInvoicingList(pageNo, pageSize, materialInfoEntityDto, req); return Result.OK(pageList); } + + /** + * 请领单-购物车信息查询 + * + * @param queryDto + * @return + */ + @ApiOperation(value = "请领单-购物车信息查询", notes = "请领单-购物车信息查询") + @GetMapping(value = "/queryGwcInfo") + public Result> queryGwcInfo(InvoicingQldQueryEntity queryDto) { + List result = qinglingApi.queryGwcInfo(queryDto); + return Result.OK(result); + } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java deleted file mode 100644 index 09c8f1d..0000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.nu.modules.pad.qingling.api; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nu.entity.*; -import com.nu.modules.invoicing.api.IInvoicingApi; -import com.nu.modules.invoicing.api.IQinglingApi; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang.StringUtils; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/pad/qingling") -public class QinglingApi { - - - @Autowired - private IQinglingApi qinglingApi; - - @ApiOperation(value = "查询请领包下的信息", notes = "查询请领包下的信息") - @GetMapping(value = "/queryPackageList") - public Result> queryPackageList(MaterialInfoEntity materialInfoEntityDto, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = qinglingApi.queryPackageList(pageNo, pageSize, materialInfoEntityDto,req); - return Result.OK(pageList); - } - - - @ApiOperation(value = "查询请领包可请领的物料信息", notes = "查询请领包可请领的物料信息") - @GetMapping(value = "/queryWuliaoList") - public Result> queryWuliaoList(MaterialInfoEntity materialInfoEntityDto, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = qinglingApi.queryWuliaoList(pageNo, pageSize, materialInfoEntityDto,req); - return Result.OK(pageList); - } - - - @ApiOperation(value="请领包物料添加", notes="请领包物料添加") - @AutoLog(value = "请领包物料添加") - @PostMapping(value = "/addMaterialPackageList") - public Result addMaterialPackageList(@RequestBody List infoList) { - if (infoList == null || infoList.size() == 0){ - return Result.error("请选择要添加的物料！"); - } - String result = qinglingApi.addMaterialPackageList(infoList); - return Result.OK("添加成功！"); - } - - - @AutoLog(value = "通过id删除请购信息") - @ApiOperation(value="通过id删除请购信息", notes="通过id删除请购信息") - @DeleteMapping(value = "/deletePackageById") - public Result deletePackageById(@RequestParam(name="id",required=true) String id) { - qinglingApi.deletePackageById(id); - return Result.OK("删除成功!"); - } - - -} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java new file mode 100644 index 0000000..af2cbe3 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java @@ -0,0 +1,57 @@ +package com.nu.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 进销存-请领单-购物车 + * @Author: jeecg-boot + * @Date: 2025-11-26 + * @Version: V1.0 + */ +@Data +public class InvoicingQldGwcEntity { + + /** + * id + */ + private String id; + /** + * createBy + */ + private String createBy; + /** + * createTime + */ + private Date createTime; + /** + * updateBy + */ + private String updateBy; + /** + * updateTime + */ + private Date updateTime; + /** + * 库房id nu_warehouse_material_info.nu_id + */ + private String kfIf; + /** + * 物料id nu_config_material_info.id + */ + private String wlId; + /** + * 请领数量 + */ + private Integer qlNum; + /** + * nuid nu_base_info.nu_id + */ + private String nuId; + /** + * 长者id nu_biz_elder_info.id + */ + private String elderId; +} 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 new file mode 100644 index 0000000..9a7a954 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldQueryEntity.java @@ -0,0 +1,32 @@ +package com.nu.entity; + +import lombok.Data; + +/** + * @Description: 进销存-请领单-查询实体类 + * + */ +@Data +public class InvoicingQldQueryEntity{ + + /** + * id + */ + private String id; + /** + * 请领单单号 + */ + private String qldNo; + /** + * 节点类型 + */ + private String jdlx; + /** + * nuid nu_base_info.nu_id + */ + private String nuId; + /** + * 长者id nu_biz_elder_info.id + */ + private String elderId; +} 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 5cc6efe..2deb851 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 @@ -1,6 +1,8 @@ package com.nu.modules.invoicing.api; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.InvoicingQldGwcEntity; +import com.nu.entity.InvoicingQldQueryEntity; import com.nu.entity.MaterialCategoryEntity; import com.nu.entity.MaterialInfoEntity; @@ -16,4 +18,5 @@ public interface IQinglingApi { IPage queryInvoicingList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req); + List queryGwcInfo(InvoicingQldQueryEntity queryDto); } 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 09a0d49..9b720da 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 @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.entity.InvoicingQldGwcEntity; +import com.nu.entity.InvoicingQldQueryEntity; import com.nu.entity.MaterialCategoryEntity; import com.nu.entity.MaterialInfoEntity; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; @@ -11,6 +13,8 @@ import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; import com.nu.modules.invoicing.api.IQinglingApi; +import com.nu.modules.qld.entity.NuInvoicingQldGwc; +import com.nu.modules.qld.service.INuInvoicingQldGwcService; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; import org.apache.commons.lang.StringUtils; @@ -40,6 +44,9 @@ public class QingLingServiceImpl implements IQinglingApi { private ConfigMaterialInfoMapper configMaterialInfoMapper; @Autowired private BlWarehouseMaterialInfoMapper mterialInfoMapper; + //请领单购物车 + @Autowired + private INuInvoicingQldGwcService invoicingQldGwcService; @Override public List> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) { @@ -74,7 +81,7 @@ public class QingLingServiceImpl implements IQinglingApi { @Override public IPage queryInvoicingList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { - if(StringUtils.isEmpty(materialInfoEntityDto.getNuId()) || StringUtils.isEmpty(materialInfoEntityDto.getElderId())){ + if (StringUtils.isEmpty(materialInfoEntityDto.getNuId()) || StringUtils.isEmpty(materialInfoEntityDto.getElderId())) { return new Page<>(); } BlWarehouseMaterialInfo warehouseMaterialInfo = new BlWarehouseMaterialInfo(); @@ -98,4 +105,16 @@ public class QingLingServiceImpl implements IQinglingApi { return entityPage; } + @Override + public List queryGwcInfo(InvoicingQldQueryEntity queryDto) { + if (StringUtils.isBlank(queryDto.getNuId()) || StringUtils.isBlank(queryDto.getElderId())) { + return List.of(); + } + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("nu_id", queryDto.getNuId()); + qw.eq("elder_id", queryDto.getElderId()); + List list = invoicingQldGwcService.list(qw); + return BeanUtil.copyToList(list, InvoicingQldGwcEntity.class); + } + }