mdc更新

Lius

2024-01-06 20a7735a6831064c9d5bea12c50f63729f2db2fc

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java

@@ -22,6 +22,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;

/**
@@ -112,6 +113,12 @@
        return this.baseMapper.pageList(page, mdcProcessCountVo);
    }

    @Override
    public BigDecimal findDuration(String equipmentId, String validDate) {
        BigDecimal result = this.baseMapper.findDuration(equipmentId, validDate.replaceAll("-", ""));
        return result == null ? BigDecimal.ZERO : result;
    }

    @Transactional(readOnly = true)
    List<MdcProcessCount> processCount(MdcEquipment mdcEquipment) {
        Date initDate = null;
@@ -197,13 +204,15 @@
                            }
                            //计算加工时长
                            long duration = this.handleProcessDuration(equipmentRunningSectionList);
                            MdcProcessCount mdcProcessCount = new MdcProcessCount();
                            mdcProcessCount.setEquipmentId(mdcEquipment.getEquipmentId());
                            mdcProcessCount.setEquipmentName(mdcEquipment.getEquipmentName());
                            mdcProcessCount.setSequenceNumber(sequenceNumber);
                            mdcProcessCount.setDuration(duration);
                            mdcProcessCount.setTheDate(stringDate);
                            resultList.add(mdcProcessCount);
                            if (duration != 0 && duration < 100000) {
                                MdcProcessCount mdcProcessCount = new MdcProcessCount();
                                mdcProcessCount.setEquipmentId(mdcEquipment.getEquipmentId());
                                mdcProcessCount.setEquipmentName(mdcEquipment.getEquipmentName());
                                mdcProcessCount.setSequenceNumber(sequenceNumber);
                                mdcProcessCount.setDuration(duration);
                                mdcProcessCount.setTheDate(stringDate);
                                resultList.add(mdcProcessCount);
                            }
                        }
                    }
                }