jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

添加缺少字段

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 7 months ago
parent fb62ba21db
commit 4c6ee6446e
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File

19
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
Unescape Escape View File

@ -326,7 +326,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
Calendar custCalendar = Calendar.getInstance(); Calendar custCalendar = Calendar.getInstance();
custCalendar.setTime(new Date()); custCalendar.setTime(new Date());
GenSerialNoModel custGenSerialNoModel= new GenSerialNoModel("WH_CUST_SN_RULE"); GenSerialNoModel custGenSerialNoModel= new GenSerialNoModel("WH_CUST_SN_RULE");
String partNo = mesWorkOrder.getPartNo(); String partNo = mesWorkOrder.getCustPartNo();
String prefix = partNo.substring(0, partNo.length() - 4); String prefix = partNo.substring(0, partNo.length() - 4);
String partNo4 = partNo.substring(partNo.length() - 4).toUpperCase(); String partNo4 = partNo.substring(partNo.length() - 4).toUpperCase();
custGenSerialNoModel.setPartNo(prefix+partNo4); custGenSerialNoModel.setPartNo(prefix+partNo4);
@ -467,7 +467,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
if (!assemblyList.isEmpty()) { if (!assemblyList.isEmpty()) {
for (MesWorkOrderAssembly orderAssembly : assemblyList) { for (MesWorkOrderAssembly orderAssembly : assemblyList) {
orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue());
orderAssembly.setOrganizeCode(organizeCode); orderAssembly.setOrganizeCode(organizeCode);
orderAssembly.setProductSn(mesWorkOrder.getWorkOrderNo());
ConvertBean.saveOrUpdate(orderAssembly, "MES-JOB"); ConvertBean.saveOrUpdate(orderAssembly, "MES-JOB");
} }
workOrderAssemblyRao.saveAll(assemblyList); workOrderAssemblyRao.saveAll(assemblyList);
@ -572,6 +574,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
orderAssembly.setOrderPartId(orderPart.getId().toString()); orderAssembly.setOrderPartId(orderPart.getId().toString());
orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode()); orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode());
orderAssembly.setReportType(sortCfg.getReportType()); orderAssembly.setReportType(sortCfg.getReportType());
if (sortCfg.getReportType() != null && sortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());
}else {
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
}
orderAssembly.setReportPartNo(sortCfg.getReportPartNo()); orderAssembly.setReportPartNo(sortCfg.getReportPartNo());
orderAssembly.setImageFileId(sortCfg.getImageFileId()); orderAssembly.setImageFileId(sortCfg.getImageFileId());
orderAssembly.setCraftCode(sortCfg.getCraftCode()); orderAssembly.setCraftCode(sortCfg.getCraftCode());
@ -600,6 +607,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq()); orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq());
orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode()); orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode());
orderAssembly.setReportType(ruleSortCfg.getReportType()); orderAssembly.setReportType(ruleSortCfg.getReportType());
if (ruleSortCfg.getReportType() != null && ruleSortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());
}else {
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
}
orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo()); orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo());
orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq()); orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq());
orderAssembly.setPid(ruleSortCfg.getId()); orderAssembly.setPid(ruleSortCfg.getId());
@ -624,6 +636,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq()); orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq());
orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode()); orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode());
orderAssembly.setReportType(ruleSortCfg.getReportType()); orderAssembly.setReportType(ruleSortCfg.getReportType());
if (ruleSortCfg.getReportType() != null && ruleSortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());
}else {
orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
}
orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo()); orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo());
orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq()); orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq());
orderAssembly.setPid(ruleSortCfg.getId()); orderAssembly.setPid(ruleSortCfg.getId());

Write Preview
Loading…
Cancel
Save