修改供应商配置物料流程

nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java

@@ -77,4 +77,5 @@ public class SuppliersMaterialInfoDto implements Serializable {
     @ApiModelProperty(value = "销售单位")
     private String salesUnit;
     private String orgCode;
+    private String wlId;
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java

@@ -87,6 +87,18 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
         return Result.OK(pageList);
     }
 
+
+    @ApiOperation(value = "物料信息-查询机构没有的物料信息", notes = "物料信息-分页列表查询")
+    @GetMapping(value = "/getNoSuplist")
+    public Result<IPage<ConfigMaterialInfo>> getNoSuplist(ConfigMaterialInfo configMaterialInfo,
+                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                           HttpServletRequest req) {
+        Page<ConfigMaterialInfo> page = new Page<ConfigMaterialInfo>(pageNo, pageSize);
+        IPage<ConfigMaterialInfo> pageList = configMaterialInfoService.getNoSuplist(page, configMaterialInfo);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java

@@ -195,4 +195,6 @@ public class ConfigMaterialInfo implements Serializable {
     private Integer wlNum;//累计入库物料数量
     @TableField(exist = false)
     private Integer qlNum;//购物车请领数量
+    @TableField(exist = false)
+    private String suppliersId;//供应商id
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java

@@ -46,4 +46,6 @@ public interface ConfigMaterialInfoMapper extends BaseMapper<ConfigMaterialInfo>
     List<ConfigMaterialInfo> selectAllSanType();
 
     List<ConfigMaterialInfo> selectAllData();
+
+    IPage<ConfigMaterialInfo> getNoSuplist(Page<ConfigMaterialInfo> page, @Param("params") ConfigMaterialInfo configMaterialInfo);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml

@@ -178,4 +178,20 @@
                  left join nu_config_material_type er on info.type_id = er.id
                  left join nu_config_material_category yi on info.category_id = yi.id
     </select>
+    <select id="getNoSuplist" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo">
+        select * from nu_config_material_info a where id not in (select wl_id from nu_biz_suppliers_material_info where suppliers_id = #{params.suppliersId})
+        <if test="params.categoryId != null and params.categoryId != ''">
+            and a.category_id = #{params.categoryId}
+        </if>
+        <if test="params.typeId != null and params.typeId != ''">
+            and a.type_id = #{params.typeId}
+        </if>
+        <if test="params.medicationId != null and params.medicationId != ''">
+            and a.medication_id = #{params.medicationId}
+        </if>
+        <if test="params.materialName != null and params.materialName != ''">
+            and a.material_name like concat('%',#{materialName},'%')
+        </if>
+
+    </select>
 </mapper>

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java

@@ -31,4 +31,6 @@ public interface IConfigMaterialInfoService extends IService<ConfigMaterialInfo>
     ModelAndView exportTypeExcel();
 
     ModelAndView exportMateriallInfoExcel();
+
+    IPage<ConfigMaterialInfo> getNoSuplist(Page<ConfigMaterialInfo> page, ConfigMaterialInfo configMaterialInfo);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java

@@ -131,12 +131,12 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
         List<ConfigMaterialType> list2 = configMaterialTypeMapper.selectList(typeQueryWrapper);
 
         //查询用药类型信息
-//        QueryWrapper<ConfigMaterialMedication> medicationQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<ConfigMaterialMedication> medicationQueryWrapper = new QueryWrapper<>();
-//        medicationQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled());
+        medicationQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled());
-//        medicationQueryWrapper.eq("del_flag","0");
+        medicationQueryWrapper.eq("del_flag","0");
-//        List<ConfigMaterialMedication> list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper);
+        List<ConfigMaterialMedication> list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper);
         //20260330去掉第三层类型，新需求
-        List<ConfigMaterialMedication> list3 = new ArrayList<>();
+//        List<ConfigMaterialMedication> list3 = new ArrayList<>();
 
 
         //查询物料类别下是否有物料数据

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java

@@ -900,6 +900,11 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
         return mv;
     }
 
+    @Override
+    public IPage<ConfigMaterialInfo> getNoSuplist(Page<ConfigMaterialInfo> page, ConfigMaterialInfo configMaterialInfo) {
+        return baseMapper.getNoSuplist(page, configMaterialInfo);
+    }
+
     /**
      * 校验分类层级关系，返回错误信息，如果没有错误返回null
      */

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java

@@ -241,4 +241,10 @@ public class NuBizSuppliersMaterialInfoController extends JeecgController<NuBizS
 		 return Result.error("文件导入失败！");
 	 }
 
