Browse Source

修改获取分公司供应商

zhanglei
dimengzhe 3 years ago
parent
commit
7bbb314485
  1. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  2. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  3. 36
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -131,4 +131,8 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
BaseManufacturerSidVo getManufacturerSidAndSupplierSid(@Param("manBankSid") String manBankSid, @Param("useOrgSid") String useOrgSid); BaseManufacturerSidVo getManufacturerSidAndSupplierSid(@Param("manBankSid") String manBankSid, @Param("useOrgSid") String useOrgSid);
List<BaseManufacturer> selectByMank(@Param("mankSid") String s, @Param("type") String type, @Param("orgSid") String orgSid);
int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1);
} }

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -205,26 +205,22 @@
</select> </select>
<select id="selectOrgList" resultType="java.lang.String"> <select id="selectOrgList" resultType="java.lang.String">
select useOrg select manBankSid
from base_manufacturer from base_manufacturer
where supplierTypeValue = #{type} where supplierTypeValue = #{type}
</select> </select>
<select id="getManufacturerSidAndSupplierSid" <select id="getManufacturerSidAndSupplierSid"
resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo"> resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo">
SELECT SELECT bm.sid as supplierSid
bm.sid as supplierSid FROM base_manufacturer bm
FROM WHERE bm.useOrg = #{useOrgSid}
base_manufacturer bm
WHERE
bm.useOrg = #{useOrgSid}
and bm.manBankSid = #{manBankSid} and bm.manBankSid = #{manBankSid}
AND bm.isDelete = 0 AND bm.isDelete = 0
</select> </select>
<select id="saveGysByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo"> <select id="saveGysByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo">
SELECT SELECT bm.sid,
bm.sid,
<!--厂商名称--> <!--厂商名称-->
bm.manufacturerName, bm.manufacturerName,
<!--简称--> <!--简称-->
@ -285,4 +281,20 @@
AND manBankSid = #{manBankSid} AND manBankSid = #{manBankSid}
AND isDelete = 0 AND isDelete = 0
</select> </select>
<select id="selectByMank" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
select *
from base_manufacturer
where createOrg = #{orgSid}
and manBankSid = #{mankSid}
and supplyTypeValue = #{type}
</select>
<update id="updateMank">
update base_manufacturer
set createOrgName = #{createName},
useOrgName = #{createName},
manufacturerName = #{name}
where sid = #{sid}
</update>
</mapper> </mapper>

36
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -533,11 +533,43 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
stringList.add(ss); stringList.add(ss);
} }
} }
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid);
SysOrganizationVo vo = organizationVoResultBean.getData();
//去重 //去重
stringList = stringList.stream().distinct().collect(Collectors.toList()); stringList = stringList.stream().distinct().collect(Collectors.toList());
for (String s : stringList) {
if(orgSid.equals(s)){
continue;
}
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(s);
SysOrganizationVo sysOrganizationVo = resultBean.getData();
//查询类别为分公司的 //查询类别为分公司的
String type = "分公司"; String type = "分公司";
List<String> orgList2 = selectOrgList(type); //查询是否有该分公司的
List<BaseManufacturer> list = baseMapper.selectByMank(s, type, orgSid);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
BaseManufacturer baseManufacturer = list.get(0);
//修改
baseMapper.updateMank(baseManufacturer.getSid(),sysOrganizationVo.getName(),vo.getName());
} else {
if (sysOrganizationVo != null) {
BaseManufacturer baseManufacturer = new BaseManufacturer();
baseManufacturer.setSupplierType("0005");
baseManufacturer.setSupplierTypeValue("分公司");
baseManufacturer.setManufacturerName(sysOrganizationVo.getName());
baseManufacturer.setCreateOrg(orgSid);
if(vo != null){
baseManufacturer.setCreateOrgName(vo.getName());
baseManufacturer.setUseOrgName(vo.getName());
}
baseManufacturer.setUseOrg(orgSid);
baseManufacturer.setManBankSid(s);
insert(baseManufacturer);
}
}
}
/*List<String> orgList2 = selectOrgList(type);
orgList2.add(orgSid); orgList2.add(orgSid);
HashSet h1 = new HashSet(stringList); HashSet h1 = new HashSet(stringList);
HashSet h2 = new HashSet(orgList2); HashSet h2 = new HashSet(orgList2);
@ -560,7 +592,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
baseManufacturer.setUseOrgName(sysOrganizationVo.getName()); baseManufacturer.setUseOrgName(sysOrganizationVo.getName());
insert(baseManufacturer); insert(baseManufacturer);
} }
} }*/
return rb.success(); return rb.success();
} }

Loading…
Cancel
Save