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.0
xiangwei.zhang 8 months ago
parent dd8464903f
commit 2e525494c6
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File

23
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java
Unescape Escape View File

@ -69,7 +69,7 @@ public class MesAccountJob extends BaseMesScheduleJob {
JSONObject jsonObject = new JSONObject();
String json = this.getJobParam();
//String json = "{\"startTime\":\"2024-09-15 07:50:00\",\"endTime\":\"2024-09-17 08:00:00\"}";
//String json = "{\"startTime\":\"2024-09-13 07:50:00\",\"endTime\":\"2024-09-19 08:00:00\"}";
com.alibaba.fastjson.JSONObject reqJson = com.alibaba.fastjson.JSONObject.parseObject(json);
String startDateTime = reqJson.getString("startTime");
String endDateTime = reqJson.getString("endTime");
@ -96,7 +96,7 @@ public class MesAccountJob extends BaseMesScheduleJob {
//String endDateTime = TimeTool.getToday() + " 08:00:00";
//String startDateTime = "2024-09-14 07:50:00";
//String endDateTime = "2024-09-15 08:00:00";
//List<String> list = Stream.of("HT3300MIX").collect(Collectors.toList());
//List<String> list = Stream.of("A88_EOL_Electric_inspection").collect(Collectors.toList());
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
//DdlPreparedPack.getInPackList(list, "equipmentCode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(10, "equipmentType", ddlPackBean);
@ -128,6 +128,25 @@ public class MesAccountJob extends BaseMesScheduleJob {
String partNo = "";
List<MesProductRecordLog> productRecordLogList = new ArrayList<>();
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(equipment.getEquipmentCode(), "equipmentCode", detailPackBean);
DdlPreparedPack.getStringLikerPack("InjDataSeries", "equipVariableName", detailPackBean);
DdlPreparedPack.getStringEqualPack("192", "quality", detailPackBean);
DdlPreparedPack.getStringSmallerNotEqualPack(startDateTime, "createDatetime", detailPackBean);
DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), detailPackBean);
List<MesProductRecordLog> detailLogs = mesProductRecordLogRepository.findByHqlTopWhere(detailPackBean, 1);
DdlPackBean mouldMultipackBeanTemp = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(detailLogs.get(0).getEquipVariableValue(), "mouldNo", mouldMultipackBeanTemp);
List<MesMouldMultiCavity> mouldMultiCavities = mesMouldMultiCavityRepository.findByHqlWhere(mouldMultipackBeanTemp);
if (CollectionUtils.isEmpty(mouldMultiCavities)) {
continue;
} else {
List<String> partList = mouldMultiCavities.stream().map(MesMouldMultiCavity::getPartNo).distinct().collect(Collectors.toList());
partNo = String.join(",", partList);
}
for (MesProductRecordLog log : recordLogs) {
if (!StringUtils.isEmpty(log.getPartNo()) && log.getEquipVariableName() != null
&& !log.getEquipVariableName().contains("InjDataSeries")) {

13
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java
Unescape Escape View File

@ -674,7 +674,6 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
//List<String> finishList = Stream.of("Product_finish","PART_OK","Part_Finish","Product_OK").collect(Collectors.toList());
List<String> finishList = Stream.of("Product_finish","Part_Finish").collect(Collectors.toList());
String singleReason = "";
for (MesProductRecordLog recordLog : recordLogs) {
int errorCount = 0;
@ -688,21 +687,20 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
bypassFlag = true;
continue;
}
if (bypassFlag && recordLog.getType().equals("record")) {
if (bypassFlag && finishList.contains(recordLog.getCategoryLevelTwo()) && Objects.equal(recordLog.getEquipVariableValue(), "True")) {
errorCount ++;
singleReason += String.format(reasonBypass,startTime, errorCount +"");
reason += String.format(reasonBypass,startTime, errorCount +"");
continue;
}
if (bypassFlag && Objects.equal(recordLog.getCategoryLevelTwo(), "BYPASS") && Objects.equal(recordLog.getEquipVariableValue(), "False")) {
endTime = recordLog.getCreateDatetime();
reason += singleReason + ";";
singleReason = "";
errorCount = 0;
bypassFlag = false;
continue;
}
if (!releaseFlag) {
if (finishList.contains(recordLog.getCategoryLevelTwo()) && Objects.equal(recordLog.getEquipVariableValue(), "True")) { startTime = recordLog.getCreateDatetime();
if (finishList.contains(recordLog.getCategoryLevelTwo()) && Objects.equal(recordLog.getEquipVariableValue(), "True")) {
startTime = recordLog.getCreateDatetime();
errorCount ++;
reason += String.format(releaseBypass, startTime, errorCount + "");
continue;
@ -715,8 +713,6 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
releaseFlag = true;
continue;
}
/* // Geiss 设备是一组信号,但是以finish为主
if ()*/
if (!finishList.contains(recordLog.getCategoryLevelTwo()) || !Objects.equal(recordLog.getEquipVariableValue(), "True")) {
continue;
@ -738,6 +734,7 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
if (recordLog.getType().equals("record")) {
releaseFlag = false;
bypassFlag = false;
result --;
}
}

Write Preview
Loading…
Cancel
Save