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 585283aa..7556e135 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 @@ -53,10 +53,14 @@ public class InvoicingApi { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"suppliers_id", materialInfoEntity.getSuppliers()); - queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"nu_id", materialInfoEntity.getNuId()); + queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"suppliers", materialInfoEntity.getSuppliers()); + queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"NOT EXISTS ( SELECT 1 FROM nu_invoicing_qgd_info b WHERE b.wl_id = a.wl_id and b.suppliers_id = a.suppliers_id AND b.nu_id = '"+materialInfoEntity.getNuId()+"')"); queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"wl_id", materialInfoEntity.getWlId()); + queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getTypeId()),"type_id", materialInfoEntity.getTypeId()); queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntity.getWlParamInfo()),"( material_name like '%"+materialInfoEntity.getWlParamInfo()+"%' or material_no like '%"+materialInfoEntity.getWlParamInfo()+"%' or pinyin like '%"+materialInfoEntity.getWlParamInfo()+"%' or specification_model like '%"+materialInfoEntity.getWlParamInfo()+"%' ) "); + if(StringUtils.isNotBlank(materialInfoEntity.getIds())){ + queryWrapper.in( "suppliers", materialInfoEntity.getIds().split(",")); + } Page page = new Page(pageNo, pageSize); IPage pageList = invoicingApi.wlShoppingList(page, queryWrapper); return Result.OK(pageList); @@ -151,12 +155,6 @@ public class InvoicingApi { } - @ApiOperation(value="采购单-获取采购单数量", notes="采购单-获取采购单数量") - @GetMapping(value = "/getCgdListNum") - public Result> getCgdListNum(CgdMainEntity cgdMainEntityDto) { - Map pageList = invoicingApi.getCgdListNum(cgdMainEntityDto); - return Result.OK(pageList); - } @ApiOperation(value = "采购单-查询采购单详细信息", notes = "采购单-查询采购单详细信息") @GetMapping(value = "/queryCgdInfoList") @@ -169,57 +167,11 @@ public class InvoicingApi { } - @ApiOperation(value="采购单-审核采购单信息", notes="采购单-审核采购单信息") - @AutoLog(value = "采购单-审核采购单信息",clientType="app") - @PostMapping(value = "/reviewPurchaseOrder") - public Result reviewPurchaseOrder(CgdMainEntity cgdMainEntity, HttpServletRequest req) { - invoicingApi.reviewPurchaseOrder(cgdMainEntity); - return Result.OK("操作成功"); - } - @ApiOperation(value="采购单-获取物料分类树（采购列表使用）", notes="采购单-获取物料分类树（采购列表使用）") - @GetMapping(value = "/getMaterialTreeData") - public Result>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { - configMaterialCategory.setIzEnabled("Y"); - List> pageList = invoicingApi.getMaterialTreeData(configMaterialCategory); - return Result.OK(pageList); - } - @ApiOperation(value="采购单-获取物料分类树（购物车使用）", notes="采购单-获取物料分类树（购物车使用）") - @GetMapping(value = "/getGwcMaterialTreeData") - public Result>> getGwcMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { - configMaterialCategory.setIzEnabled("Y"); - List> pageList = invoicingApi.getGwcMaterialTreeData(configMaterialCategory); - return Result.OK(pageList); - } - @ApiOperation(value="采购单-获取物料分类树（采购单使用）", notes="采购单-获取物料分类树（采购单使用）") - @GetMapping(value = "/getCgdMaterialTreeData") - public Result>> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { - configMaterialCategory.setIzEnabled("Y"); - List> pageList = invoicingApi.getCgdMaterialTreeData(configMaterialCategory); - return Result.OK(pageList); - } - - - @ApiOperation(value="采购单-获取物料分类树（库存预警使用）", notes="采购单-获取物料分类树（库存预警使用）") - @GetMapping(value = "/getWaringMaterialTreeData") - public Result>> getWaringMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { - configMaterialCategory.setIzEnabled("Y"); - List> pageList = invoicingApi.getWaringMaterialTreeData(configMaterialCategory); - return Result.OK(pageList); - } - - - @ApiOperation(value="采购单-修改库房启用停用", notes="采购单-修改库房启用停用") - @AutoLog(value = "采购单-修改库房启用停用",clientType="app") - @PostMapping(value = "/updateKfstatus") - public Result updateKfstatus(@RequestBody NuBaseInfoEntity nuBaseInfoEntity) { - invoicingApi.updateKfstatus(nuBaseInfoEntity); - return Result.OK("修改成功！"); - } @ApiOperation(value = "采购单-通过nuId获取单元信息", notes = "采购单-通过nuId获取单元信息") @@ -286,21 +238,8 @@ public class InvoicingApi { - @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（购物车列表使用）", notes="采购单-获取物料分类树可采购的物料数量（购物车列表使用）") - @GetMapping(value = "/getGwcTreeDataWlnum") - public Result> getGwcTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { - Map pageList = invoicingApi.getGwcTreeDataWlnum(configMaterialCategory); - return Result.OK(pageList); - } - @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（采购单列表使用）", notes="采购单-获取物料分类树可采购的物料数量（采购单列表使用）") - @GetMapping(value = "/getCgdTreeDataWlnum") - public Result> getCgdTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { - Map pageList = invoicingApi.getCgdTreeDataWlnum(configMaterialCategory); - return Result.OK(pageList); - } - @ApiOperation(value = "采购单-查询全部供应商信息", notes = "采购单-查询全部供应商信息") @GetMapping(value = "/getGysList") @@ -318,13 +257,24 @@ public class InvoicingApi { return Result.OK(pageList); } + + @ApiOperation(value = "采购单-拣货照片上传", notes = "采购单-拣货照片上传") + @PostMapping(value = "/saveJhzpList") + public Result saveJhzpList(@RequestBody List saveList) { + if(saveList == null || saveList.size()==0){ + return Result.error("拣货照片上传数据错误"); + } + String result = invoicingApi.saveJhzpList(saveList); + return Result.OK(result); + } + @ApiOperation(value = "采购单-查询拣货照片集合", notes = "采购单-查询拣货照片集合") @GetMapping(value = "/queryJhzpList") - public Result>> queryCgdInfoList(WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, + public Result>> queryCgdInfoList(NuInvoicingCgdJhPicEntity nuInvoicingCgdJhPicEntity, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - List> pageList = invoicingApi.queryJhzpList(pageNo, pageSize, warehouseMaterialCrkInfoEntityDto,req); + List> pageList = invoicingApi.queryJhzpList(pageNo, pageSize, nuInvoicingCgdJhPicEntity,req); return Result.OK(pageList); } @@ -364,23 +314,6 @@ public class InvoicingApi { return Result.OK(pageList); } - @ApiOperation(value="采购单-库存预警添加全部物料", notes="采购单-库存预警添加全部物料") - @AutoLog(value = "采购单-库存预警添加全部物料",clientType="app", operateType = 2) - @PostMapping(value = "/addWaringAll") - public Result addWaringAll(@RequestBody CgdInfoEntity cgdInfoEntityDto) { - if(StringUtils.isEmpty(cgdInfoEntityDto.getNuId())){ - return Result.error("请选择库房"); - } - Integer maxCount = 100;//最大可添加数量 - String result = invoicingApi.addWaringAll(cgdInfoEntityDto,maxCount); - if("4".equals( result)){ - return Result.error("购物车最大可添加"+maxCount+"条采购信息，已超出限制，不可再进行采购"); - } - if("5".equals( result)){ - return Result.error("当前物料已在购物车中，本次库存预警「添加全部」操作完成，购物车数量未变化"); - } - return Result.OK("添加成功！"); - } @ApiOperation(value="采购单-拣货物料", notes="采购单-拣货物料") @AutoLog(value = "采购单-拣货物料",clientType="app", operateType = 2) @@ -569,6 +502,11 @@ public class InvoicingApi { } + /** + * 盘点进度 + * @param materialInfoEntity + * @return + */ @GetMapping(value = "/getPdjd") public Result> getPdjd(MaterialInfoEntity materialInfoEntity) { if(StringUtils.isBlank(materialInfoEntity.getNuId())){ @@ -578,5 +516,86 @@ public class InvoicingApi { return Result.OK(pageList); } + /** + * 拣货进度 + * @param cgdMainEntity + * @return + */ + @GetMapping(value = "/getJhjd") + public Result> getJhjd(CgdMainEntity cgdMainEntity) { + if(StringUtils.isBlank(cgdMainEntity.getCgdId())){ + return Result.error("参数错误，请选择采购单"); + } + Map pageList = invoicingApi.getJhjd(cgdMainEntity); + return Result.OK(pageList); + } + + @ApiOperation(value="采购单-获取采购单数量", notes="采购单-获取采购单数量") + @GetMapping(value = "/getCgdListNum") + public Result> getCgdListNum(CgdMainEntity cgdMainEntityDto) { + Map pageList = invoicingApi.getCgdListNum(cgdMainEntityDto); + return Result.OK(pageList); + } + + + @ApiOperation(value="采购单-获取物料分类树（采购列表使用）", notes="采购单-获取物料分类树（采购列表使用）") + @GetMapping(value = "/getMaterialTreeData") + public Result>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("Y"); + List> pageList = invoicingApi.getMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + + + + + @ApiOperation(value="采购单-获取物料分类树（采购单使用）", notes="采购单-获取物料分类树（采购单使用）") + @GetMapping(value = "/getCgdMaterialTreeData") + public Result>> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("Y"); + List> pageList = invoicingApi.getCgdMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + + @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（采购单列表使用）", notes="采购单-获取物料分类树可采购的物料数量（采购单列表使用）") + @GetMapping(value = "/getCgdTreeDataWlnum") + public Result> getCgdTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getCgdTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } + + + + @ApiOperation(value="采购单-获取待采购物料分类树（待采购列表使用）", notes="采购单-获取物料分类树（待采购列表使用）") + @GetMapping(value = "/getDcgMaterialTreeData") + public Result>> getDcgMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("Y"); + List> pageList = invoicingApi.getDcgMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + @ApiOperation(value="采购单-待采购的物料数量（待采购列表使用）", notes="采购单-待采购的物料数量（待采购列表使用）") + @GetMapping(value = "/getDcgTreeDataWlnum") + public Result> getDcgTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getDcgTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } + + @ApiOperation(value="采购单-获取物料分类树（购物车使用）", notes="采购单-获取物料分类树（购物车使用）") + @GetMapping(value = "/getGwcMaterialTreeData") + public Result>> getGwcMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("Y"); + List> pageList = invoicingApi.getGwcMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（购物车列表使用）", notes="采购单-获取物料分类树可采购的物料数量（购物车列表使用）") + @GetMapping(value = "/getGwcTreeDataWlnum") + public Result> getGwcTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map pageList = invoicingApi.getGwcTreeDataWlnum(configMaterialCategory); + return Result.OK(pageList); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 8259c492..416e4a1a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -123,6 +123,7 @@ public class CgdMainEntity implements Serializable { private String sysOrgCode; private String izNew; private String departName; + private String orgAddress; private String[] qgdIds; /** * 供应商是否确认 N未确认 Y已确认 @@ -135,5 +136,6 @@ public class CgdMainEntity implements Serializable { private String izGuazhang;; private String ids;; private String typeId;; + private String cgdId;; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index 6d34c1e2..edf724f5 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -124,4 +124,5 @@ public class MaterialInfoEntity implements Serializable { private BigDecimal salesUnitPrice;//采购单位 private String salesUnit;//采购价格 + private String ids;//app查询条件，用于供应商集合 } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuInvoicingCgdJhPicEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuInvoicingCgdJhPicEntity.java new file mode 100644 index 00000000..0ddb10dd --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuInvoicingCgdJhPicEntity.java @@ -0,0 +1,54 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +@Data +public class NuInvoicingCgdJhPicEntity implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + /**创建人*/ + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**采购单信息id*/ + @ApiModelProperty(value = "采购单信息id") + private String cgdInfoId; + /**采购单id*/ + @ApiModelProperty(value = "采购单id") + private String cgdId; + /**拣货图片*/ + @ApiModelProperty(value = "拣货图片") + private String jhPic; + /**物料id*/ + @ApiModelProperty(value = "物料id") + private String wlId; +} 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 2f6fa9ac..1627ef1d 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 @@ -24,8 +24,6 @@ public interface IInvoicingApi { IPage queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req); - void reviewPurchaseOrder(CgdMainEntity cgdMainEntity); - List> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory); void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity); @@ -66,7 +64,7 @@ public interface IInvoicingApi { List> getCgrList(CgdMainEntity cgdMainEntityDto); - List> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req); + List> queryJhzpList(Integer pageNo, Integer pageSize, NuInvoicingCgdJhPicEntity nuInvoicingCgdJhPicEntity, HttpServletRequest req); String addSxd(CgdSxdEntity cgdSxdEntityDto); @@ -109,4 +107,12 @@ public interface IInvoicingApi { InvoicingPddInfoEntity generatedPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity); Map getPdjd(MaterialInfoEntity materialInfoEntity); + + Map getJhjd(CgdMainEntity cgdMainEntity); + + String saveJhzpList(List saveList); + + List> getDcgMaterialTreeData(MaterialCategoryEntity configMaterialCategory); + + Map getDcgTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java index 0306dedd..e2a2d2b9 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java @@ -31,4 +31,6 @@ public interface ConfigMaterialCategoryMapper extends BaseMapper getWaringMaterialTreeData(@Param("params") ConfigMaterialCategory configMaterialCategory); List getAllWarehouseInfoList(@Param("params") ConfigMaterialCategory configMaterialCategory); + + List getDcgMaterialTreeData(@Param("params") ConfigMaterialCategory configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml index 70b7aa4d..a1ba4469 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml @@ -43,12 +43,20 @@ and a.iz_enabled = 'Y' GROUP BY b.category_id, b.type_id, b.medication_id + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index 4869d22f..0e26b5e4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -78,7 +78,7 @@ + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialInfoService.java index 3d8f1b65..7b7645fa 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialInfoService.java @@ -1,5 +1,7 @@ package com.nu.modules.bizSuppliers.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,4 +19,6 @@ public interface INuBizSuppliersMaterialInfoService extends IService noList(List list); void saveBacthMaterial(Map map); + + List getDcgTreeDataWlnum(QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java index 8d741e1b..e92fe84f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.SuppliersInfoMQDto; import com.nu.dto.SuppliersMaterialInfoDto; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersInfo; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialType; @@ -113,4 +114,9 @@ public class NuBizSuppliersMaterialInfoServiceImpl extends ServiceImpl getDcgTreeDataWlnum(QueryWrapper queryWrapper) { + return baseMapper.getDcgTreeDataWlnum(queryWrapper); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdJhPicController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdJhPicController.java new file mode 100644 index 00000000..2a9a6d01 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdJhPicController.java @@ -0,0 +1,180 @@ +package com.nu.modules.cgd.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.cgd.entity.NuInvoicingCgdJhPic; +import com.nu.modules.cgd.service.INuInvoicingCgdJhPicService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +@Api(tags="采购单拣货照片") +@RestController +@RequestMapping("/cgd/nuInvoicingCgdJhPic") +@Slf4j +public class NuInvoicingCgdJhPicController extends JeecgController { + @Autowired + private INuInvoicingCgdJhPicService nuInvoicingCgdJhPicService; + + /** + * 分页列表查询 + * + * @param nuInvoicingCgdJhPic + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "采购单拣货照片-分页列表查询") + @ApiOperation(value="采购单拣货照片-分页列表查询", notes="采购单拣货照片-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuInvoicingCgdJhPic nuInvoicingCgdJhPic, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdJhPic, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingCgdJhPicService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuInvoicingCgdJhPic + * @return + */ + @AutoLog(value = "采购单拣货照片-添加") + @ApiOperation(value="采购单拣货照片-添加", notes="采购单拣货照片-添加") + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuInvoicingCgdJhPic nuInvoicingCgdJhPic) { + nuInvoicingCgdJhPicService.save(nuInvoicingCgdJhPic); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuInvoicingCgdJhPic + * @return + */ + @AutoLog(value = "采购单拣货照片-编辑") + @ApiOperation(value="采购单拣货照片-编辑", notes="采购单拣货照片-编辑") + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuInvoicingCgdJhPic nuInvoicingCgdJhPic) { + nuInvoicingCgdJhPicService.updateById(nuInvoicingCgdJhPic); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "采购单拣货照片-通过id删除") + @ApiOperation(value="采购单拣货照片-通过id删除", notes="采购单拣货照片-通过id删除") + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuInvoicingCgdJhPicService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "采购单拣货照片-批量删除") + @ApiOperation(value="采购单拣货照片-批量删除", notes="采购单拣货照片-批量删除") + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuInvoicingCgdJhPicService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "采购单拣货照片-通过id查询") + @ApiOperation(value="采购单拣货照片-通过id查询", notes="采购单拣货照片-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuInvoicingCgdJhPic nuInvoicingCgdJhPic = nuInvoicingCgdJhPicService.getById(id); + if(nuInvoicingCgdJhPic==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuInvoicingCgdJhPic); + } + + /** + * 导出excel + * + * @param request + * @param nuInvoicingCgdJhPic + */ + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuInvoicingCgdJhPic nuInvoicingCgdJhPic) { + return super.exportXls(request, nuInvoicingCgdJhPic, NuInvoicingCgdJhPic.class, "采购单拣货照片"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("cgd:nu_invoicing_cgd_jh_pic:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuInvoicingCgdJhPic.class); + } + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdJhPic.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdJhPic.java new file mode 100644 index 00000000..44b965fe --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdJhPic.java @@ -0,0 +1,73 @@ +package com.nu.modules.cgd.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +@Data +@TableName("nu_invoicing_cgd_jh_pic") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_invoicing_cgd_jh_pic对象", description="采购单拣货照片") +public class NuInvoicingCgdJhPic implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**采购单信息id*/ + @Excel(name = "采购单信息id", width = 15) + @ApiModelProperty(value = "采购单信息id") + private java.lang.String cgdInfoId; + /**采购单id*/ + @Excel(name = "采购单id", width = 15) + @ApiModelProperty(value = "采购单id") + private java.lang.String cgdId; + /**拣货图片*/ + @Excel(name = "拣货图片", width = 15) + @ApiModelProperty(value = "拣货图片") + private java.lang.String jhPic; + /**物料id*/ + @Excel(name = "物料id", width = 15) + @ApiModelProperty(value = "物料id") + private java.lang.String wlId; +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java index 7b91dcb3..54f293b1 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -267,5 +267,7 @@ public class NuInvoicingCgdMain implements Serializable { private BigDecimal xiaoJi; @TableField(exist = false) private String departName; + @TableField(exist = false) + private String orgAddress; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java index 830edad2..655e16d4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.entity.CgdMainEntity; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; import org.apache.ibatis.annotations.Param; import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; @@ -30,4 +31,5 @@ public interface NuInvoicingCgdInfoMapper extends BaseMapper List getFkdList(@Param("params") NuInvoicingCgdInfo nuInvoicingCgdInfo); NuInvoicingCgdMain getIzGuazhang(@Param("cgdId") String cgdId); + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdJhPicMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdJhPicMapper.java new file mode 100644 index 00000000..3efb5e18 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdJhPicMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.cgd.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.cgd.entity.NuInvoicingCgdJhPic; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +public interface NuInvoicingCgdJhPicMapper extends BaseMapper { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java index 1b501e8d..bef5732f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java @@ -2,6 +2,7 @@ package com.nu.modules.cgd.mapper; import java.util.List; +import com.aliyun.apache.hc.core5.annotation.Contract; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -29,4 +30,6 @@ public interface NuInvoicingCgdMainMapper extends BaseMapper List getCgdListNum(@Param("params") CgdMainEntity cgdMainEntityDto); + + List selectCgdList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 c1200c26..d4a4a4dc 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 @@ -88,4 +88,6 @@ SELECT cgd_id as id FROM nu_invoicing_cgd_info WHERE cgd_id = #{cgdId} and wrksl > 0 LIMIT 1 + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdJhPicMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdJhPicMapper.xml new file mode 100644 index 00000000..dec6aa70 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdJhPicMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml index f08f5922..69034809 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml @@ -52,4 +52,11 @@ + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdJhPicService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdJhPicService.java new file mode 100644 index 00000000..7ede1747 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdJhPicService.java @@ -0,0 +1,14 @@ +package com.nu.modules.cgd.service; + +import com.nu.modules.cgd.entity.NuInvoicingCgdJhPic; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +public interface INuInvoicingCgdJhPicService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdJhPicServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdJhPicServiceImpl.java new file mode 100644 index 00000000..e0602257 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdJhPicServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.cgd.service.impl; + +import com.nu.modules.cgd.entity.NuInvoicingCgdJhPic; +import com.nu.modules.cgd.mapper.NuInvoicingCgdJhPicMapper; +import com.nu.modules.cgd.service.INuInvoicingCgdJhPicService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 采购单拣货照片 + * @Author: jeecg-boot + * @Date: 2026-05-15 + * @Version: V1.0 + */ +@Service +public class NuInvoicingCgdJhPicServiceImpl extends ServiceImpl implements INuInvoicingCgdJhPicService { + +} 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 555f0bd2..e7f27f2c 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 @@ -14,14 +14,12 @@ import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; 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.cgd.entity.NuInvoicingCgdInfo; -import com.nu.modules.cgd.entity.NuInvoicingCgdMain; -import com.nu.modules.cgd.entity.NuInvoicingCgdSxd; -import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; -import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; -import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; -import com.nu.modules.cgd.mapper.NuInvoicingCgdSxdMapper; -import com.nu.modules.cgd.mapper.NuWarehouseMaterialCrkInfoMapper; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersInfo; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersInfoService; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersMaterialInfoService; +import com.nu.modules.cgd.entity.*; +import com.nu.modules.cgd.mapper.*; import com.nu.modules.cgd.service.INuInvoicingCgdMainService; import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo; import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper; @@ -86,6 +84,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap(), customeRuleMap); - queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')"); - queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers()); - queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy()); - queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime()); - queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime()); - queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId()); + queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(a.cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')"); + queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"a.gys_id",cgdMainEntityDto.getSuppliers()); + queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"a.qg_by",cgdMainEntityDto.getCgBy()); + queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"a.qg_date",cgdMainEntityDto.getStartTime()); + queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"a.qg_date",cgdMainEntityDto.getEndTime()); + queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"a.nu_id",cgdMainEntityDto.getNuId()); if(StringUtils.isNotBlank(cgdMainEntityDto.getIds())){ - queryWrapper.in("id",cgdMainEntityDto.getIds().split(",")); + queryWrapper.in("a.id",cgdMainEntityDto.getIds().split(",")); } - queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus()); + queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"a.status",cgdMainEntityDto.getStatus()); if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){ if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){ - queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(",")); + queryWrapper.in("a.cgd_type",cgdMainEntityDto.getCgdType().split(",")); }else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){ - queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType()); + queryWrapper.eq("a.cgd_type",cgdMainEntityDto.getCgdType()); } } - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("a.create_time"); Page page = new Page<>(pageNo, pageSize); - List list = cgdMainMapper.selectList(page,queryWrapper); + List list = cgdMainMapper.selectCgdList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); entityPage.setRecords(BeanUtil.copyToList(list, CgdMainEntity.class)); return entityPage; @@ -514,18 +518,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl().eq("cgd_id",cgdMainEntity.getId())); - for(CgdInfoEntity cgdInfoEntity : cgdMainEntity.getCgdInfoList()){ - NuInvoicingCgdInfo nuInvoicingCgdInfo = new NuInvoicingCgdInfo(); - BeanUtils.copyProperties(cgdInfoEntity,nuInvoicingCgdInfo); - cgdInfoMapper.insert(nuInvoicingCgdInfo); - } - baseMapper.updateById(cgdMain); - } @Override public List> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) { @@ -535,6 +527,34 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> getDcgMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) { + ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); + BeanUtils.copyProperties(materialCategoryEntity,configMaterialCategory); + List> pageList = configMaterialCategoryService.getDcgMaterialTreeData(configMaterialCategory); + return pageList; + } + + @Override + public Map getDcgTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { + Map map = new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getCategoryId()),"b.category_id",configMaterialCategory.getCategoryId()); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getTypeId()),"b.type_id",configMaterialCategory.getTypeId()); + queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getMedicationId()),"b.medication_id",configMaterialCategory.getMedicationId()); + if(StringUtils.isNotBlank(configMaterialCategory.getSuppliers())){ + queryWrapper.in("a.suppliers_id",configMaterialCategory.getSuppliers().split(",")); + } + queryWrapper.in(StringUtils.isNotBlank(configMaterialCategory.getNuId()),"a.nu_id",configMaterialCategory.getNuId()); + List list = nuBizSuppliersMaterialInfoService.getDcgTreeDataWlnum(queryWrapper); + map.put("success",true); + map.put("message","物料数量"); + map.put("totalSize",list.size()); + map.put("ids",configMaterialCategory.getSuppliers()); + return map; + } + @Override public void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity) { NuBaseInfo nuBaseInfo = new NuBaseInfo(); @@ -631,23 +651,26 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { Map map = new HashMap<>(); QueryWrapper queryWrapper = new QueryWrapper(); - if(StringUtils.isEmpty(configMaterialCategory.getNuId())){ - map.put("success",false); - map.put("message","参数错误"); - map.put("totalSize",null); - return map; - } - queryWrapper.eq("a.nu_id",configMaterialCategory.getNuId()); +// if(StringUtils.isEmpty(configMaterialCategory.getNuId())){ +// map.put("success",false); +// map.put("message","参数错误"); +// map.put("totalSize",null); +// return map; +// } + queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getNuId()),"a.nu_id",configMaterialCategory.getNuId()); queryWrapper.eq("a.del_flag","0"); queryWrapper.eq("a.iz_enabled","Y"); queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getCategoryId()),"b.category_id",configMaterialCategory.getCategoryId()); queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getTypeId()),"b.type_id",configMaterialCategory.getTypeId()); queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getMedicationId()),"b.medication_id",configMaterialCategory.getMedicationId()); - queryWrapper.in(StringUtils.isNotBlank(configMaterialCategory.getSuppliers()),"b.suppliers",configMaterialCategory.getSuppliers()); + if(StringUtils.isNotBlank(configMaterialCategory.getSuppliers())){ + queryWrapper.in("b.suppliers",configMaterialCategory.getSuppliers().split(",")); + } List list = configMaterialInfoMapper.getTreeDataWlnum(queryWrapper); map.put("success",true); map.put("message","物料数量"); map.put("totalSize",list.size()); + map.put("ids",configMaterialCategory.getSuppliers()); return map; } @@ -669,12 +692,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = configMaterialInfoMapper.getGwcTreeDataWlnum(queryWrapper); map.put("success",true); map.put("message","物料数量"); map.put("totalSize",list.size()); + map.put("ids",configMaterialCategory.getSuppliers()); return map; } @@ -722,8 +748,16 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl().eq("suppliers_id",info.getSuppliersId()).eq("wl_id",info.getWlId())); + //供应商信息 + ConfigSuppliersInfo gysInfo = gysMapper.selectOne(new QueryWrapper().eq("id",info.getSuppliersId())); + info.setReferenceUnitPrice(gysWlInfo.getSalesUnitPrice()); + info.setWlUnits(gysWlInfo.getSalesUnit()); + info.setSuppliersName(gysInfo.getSuppliersName()); + info.setBrandType(gysWlInfo.getBrandType()); + info.setManufacturer(gysWlInfo.getManufacturer()); QgdInfo qgdInfoIns = new QgdInfo(); BeanUtils.copyProperties(info,qgdInfoIns); qgdInfoIns.setId(null); @@ -735,7 +769,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl().eq("id",qgdInfo.getSuppliersId())); + qgdInfo.setSuppliersName(gysInfo.getSuppliersName()); qgdInfoMapper.updateById(qgdInfo); return "0"; } @@ -800,33 +835,20 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> queryJhzpList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity warehouseMaterialCrkInfoEntityDto, HttpServletRequest req) { - NuWarehouseMaterialCrkInfo warehouseMaterialCrkInfo = new NuWarehouseMaterialCrkInfo(); - BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap()); - queryWrapper.eq("cgd_id",warehouseMaterialCrkInfo.getCgdId()); -// queryWrapper.isNotNull("jh_pic"); - queryWrapper.eq("crk_status","1"); - queryWrapper.apply("(jh_pic is not null or jh_pic != '')"); - List list = crkInfoMapper.selectList(queryWrapper); + public List> queryJhzpList(Integer pageNo, Integer pageSize, NuInvoicingCgdJhPicEntity nuInvoicingCgdJhPicEntity, HttpServletRequest req) { + NuInvoicingCgdJhPic nuInvoicingCgdJhPic = new NuInvoicingCgdJhPic(); + BeanUtils.copyProperties(nuInvoicingCgdJhPicEntity,nuInvoicingCgdJhPic); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdJhPic, req.getParameterMap()); + queryWrapper.eq("cgd_info_id",nuInvoicingCgdJhPic.getCgdInfoId()); + List list = cgdJhPicMapper.selectList(queryWrapper); List> jhlist = new ArrayList<>(); - for(NuWarehouseMaterialCrkInfo crkInfo : list){ + for(NuInvoicingCgdJhPic crkInfo : list){ if(StringUtils.isNotBlank(crkInfo.getJhPic())){ - if(crkInfo.getJhPic().indexOf(",")>-1){ - for (String jhPicParam : crkInfo.getJhPic().split(",")){ - Map map = new HashMap<>(); - map.put("jhPic",jhPicParam); - map.put("createTime",crkInfo.getCreateTime()); - map.put("createBy",crkInfo.getCreateBy()); - jhlist.add(map); - } - }else{ - Map map = new HashMap<>(); - map.put("jhPic",crkInfo.getJhPic()); - map.put("createTime",crkInfo.getCreateTime()); - map.put("createBy",crkInfo.getCreateBy()); - jhlist.add(map); - } + Map map = new HashMap<>(); + map.put("jhPic",crkInfo.getJhPic()); + map.put("createTime",crkInfo.getCreateTime()); + map.put("createBy",crkInfo.getCreateBy()); + jhlist.add(map); } } return jhlist; @@ -1117,7 +1139,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl crkInfoList = crkInfoMapper.selectList(new QueryWrapper().eq("cgd_id",cgdInfo.getCgdId()).eq("crk_status","1").eq("crk_type","1")); @@ -1685,4 +1707,27 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getJhjd(CgdMainEntity cgdMainEntity) { + Map map = new HashMap<>(); + Long count = cgdInfoMapper.selectCount(new QueryWrapper().eq("cgd_id", cgdMainEntity.getCgdId())); + Long count1 = cgdInfoMapper.selectCount(new QueryWrapper().eq("cgd_id", cgdMainEntity.getCgdId()).in("status", "1","2")); + map.put("totalNum",count.toString()); + map.put("jhNum",count1.toString()); + return map; + } + + @Override + public String saveJhzpList(List saveList) { + String cgdInfoId = saveList.get(0).getCgdInfoId(); + cgdJhPicMapper.delete(new QueryWrapper().eq("cgd_info_id", cgdInfoId)); + for (NuInvoicingCgdJhPicEntity item : saveList) { + NuInvoicingCgdJhPic entity = new NuInvoicingCgdJhPic(); + BeanUtils.copyProperties(item, entity); + cgdJhPicMapper.insert(entity); + } + return "操作成功"; + } + + }