diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialTypeMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialTypeMapper.xml index 44ecb429..3cf97525 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialTypeMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialTypeMapper.xml @@ -12,6 +12,6 @@ b.category_id as parent_id from nu_biz_suppliers_material_info a left join nu_config_material_info b on a.wl_id = b.id - where suppliers_id = #{suppliersId} + where suppliers_id = #{suppliersId} and b.type_id is not null \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java index 96d59bd0..11c97cac 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java @@ -186,14 +186,19 @@ public class SuppliersMQListener { NuBizSuppliersMaterialInfo bizSuppliersMaterialInfo = new NuBizSuppliersMaterialInfo(); BeanUtils.copyProperties(suppliersMaterialInfoDto, bizSuppliersMaterialInfo); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("suppliers_id", bizSuppliersMaterialInfo.getSuppliersId()); - queryWrapper.eq("wl_id", bizSuppliersMaterialInfo.getId()); + queryWrapper.eq("suppliers_id", suppliersMaterialInfoDto.getSuppliersId()); + queryWrapper.eq("wl_id", suppliersMaterialInfoDto.getId()); NuBizSuppliersMaterialInfo bizSuppliersMaterialInfo1 =bizSuppliersMaterialInfoService.getOne(queryWrapper); if (bizSuppliersMaterialInfo1 == null){ // bizSuppliersMaterialInfoService.save(bizSuppliersMaterialInfo); + + System.out.println("供应商物料信息保存失败-------------"+bizSuppliersMaterialInfo); }else{ bizSuppliersMaterialInfo.setId(null); - bizSuppliersMaterialInfo.setWlId(bizSuppliersMaterialInfo1.getId()); + bizSuppliersMaterialInfo.setWlId(suppliersMaterialInfoDto.getId()); + bizSuppliersMaterialInfo.setSalesUnit(suppliersMaterialInfoDto.getSalesUnit()); + bizSuppliersMaterialInfo.setSalesUnitPrice(suppliersMaterialInfoDto.getSalesUnitPrice()); + System.out.println("供应商物料信息保存成功-------------"+bizSuppliersMaterialInfo); bizSuppliersMaterialInfoService.update(bizSuppliersMaterialInfo,queryWrapper); }