suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

根据审批通过的调整单更新分外协分派管理列表

Browse Source
liweidong
张乾翔 5 days ago
parent dada568893
commit ff5c7e12f3
1 changed files with 35 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java

79
blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java
Unescape View File

@ -4,6 +4,8 @@
package org.springblade.desk.basic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -18,10 +20,7 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.desk.basic.mapper.PlanAssignSteerModifyApprovalMapper;
import org.springblade.desk.basic.mapper.PlanAssignSteerModifyMapper;
import org.springblade.desk.basic.pojo.entity.PlanAssignSteer;
import org.springblade.desk.basic.pojo.entity.PlanAssignSteerModify;
import org.springblade.desk.basic.pojo.entity.PlanAssignSteerModifyApproval;
import org.springblade.desk.basic.pojo.entity.PlanAssignSteerModifyD;
import org.springblade.desk.basic.pojo.entity.*;
import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyDVO;
import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyTimelineVO;
import org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO;
@ -67,6 +66,7 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
@Resource
IUserClient userClient;
@Override
public IPage<PlanAssignSteerModifyVO> selectPlanAssignSteerModifyPage(IPage<PlanAssignSteerModifyVO> page, PlanAssignSteerModify planAssignSteerModify) {
return page.setRecords(baseMapper.selectPlanAssignSteerModifyPage(page, planAssignSteerModify));
@ -331,46 +331,37 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
* 根据审批通过的调整单更新分外协分派管理列表
*/
private void updatePlanAssignSteerFromModify(Long pasmId) {
//List<PlanAssignSteerModifyD> modifyDLst = planAssignSteerModifyDMapper.findByPasmId(pasmId);
//if (modifyDLst == null || modifyDLst.isEmpty()) {
// return;
//}
//
//PlanAssignSteerModify modify = getById(pasmId);
//if (modify == null) {
// return;
//}
//
//for (PlanAssignSteerModifyD modifyD : modifyDLst) {
// // 根据工艺能力和外协厂商查找现有分派规则
// QueryWrapper<BsAssignEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("CRAFT_ABILITY_ID", modifyD.getPlatingId())
// .eq("OEM_ID", modifyD.getOemId());
// BsAssignEntity assign = bsAssignService.getOne(queryWrapper);
//
// if (assign == null) {
// // 不存在则创建新记录
// assign = new BsAssignEntity();
// assign.setCraftAbilityId(modifyD.getPlatingId());
// assign.setOemId(modifyD.getOemId());
// log.warn("分派规则不存在，创建新记录：工艺能力ID={}，外协厂商ID={}",
// modifyD.getPlatingId(), modifyD.getOemId());
// }
//
// // 更新备注信息（记录来源）
// String remark = "分派控制调整单ID:" + pasmId;
// if (Func.isNotEmpty(assign.getRemark())) {
// remark = assign.getRemark() + "; " + remark;
// }
// assign.setRemark(remark);
//
// // 保存或更新
// if (assign.getId() == null || assign.getId() == 0) {
// bsAssignService.save(assign);
// } else {
// bsAssignService.updateById(assign);
// }
//}
List<PlanAssignSteerModifyD> modifyDLst = planAssignSteerModifyDService.findByPasmId(pasmId);
if (modifyDLst == null || modifyDLst.isEmpty()) {
return;
}
PlanAssignSteerModify modify = getById(pasmId);
if (modify == null) {
return;
}
for (PlanAssignSteerModifyD modifyD : modifyDLst) {
// 根据工艺能力和外协厂商查找现有分派规则
QueryWrapper<PlanAssignSteer> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("PLATING_ID", modifyD.getPlatingId())
.eq("OEM_ID", modifyD.getOemId());
List<PlanAssignSteer> assignSteers = planAssignSteerService.list(queryWrapper);
BigDecimal assignScale = Objects.isNull(modifyD.getAssignScale()) ? BigDecimal.ZERO : modifyD.getAssignScale();
if (CollUtil.isEmpty(assignSteers)) {
// 不存在则创建新记录
PlanAssignSteer assignEntity = new PlanAssignSteer();
assignEntity.setPlatingId(modifyD.getPlatingId());
assignEntity.setOemId(modifyD.getOemId());
assignEntity.setAssignScale(assignScale);
planAssignSteerService.save(assignEntity);
break;
}
assignSteers.forEach(assign -> {
assign.setAssignScale(assignScale);
});
planAssignSteerService.updateBatchById(assignSteers);
}
}

Write Preview
Loading…
Cancel
Save