+	 @PostMapping(value = "/saveBacthMaterial")
+	 public Result<String> saveBacthMaterial(@RequestBody Map<String,Object> map) {
+		 nuBizSuppliersMaterialInfoService.saveBacthMaterial(map);
+		 return Result.OK("添加成功！");
+	 }
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersMaterialInfo.java

@@ -83,4 +83,5 @@ public class NuBizSuppliersMaterialInfo implements Serializable {
     @ApiModelProperty(value = "销售单位")
     private java.lang.String salesUnit;
     private java.lang.String orgCode;
+    private java.lang.String wlId;
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialTypeMapper.java

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface NuBizSuppliersMaterialTypeMapper extends BaseMapper<NuBizSuppliersMaterialType> {
 
+    List<NuBizSuppliersMaterialType> getSupTypeList(@Param("suppliersId") String suppliersId,@Param("suppliersName") String suppliersName);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialTypeMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nu.modules.bizSuppliers.mapper.NuBizSuppliersMaterialTypeMapper">
 
+    <select id="getSupTypeList" resultType="com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialType">
+        select
+            distinct
+            a.suppliers_id as suppliers_id,
+            #{suppliersName} as suppliers_name,
+            b.type_id as material_type_id,
+            '2' as level,
+            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}
+    </select>
 </mapper>

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialInfoService.java

@@ -4,6 +4,7 @@ import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 供应商可提供的物料信息
@@ -14,4 +15,6 @@ import java.util.List;
 public interface INuBizSuppliersMaterialInfoService extends IService<NuBizSuppliersMaterialInfo> {
 
     List<NuBizSuppliersMaterialInfo> noList(List<NuBizSuppliersMaterialInfo> list);
+
+    void saveBacthMaterial(Map<String, Object> map);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersMaterialTypeService.java

@@ -2,7 +2,9 @@ package com.nu.modules.bizSuppliers.service;
 
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,4 +16,6 @@ import java.util.Map;
 public interface INuBizSuppliersMaterialTypeService extends IService<NuBizSuppliersMaterialType> {
 
     void saveBacthType(Map<String, Object> nuBizSuppliersMaterialType);
+
+    List<NuBizSuppliersMaterialType> getSupTypeList( String suppliersId ,String suppliersName);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java

@@ -1,14 +1,29 @@
 package com.nu.modules.bizSuppliers.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+import cn.hutool.core.bean.BeanUtil;
+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.bizSuppliers.entity.NuBizSuppliersInfo;
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo;
+import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialType;
 import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersMaterialInfoMapper;
+import com.nu.modules.bizSuppliers.service.INuBizSuppliersInfoService;
 import com.nu.modules.bizSuppliers.service.INuBizSuppliersMaterialInfoService;
+import com.nu.modules.bizSuppliers.service.INuBizSuppliersMaterialTypeService;
+import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
+import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService;
+import com.nu.utils.RabbitMQUtil;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
-
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 供应商可提供的物料信息
@@ -17,11 +32,78 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@DS("ope")
 public class NuBizSuppliersMaterialInfoServiceImpl extends ServiceImpl<NuBizSuppliersMaterialInfoMapper, NuBizSuppliersMaterialInfo> implements INuBizSuppliersMaterialInfoService {
 
+
+    @Autowired
+    private RabbitMQUtil rabbitMQUtil;
+    @Autowired
+    private IConfigSuppliersInfoService configSuppliersInfoService;
+    @Autowired
+    private INuBizSuppliersInfoService nuBizSuppliersInfoService;
+    @Autowired
+    private INuBizSuppliersMaterialTypeService suppliersMaterialTypeService;
     @Override
     public List<NuBizSuppliersMaterialInfo> noList(List<NuBizSuppliersMaterialInfo> list) {
         return baseMapper.noList(list);
     }
+
+    @Override
+    public void saveBacthMaterial(Map<String, Object> map) {
+        String suppliersId = map.get("suppliersId").toString();
+
+        List<NuBizSuppliersMaterialInfo> addList = new ArrayList<>();
+        List<Object> list = (List) map.get("addList");
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        for(int i=0;i<list.size();i++){
+            Map<String,String> mapAdd = (Map)list.get(i);
+            NuBizSuppliersMaterialInfo nuBizSuppliersMaterialInfo = new NuBizSuppliersMaterialInfo();
+            nuBizSuppliersMaterialInfo.setSuppliersId(suppliersId);
+            nuBizSuppliersMaterialInfo.setWlId(mapAdd.get("id"));
+            nuBizSuppliersMaterialInfo.setMaterialName(mapAdd.get("materialName"));
+            nuBizSuppliersMaterialInfo.setSpecificationModel(mapAdd.get("specificationModel"));
+            nuBizSuppliersMaterialInfo.setBrandType(mapAdd.get("brandType"));
+            nuBizSuppliersMaterialInfo.setManufacturer(mapAdd.get("manufacturer"));
+            nuBizSuppliersMaterialInfo.setOrgCode(loginUser.getOrgCode());
+            addList.add(nuBizSuppliersMaterialInfo);
+        }
+        if(addList!=null && addList.size()>0){
+            saveBatch(addList);//批量新增
+            //保存供应商数据
+            //推送管理平台合作的基础数据
+            NuBizSuppliersInfo configSuppliersInfo = nuBizSuppliersInfoService.getById(suppliersId);//查询管理平台数据
+            ConfigSuppliersInfo suppliersInfo = configSuppliersInfoService.getById(suppliersId);//查询本地是否为空
+            if(suppliersInfo == null){
+                suppliersInfo = new ConfigSuppliersInfo();
+                BeanUtils.copyProperties(configSuppliersInfo, suppliersInfo);
+                suppliersInfo.setCreateBy(loginUser.getRealname());
+                suppliersInfo.setCreateTime(configSuppliersInfo.getCreateTime());
+                configSuppliersInfoService.save(suppliersInfo);
+            }
+
+            SuppliersInfoMQDto suppliersInfoMQDto = new SuppliersInfoMQDto();
+            suppliersInfoMQDto.setId(suppliersId);
+            suppliersInfoMQDto.setSuppliersId(configSuppliersInfo.getId());
+            suppliersInfoMQDto.setSuppliersName(configSuppliersInfo.getSuppliersName());
+            suppliersInfoMQDto.setSuppliersNature(configSuppliersInfo.getSuppliersNature());
+            suppliersInfoMQDto.setSuppliersAddress(configSuppliersInfo.getSuppliersAddress());
+            suppliersInfoMQDto.setPersonInCharge(configSuppliersInfo.getPersonInCharge());
+            suppliersInfoMQDto.setContactNumber(configSuppliersInfo.getContactNumber());
+            suppliersInfoMQDto.setOpeningBank(configSuppliersInfo.getOpeningBank());
+            suppliersInfoMQDto.setOpeningBankNo(configSuppliersInfo.getOpeningBankNo());
+            suppliersInfoMQDto.setImgPath(configSuppliersInfo.getImgPath());
+            suppliersInfoMQDto.setSysOrgCode(loginUser.getOrgCode());
+            //推送合作管理
+            rabbitMQUtil.sendToExchange("nu.suppliers.suppliersApplyAdd", "nu.suppliers.suppliersApplyAdd", suppliersInfoMQDto);
+            //推送管理平台供应商物料信息
+            List<SuppliersMaterialInfoDto> addInfoList = BeanUtil.copyToList(addList, SuppliersMaterialInfoDto.class);
+            rabbitMQUtil.sendToExchange("nu.suppliers.suppliersMaterialInfoAdd", "nu.suppliers.suppliersMaterialInfoAdd", addInfoList);
+            //推送物料的分类数据
+            suppliersMaterialTypeService.remove(new QueryWrapper<NuBizSuppliersMaterialType>().eq("suppliers_id", suppliersId));
+            List<NuBizSuppliersMaterialType> typeList = suppliersMaterialTypeService.getSupTypeList(suppliersId,configSuppliersInfo.getSuppliersName());
+            suppliersMaterialTypeService.saveBatch(typeList);
+
+
+        }
+    }
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialTypeServiceImpl.java

@@ -82,4 +82,9 @@ public class NuBizSuppliersMaterialTypeServiceImpl extends ServiceImpl<NuBizSupp
 
 
     }
+
+    @Override
+    public List<NuBizSuppliersMaterialType> getSupTypeList(String suppliersId,String suppliersName) {
+        return baseMapper.getSupTypeList(suppliersId, suppliersName);
+    }
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java

@@ -21,4 +21,5 @@ public interface IConfigSuppliersInfoService extends IService<ConfigSuppliersInf
     void updateWlType(ConfigSuppliersInfo configSuppliersInfo);
 
     void cooperationSupp(ConfigSuppliersInfo configSuppliersInfo);
+
 }