licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

如果安全库存没设置待办人员，发给销售订单人员

Browse Source
This commit is contained in:
Ledo 2025-02-15 09:41:04 +08:00
parent ac24968064
commit 7d10143442
3 changed files with 87 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
View File

@ -53,6 +53,14 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
return selectPage(reqVO, query);
}
default ProjectOrderDO selectProjectOrderById(Long id){
MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();
query.selectAll(ProjectOrderDO.class)
.select("a.nickname as businessManName")
.leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectOrderDO::getBusinessMan)
.eq(ProjectOrderDO::getId,id);
return selectOne(query);
}
default PageResult<ProjectOrderDO> selectPage(ProjectOrderPageReqVO reqVO) {
MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();

99
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java
View File

@ -862,10 +862,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
attentiontodoDO.setLevel("1");
attentiontodook.add(attentiontodoDO);
}
}
for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
List<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall(attentiontodoRespVO.getTxrid());//查询符合条件的值
@ -934,28 +930,33 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
// List<StorageLogNowDO> pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值
List<AttentiontodoDO> attentiontodook3 = attentiontodoService.getAttentiontodolistdaiban(3);
if (attentiontodook3.size()<1){
List<DeliverOrderDO> pageResult = deliverOrderMapper.selectPagemyn1();//查询符合条件的值
Map<String, List<DeliverOrderDO>> groupedBySale = pageResult.stream()
.filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目
.collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds));
groupedBySale.forEach((ids,list)->{
AdminUserRespDTO user = userApi.getUser(list.get(0).getDeliverPerson());
if (user != null ){
AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
attentiontodoDO.setEvent("订单发货满一年");
attentiontodoDO.setAttr5("1");
attentiontodoDO.setAttr4(user.getNickname());
attentiontodoDO.setLevel("1");
attentiontodookddfh.add(attentiontodoDO);
boolean hasDbPerson = true;
if (CollUtil.isEmpty(attentiontodook3)){
//如果待办人员配置为空
hasDbPerson = false;
}
});
// for (DeliverOrderDO storageLogNowDO : pageResult) {
// if (attentiontodook3.size()<1){
// //如果没有配置待办人员：
// List<DeliverOrderDO> pageResult = deliverOrderMapper.selectPagemyn1();//查询符合条件的值
// Map<String, List<DeliverOrderDO>> groupedBySale = pageResult.stream()
// .filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目
// .collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds));
//
// groupedBySale.forEach((ids,list)->{
// AdminUserRespDTO user = userApi.getUser(list.get(0).get());
// if (user != null ){
// AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
// attentiontodoDO.setEvent("订单发货满一年");
// attentiontodoDO.setAttr5("1");
// attentiontodoDO.setAttr4(user.getNickname());
// attentiontodoDO.setLevel("1");
// attentiontodookddfh.add(attentiontodoDO);
// }
// });
//// for (DeliverOrderDO storageLogNowDO : pageResult) {
////
//// }
// }
}
for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh) {
List<DeliverOrderDO> deliverOrderDOS = deliverOrderMapper.selectPagemyn(attentiontodoRespVO.getTxrid());
Map<String, List<DeliverOrderDO>> groupedBySale = deliverOrderDOS.stream()
@ -967,7 +968,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
List<DeliverOrderDO> list = entry.getValue();
String[] split = ids.split(",");
for (String s : split) {
ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(s);
ProjectOrderDO projectOrderDO = projectOrderMapper.selectProjectOrderById(Long.valueOf(s));
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
BdgzsomthingDO.setThings("订单编号:"+projectOrderDO.getCode()+"发货日期到期一年");//事件名称
@ -1020,6 +1021,56 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService {
bdgzsomthingMapper.insert(BdgzsomthingDO);
}
}
if (!hasDbPerson){
//如果没有配置待办人员，要给对应的业务员发
bdgzsomthingDO BdgzsomthingDO1 = new bdgzsomthingDO();
BdgzsomthingDO1.setThingname(attentiontodoRespVO.getEvent());//事件名称
BdgzsomthingDO1.setThings("订单编号:"+projectOrderDO.getCode()+"发货日期到期一年");//事件名称
BdgzsomthingDO1.setAttr2(projectOrderDO.getCode());//因为不用跳转所以为null
BdgzsomthingDO1.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期
BdgzsomthingDO1.setTenantId(attentiontodoRespVO.getTxrid());
// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写
BdgzsomthingDO1.setDborgz("待办");
BdgzsomthingDO1.setClick(projectOrderDO.getBusinessManName());//提醒人
if(attentiontodoRespVO.getLevel().equals("1")){
BdgzsomthingDO1.setLevel("紧急");
}
else if(attentiontodoRespVO.getLevel().equals("2")){
BdgzsomthingDO1.setLevel("一般");
}
else if(attentiontodoRespVO.getLevel().equals("3")){
BdgzsomthingDO1.setLevel("非紧急");
}
BdgzsomthingDO1.setYesorno("0");//是否点击
BdgzsomthingDO1.setAttr4("0");//是否点击
BdgzsomthingDO1.setAttr3(projectOrderDO.getCode());//获取数据当前表的id 改
BdgzsomthingDO1.setShowname(list.get(0).getCreateTime());//获取数据当前表的创建事件 改
//去重查询,重复则不加
List<bdgzsomthingDO> selecteqint1 = bdgzsomthingMapper.selecteqintDeletedButNoOver(BdgzsomthingDO1);
if(CollUtil.isNotEmpty(selecteqint1)){
if (hasRemindTimeSafeStorage){
LocalDate today = LocalDate.now();
// List<bdgzsomthingDO> updateBatch = new ArrayList<>();
for (bdgzsomthingDO bdgzsomthingDO : selecteqint1) {
LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate();
// 计算两个日期之间的天数差
long daysBetween = ChronoUnit.DAYS.between(updatetime, today);
if (daysBetween == Long.valueOf(remindTimeSafe)){
bdgzsomthingMapper.updateYnAndAttr4(bdgzsomthingDO.getId().toString(),"0","0");
// updateBatch.add(bdgzsomthingDO);
}
}
// bdgzsomthingMapper.updateBatch(updateBatch);
}
}else{
List<bdgzsomthingDO> bdgzsomthingDOList = bdgzsomthingMapper.selecteqintNoDeletedAndNoOver(BdgzsomthingDO1);
if (!CollUtil.isNotEmpty(bdgzsomthingDOList)){
//插入方法
bdgzsomthingMapper.insert(BdgzsomthingDO1);
}
}
}
}
}

4
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml
View File

@ -91,12 +91,12 @@
<select id="selecteqintDeletedButNoOver"
parameterType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO">
select * from dbzz_table where thingname=#{thingname} and attr12='1' and attr4='1'
select * from dbzz_table where things=#{things} and attr12='1' and attr4='1' and dborgz=#{dborgz}
</select>
<select id="selecteqintNoDeletedAndNoOver"
parameterType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO"
resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO">
select * from dbzz_table where thingname=#{thingname} and (attr12='1' or attr12 is null ) and dborgz =#{dborgz} and attr4='0'
select * from dbzz_table where things=#{things} and (attr12='1' or attr12 is null ) and dborgz =#{dborgz} and attr4='0'
</select>
<select id="selecteqintq"
parameterType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO"