|
|
|
@ -29,6 +29,7 @@ import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.repository.MesPackageDetailRepository;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
@ -101,6 +102,9 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi
|
|
|
|
|
private MesOutPutStatisticsRepository outPutStatisticsRepository;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private MesOutPutStatisticsOqcRepository outPutStatisticsOqcRepository;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ISxOutPutStatisticsTravelService outPutStatisticsTravelService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@ -774,6 +778,16 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi
|
|
|
|
|
outPutStatistics.setStartTime(outPutStatistics.getModifyDatetime());
|
|
|
|
|
outPutStatistics.setEndTime(outPutStatistics.getStartTime());
|
|
|
|
|
outPutStatistics = outPutStatisticsRepository.insert(outPutStatistics);
|
|
|
|
|
|
|
|
|
|
MesOutPutStatisticsOqc outPutStatisticsOqc = new MesOutPutStatisticsOqc();
|
|
|
|
|
BeanUtils.copyProperties(outPutStatistics, outPutStatisticsOqc);
|
|
|
|
|
outPutStatisticsOqc.setCheckLimit(new Double(0));
|
|
|
|
|
outPutStatisticsOqc.setSpotCheckQty(new Double(0));
|
|
|
|
|
outPutStatisticsOqc.setCheckResult(MesPcnExtEnumUtil.OQC_TOTAL_STATUS.UNTREATED.getValue());
|
|
|
|
|
outPutStatisticsOqc.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
|
|
|
|
|
outPutStatisticsOqc.setPid(outPutStatistics.getId());
|
|
|
|
|
outPutStatisticsOqcRepository.insert(outPutStatisticsOqc);
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
outPutStatistics.setQty(MathOperation.add(outPutStatistics.getQty(), new Double(1)));
|
|
|
|
|
ConvertBean.serviceModelUpdate(outPutStatistics, params.getUserInfo());
|
|
|
|
|