wilson
/
xujie-sys
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024.11.12 文档收集更新

java8
yuejiayang 2 years ago
parent
bd2337f520
commit
e6b63fbb17
2 changed files with 39 additions and 32 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. 11
      src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
  2. 60
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

11
src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
View File

@ -32,14 +32,14 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
private String materialNumber;
private String remark;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createDate;
private String createBy;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateDate;
private String updateBy;
@ -99,6 +99,9 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
@TableField(exist = false)
private Date massProductionStartDate;
@TableField(exist = false)
private String status2;
@Override
public String getcQualityEngineer1() {
return cQualityEngineer1;

60
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
View File

@ -254,7 +254,7 @@ public class EamProjectServiceImpl implements EamProjectService {
}
@Override
@Transactional
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void eamProjectPartInfoEdit(EamProjectPartInfoData inData) throws MessagingException, UnsupportedEncodingException {
List<EamProjectPartInfoData> checkProjectPartNo = EamProjectMapper.checkProjectPartNo(inData);
if (!checkProjectPartNo.isEmpty()) {
@ -262,6 +262,35 @@ public class EamProjectServiceImpl implements EamProjectService {
} else {
EamProjectMapper.eamProjectPartInfoEdit(inData);
}
if(inData.getStatus2() == "进行中") {
try {
EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData();
eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId());
eamProjectPartInfoData.setLimit(-1);
eamProjectPartInfoData.setPage(1);
PageUtils pageUtils = this.eamProjectPartSearch(eamProjectPartInfoData);
List<EamProjectPartInfoData> list = (List<EamProjectPartInfoData>) pageUtils.getList();
ProofingInformationData proofingInformationData = new ProofingInformationData();
proofingInformationData.setSite(inData.getSite());
proofingInformationData.setBuNo(inData.getBuNo());
proofingInformationData.setProjectCategory(inData.getProjectCategory());
proofingInformationData.setcProjectTypeDb(inData.getProjectCategory());
proofingInformationData.setProjectId(inData.getProjectId());
proofingInformationData.setProjectPartId(list.get(0).getProjectPartId());
proofingInformationData.setProjectNo(inData.getProjectNo());
proofingInformationData.setProjectDesc(inData.getProjectDesc());
proofingInformationData.setPartDesc(inData.getPartDesc());
proofingInformationData.setCustomerNo(inData.getCustomerNo());
proofingInformationData.setCustomerDesc(inData.getCustomerDesc());
proofingInformationData.setProofingId(-1);
proofingInformationData.setRequiredDeliveryDate(null);
proofingInformationData.setCreateBy(inData.getCreateBy());
proofingInformationService.projectDocumentSave(proofingInformationData);
} catch (Exception e) {
throw new RuntimeException("保存转量产文档失败!" + e.getMessage());
}
}
}
@Override
@ -280,33 +309,6 @@ public class EamProjectServiceImpl implements EamProjectService {
throw new RuntimeException("保存项目物料失败!" + e.getMessage());
}
}
try {
EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData();
eamProjectPartInfoData.setProjectPartId(projectPartId);
eamProjectPartInfoData.setLimit(-1);
eamProjectPartInfoData.setPage(1);
PageUtils pageUtils = this.eamProjectPartSearch(eamProjectPartInfoData);
List<EamProjectPartInfoData> list = (List<EamProjectPartInfoData>) pageUtils.getList();
ProofingInformationData proofingInformationData = new ProofingInformationData();
proofingInformationData.setSite(inData.getSite());
proofingInformationData.setBuNo(inData.getBuNo());
proofingInformationData.setProjectCategory(inData.getProjectCategory());
proofingInformationData.setcProjectTypeDb(inData.getProjectCategory());
proofingInformationData.setProjectId(inData.getProjectId());
proofingInformationData.setProjectPartId(list.get(0).getProjectPartId());
proofingInformationData.setProjectNo(inData.getProjectNo());
proofingInformationData.setProjectDesc(inData.getProjectDesc());
proofingInformationData.setPartDesc(inData.getPartDesc());
proofingInformationData.setCustomerNo(inData.getCustomerNo());
proofingInformationData.setCustomerDesc(inData.getCustomerDesc());
proofingInformationData.setProofingId(-1);
proofingInformationData.setRequiredDeliveryDate(null);
proofingInformationData.setCreateBy(inData.getCreateBy());
proofingInformationService.projectDocumentSave(proofingInformationData);
} catch (Exception e) {
throw new RuntimeException("保存转量产文档失败!" + e.getMessage());
}
}
@Override
@ -504,6 +506,8 @@ public class EamProjectServiceImpl implements EamProjectService {
}
} else if (Objects.equals(inData.getStatus(), "已量产")) {
emailAddress = EamProjectMapper.getSendMassProductionMailAddress(inData);
// 排除inData.uploaedFlag为Y的数据
emailAddress.removeIf(e -> Objects.equals(e.getUploadedFlag(), "Y"));
if (!emailAddress.isEmpty()) {
type = "项目物料转量产";
s.append("<li>你有一个新的项目物料转量产，需要上传转量产文件 - 项目编码：" + emailAddress.get(0).getProjectNo() + " 名称:" +

Write Preview
Loading…
Cancel
Save