Browse Source

2025.03.06 NPI优化:

项目物料 - 页面整体分页大小没办法手动自己调整,已详情的方式弹出新界面
- 物料转量产后需增加撤销按钮
- 信息显示串行
- 下达前删除的文档下达后又出现了,邮件也同步发了,需要修正
- 删除其他部门权限,除了PJM其他人员不能操作只能查看
- 邮件收到有待上传的文档,系统里没有
java8
jiayang yue 1 year ago
parent
commit
454e3b89d7
  1. 12
      src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java
  2. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java
  3. 37
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

12
src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java

@ -266,6 +266,18 @@ public class EamProjectController {
eamProjectService.eamProjectPartInfoEdit(data); eamProjectService.eamProjectPartInfoEdit(data);
return R.ok(); return R.ok();
} }
/**
* @Description 撤销已量产物料信息
* @Title eamProjectPartInfoCancelEdit
* @param data
* @return com.xujie.sys.common.utils.R
**/
@PostMapping("/eamProjectPartInfoCancelEdit")
@ResponseBody
public R eamProjectPartInfoCancelEdit(@RequestBody EamProjectPartInfoData data) {
eamProjectService.eamProjectPartInfoCancelEdit(data);
return R.ok();
}
/** /**
* @Description 编辑物料信息 * @Description 编辑物料信息

2
src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java

@ -67,6 +67,8 @@ public interface EamProjectService {
void eamProjectPartInfoEdit(EamProjectPartInfoData data) throws MessagingException, UnsupportedEncodingException; void eamProjectPartInfoEdit(EamProjectPartInfoData data) throws MessagingException, UnsupportedEncodingException;
void eamProjectPartInfoCancelEdit(EamProjectPartInfoData data);
void eamProjectPartInfoSave(EamProjectPartInfoData data); void eamProjectPartInfoSave(EamProjectPartInfoData data);
void eamProjectPartInfoDelete(EamProjectPartInfoData data); void eamProjectPartInfoDelete(EamProjectPartInfoData data);

37
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

@ -50,6 +50,7 @@ import java.text.SimpleDateFormat;
import java.time.DayOfWeek; import java.time.DayOfWeek;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @description: * @description:
@ -295,6 +296,42 @@ public class EamProjectServiceImpl implements EamProjectService {
} }
} }
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void eamProjectPartInfoCancelEdit(EamProjectPartInfoData inData){
// 编辑物料的状态为进行中
List<EamProjectPartInfoData> checkProjectPartNo = EamProjectMapper.checkProjectPartNo(inData);
if (!checkProjectPartNo.isEmpty()) {
throw new RuntimeException("当前项目下已存在相同的项目料号!");
} else {
EamProjectMapper.eamProjectPartInfoEdit(inData);
}
// 通过存储过程查询当前part下所有转量产文档
ProofDocumentData proofDocumentData = new ProofDocumentData();
proofDocumentData.setProjectPartId(inData.getProjectPartId());
proofDocumentData.setProjectId(inData.getProjectId());
proofDocumentData.setSite(inData.getSite());
proofDocumentData.setProofingId(-1);
proofDocumentData.setPage(1);
proofDocumentData.setLimit(-1);
PageUtils proofDocument = proofingInformationService.getProofDocument(proofDocumentData);
if (proofDocument == null || proofDocument.getList() == null) {
// 根据业务逻辑可以选择抛出异常或者直接返回
throw new RuntimeException("获取转量产文档失败!");
}
List<ProofDocumentData> list = (List<ProofDocumentData>) proofDocument.getList();
// 遍历list并过滤掉uploadedFlag为Y的数据
List<ProofDocumentData> collect = list.stream().filter(a -> !Objects.equals(a.getUploadedFlag(), "Y")).collect(Collectors.toList());
// 删除未上传的文档
collect.forEach(a -> {
EamBuDocumentListDefinitionVo eamBuDocumentListDefinitionVo = new EamBuDocumentListDefinitionVo();
eamBuDocumentListDefinitionVo.setDocumentDefinitionListId(a.getDocumentDefinitionListId());
proofingInformationMapper.deleteDocumentType(eamBuDocumentListDefinitionVo);
});
}
@Override @Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void eamProjectPartInfoSave(EamProjectPartInfoData inData){ public void eamProjectPartInfoSave(EamProjectPartInfoData inData){

Loading…
Cancel
Save