Merge remote-tracking branch 'origin/master'

hdy

2024-01-24 372d06cec5605fccf23357f8cf62f191297b0127

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java

@@ -1,11 +1,23 @@
package com.jcdm.main.da.passingStationCollection.service.impl;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;

import com.jcdm.common.constant.Constants;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord;
import com.jcdm.main.rm.repairRecord.mapper.RmRepairRecordMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;

/**
@@ -19,6 +31,15 @@
{
    @Autowired
    private DaPassingStationCollectionMapper daPassingStationCollectionMapper;

    @Autowired
    private RmRepairRecordMapper rmRepairRecordMapper;

    @Autowired
    private BsOrderSchedulingMapper bsOrderSchedulingMapper;

    @Autowired
    private IBsOrderSchedulingService bsOrderSchedulingService;

    /**
     * 查询产品过站采集
@@ -42,6 +63,26 @@
    public List<DaPassingStationCollection> selectDaPassingStationCollectionList(DaPassingStationCollection daPassingStationCollection)
    {
        return daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
    }

    /**
     * 获取首页单日累计量产数据
     * @param fieldName bs
     * @return list
     */
    @Override
    public Integer getProduceNumToday(String fieldName) {

        BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
        bsOrderScheduling.setQueryField(fieldName);
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime startTime = LocalDate.now().atStartOfDay();
        LocalDateTime endTime = LocalDate.now().plusDays(1).atStartOfDay();
        String s1 = startTime.format(formatter);
        String s2 = endTime.format(formatter);
        bsOrderScheduling.setStartTime(s1);
        bsOrderScheduling.setEndTime(s2);
        return bsOrderSchedulingMapper.getProduceNumToday(bsOrderScheduling);
    }

    /**
@@ -93,4 +134,17 @@
    {
        return daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(id);
    }

    @Override
    public void insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection) {
        Long[] conditions = daPassingStationCollection.getIds();
        for (int i = 0; i < conditions.length; i++) {
            DaPassingStationCollection result = daPassingStationCollectionMapper.selectDaPassingStationCollectionById(conditions[i]);
            RmRepairRecord rmRepairRecord = new RmRepairRecord();
            rmRepairRecord.setBoxCode(result.getSfcCode());
            rmRepairRecord.setProcessesCode(result.getLocationCode());
            rmRepairRecord.setOriginalResult(result.getOutRsSign());
            rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
        }
    }
}