修改供应商配置物料流程

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

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

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java

@@ -119,4 +119,5 @@ public class NuBizSuppliersOrg implements Serializable {
     @Excel(name = "资质照片", width = 15)
     @ApiModelProperty(value = "资质照片")
     private java.lang.String imgPath;
+    private java.lang.String izPz;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml

@@ -168,7 +168,7 @@
     </select>
 
     <select id="getSuppliersOrgInfoByOpenId" resultType="com.nu.entity.SysDepartEntity">
-        select b.* from nu_biz_suppliers_org a
+        select b.*,a.iz_pz from nu_biz_suppliers_org a
         LEFT JOIN sys_depart b on a.org_code = b.org_code
         where a.open_id = #{openId}
     </select>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java

@@ -1,19 +1,23 @@
 package com.nu.mq.suppliers.listener;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Maps;
 import com.nu.dto.SuppliersInfoMQDto;
+import com.nu.dto.SuppliersMaterialInfoDto;
 import com.nu.dto.WorkOrderMQDto;
 import com.nu.entity.NuWxNoticeEntity;
 import com.nu.entity.WxNoticeEntity;
 import com.nu.enums.WxClientType;
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply;
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersInfo;
+import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo;
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg;
 import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService;
 import com.nu.modules.bizSuppliers.service.INuBizSuppliersInfoService;
+import com.nu.modules.bizSuppliers.service.INuBizSuppliersMaterialInfoService;
 import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService;
 import com.nu.modules.wxnotice.IWxNoticeApi;
 import com.nu.utils.RabbitMQUtil;
@@ -46,6 +50,8 @@ public class SuppliersMQListener {
     private RabbitMQUtil rabbitMQUtil;
     @Autowired
     private INuBizSuppliersInfoService suppliersInfoService;
+    @Autowired
+    private INuBizSuppliersMaterialInfoService suppliersMaterialInfoService;
 
     /**
      * 工单回执
@@ -251,8 +257,24 @@ public class SuppliersMQListener {
             //没有合作过才新增数据，否则不新增数据
             nuBizSuppliersOrgService.save(nuBizSuppliersOrg);
         }
+    }
 
 
+    @AutoLog(value = "供应商-添加物料信息")
+    @RabbitListener(
+            bindings = @QueueBinding(
+                    value = @Queue(name = "nu.suppliers.suppliersMaterialInfoAdd"),
+                    exchange = @Exchange(name = "nu.suppliers.suppliersMaterialInfoAdd", type = ExchangeTypes.DIRECT),
+                    key = "nu.suppliers.suppliersMaterialInfoAdd"
+            ),
+            errorHandler = "suppliersMQExceptionHandler"
+    )
+    public void suppliersMaterialInfoAdd(List<SuppliersMaterialInfoDto> addList) {
+        log.info("供应商-添加物料信息");
+        log.info("供应商-添加物料信息: {}", addList);
+        log.info("业务处理");
 
+        List<NuBizSuppliersMaterialInfo> addInfoList = BeanUtil.copyToList(addList, NuBizSuppliersMaterialInfo.class);
+        suppliersMaterialInfoService.saveBatch(addInfoList);
     }
 }

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

@@ -84,4 +84,5 @@ public class SuppliersMaterialInfoDto implements Serializable {
     private String typeName;
     private String isRead;
     private String openId;
+    private String wlId;
 }

nursing-unit-common/src/main/java/com/nu/entity/SysDepartEntity.java

@@ -248,6 +248,8 @@ public class SysDepartEntity implements Serializable {
     @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
     private String orgDistrict;
 
+    private String izPz;
+
     //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids