forked from I3-YF/i3plus-mes-pcn-yfai
Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp
commit
f1b2f1ce53
@ -1,13 +1,13 @@
|
|||||||
//package cn.estsh.i3plus.ext.mes.pcn.api.job;
|
package cn.estsh.i3plus.ext.mes.pcn.api.job;
|
||||||
//
|
|
||||||
//import java.util.Map;
|
import java.util.Map;
|
||||||
//
|
|
||||||
//public interface IMesWorkOrderOfflineRestoreService {
|
public interface IMesWorkOrderOfflineRestoreService {
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 补录离线生产数据JOB
|
* 补录离线生产数据JOB
|
||||||
// * @param paramMap
|
* @param paramMap
|
||||||
// */
|
*/
|
||||||
// void doRestoreWorkOrderOfflineData(Map<String, String> paramMap);
|
void doRestoreWorkOrderOfflineData(Map<String, String> paramMap);
|
||||||
//
|
|
||||||
//}
|
}
|
||||||
|
|||||||
@ -1,77 +1,77 @@
|
|||||||
//package cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob;
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob;
|
||||||
//
|
|
||||||
//
|
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService;
|
import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
//import cn.estsh.impp.framework.boot.init.ApplicationProperties;
|
import cn.estsh.impp.framework.boot.init.ApplicationProperties;
|
||||||
//import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
//import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
//import org.quartz.DisallowConcurrentExecution;
|
import org.quartz.DisallowConcurrentExecution;
|
||||||
//import org.quartz.JobExecutionContext;
|
import org.quartz.JobExecutionContext;
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
//import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
//import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
//import org.springframework.util.StopWatch;
|
import org.springframework.util.StopWatch;
|
||||||
//import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
//
|
|
||||||
//import java.util.Map;
|
import java.util.Map;
|
||||||
//
|
|
||||||
///**
|
/**
|
||||||
// * @author wangjie
|
* @author wangjie
|
||||||
// * @Description 补录离线生产数据JOB
|
* @Description 补录离线生产数据JOB
|
||||||
// * @version 1.0
|
* @version 1.0
|
||||||
// * @date 2021/2/2 16:44
|
* @date 2021/2/2 16:44
|
||||||
// **/
|
**/
|
||||||
//@Slf4j
|
@Slf4j
|
||||||
//@DisallowConcurrentExecution
|
@DisallowConcurrentExecution
|
||||||
//@Component
|
@Component
|
||||||
//@ApiOperation("补录离线生产数据JOB")
|
@ApiOperation("补录离线生产数据JOB")
|
||||||
//public class MesWorkOrderOfflineRestoreJob extends BaseMesScheduleJob {
|
public class MesWorkOrderOfflineRestoreJob extends BaseMesScheduleJob {
|
||||||
//
|
|
||||||
// public MesWorkOrderOfflineRestoreJob() {
|
public MesWorkOrderOfflineRestoreJob() {
|
||||||
// super(MesWorkOrderOfflineRestoreJob.class, "补录离线生产数据JOB");
|
super(MesWorkOrderOfflineRestoreJob.class, "补录离线生产数据JOB");
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// @Autowired
|
@Autowired
|
||||||
// private IMesWorkOrderOfflineRestoreService workOrderOfflineRestoreService;
|
private IMesWorkOrderOfflineRestoreService workOrderOfflineRestoreService;
|
||||||
//
|
|
||||||
// @Override
|
@Override
|
||||||
// public void executeMesJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
|
public void executeMesJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
|
||||||
//
|
|
||||||
// String jobParam = this.getJobParam();
|
String jobParam = this.getJobParam();
|
||||||
// if (StringUtils.isEmpty(jobParam)) {
|
if (StringUtils.isEmpty(jobParam)) {
|
||||||
// log.info("补录离线生产数据JOB --- 参数为空 ---");
|
log.info("补录离线生产数据JOB --- 参数为空 ---");
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// Map<String, String> paramMap = JSONObject.parseObject(jobParam, Map.class);
|
Map<String, String> paramMap = JSONObject.parseObject(jobParam, Map.class);
|
||||||
//
|
|
||||||
// if (CollectionUtils.isEmpty(paramMap) || !paramMap.containsKey(MesPcnExtConstWords.ORGANIZE_CODE)) {
|
if (CollectionUtils.isEmpty(paramMap) || !paramMap.containsKey(MesPcnExtConstWords.ORGANIZE_CODE)) {
|
||||||
// log.info("补录离线生产数据JOB --- 参数未配置:工厂代码[organizeCode] ---");
|
log.info("补录离线生产数据JOB --- 参数未配置:工厂代码[organizeCode] ---");
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// StopWatch stopWatch = new StopWatch();
|
StopWatch stopWatch = new StopWatch();
|
||||||
//
|
|
||||||
// try {
|
try {
|
||||||
//
|
|
||||||
// stopWatch.start();
|
stopWatch.start();
|
||||||
//
|
|
||||||
// workOrderOfflineRestoreService.doRestoreWorkOrderOfflineData(paramMap);
|
workOrderOfflineRestoreService.doRestoreWorkOrderOfflineData(paramMap);
|
||||||
//
|
|
||||||
// } catch (Exception e) {
|
} catch (Exception e) {
|
||||||
//
|
|
||||||
// log.info("补录离线生产数据JOB --- ERROR --- {} ---", e.toString());
|
log.info("补录离线生产数据JOB --- ERROR --- {} ---", e.toString());
|
||||||
//
|
|
||||||
// } finally {
|
} finally {
|
||||||
//
|
|
||||||
// stopWatch.stop();
|
stopWatch.stop();
|
||||||
//
|
|
||||||
// log.info("补录离线生产数据JOB --- END --- 耗时: {} ms ---", stopWatch.getTotalTimeMillis());
|
log.info("补录离线生产数据JOB --- END --- 耗时: {} ms ---", stopWatch.getTotalTimeMillis());
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
//}
|
}
|
||||||
|
|||||||
@ -1,52 +1,88 @@
|
|||||||
//package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.job;
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.job;
|
||||||
//
|
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService;
|
import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||||
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
//import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||||
//import cn.estsh.i3plus.pojo.mes.bean.offline.MesWorkOrderAssemblyOffline;
|
import cn.estsh.i3plus.pojo.mes.bean.offline.MesWorkOrderAssemblyOffline;
|
||||||
//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderAssemblyOfflineRepository;
|
import cn.estsh.i3plus.pojo.mes.bean.offline.MesWorkOrderOfflineRestoreRecord;
|
||||||
//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRepository;
|
import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderAssemblyOfflineRepository;
|
||||||
//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRestoreRecordRepository;
|
import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRepository;
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRestoreRecordRepository;
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
//import org.springframework.stereotype.Service;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
//
|
import org.springframework.stereotype.Service;
|
||||||
//import java.util.List;
|
import org.springframework.util.CollectionUtils;
|
||||||
//import java.util.Map;
|
|
||||||
//
|
import java.util.*;
|
||||||
//@Slf4j
|
import java.util.stream.Collectors;
|
||||||
//@Service
|
|
||||||
//public class MesWorkOrderOfflineRestoreService implements IMesWorkOrderOfflineRestoreService {
|
@Slf4j
|
||||||
//
|
@Service
|
||||||
// @Autowired
|
public class MesWorkOrderOfflineRestoreService implements IMesWorkOrderOfflineRestoreService {
|
||||||
// private MesWorkOrderAssemblyOfflineRepository workOrderAssemblyOfflineRepository;
|
|
||||||
//
|
@Autowired
|
||||||
// @Autowired
|
private MesWorkOrderAssemblyOfflineRepository workOrderAssemblyOfflineRepository;
|
||||||
// private MesWorkOrderOfflineRepository workOrderOfflineRepository;
|
|
||||||
//
|
@Autowired
|
||||||
// @Autowired
|
private MesWorkOrderOfflineRepository workOrderOfflineRepository;
|
||||||
// private MesWorkOrderOfflineRestoreRecordRepository workOrderOfflineRestoreRecordRepository;
|
|
||||||
//
|
@Autowired
|
||||||
// @Override
|
private MesWorkOrderOfflineRestoreRecordRepository workOrderOfflineRestoreRecordRepository;
|
||||||
// public void doRestoreWorkOrderOfflineData(Map<String, String> paramMap) {
|
|
||||||
//
|
@Override
|
||||||
// String organizeCode = paramMap.get(MesPcnExtConstWords.ORGANIZE_CODE);
|
public void doRestoreWorkOrderOfflineData(Map<String, String> paramMap) {
|
||||||
//
|
|
||||||
// Integer qty = paramMap.containsKey(MesPcnExtConstWords.QTY) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.QTY)) : MesPcnExtConstWords.ONE_HUNDRED;
|
String organizeCode = paramMap.get(MesPcnExtConstWords.ORGANIZE_CODE);
|
||||||
//
|
|
||||||
// Map<String, List<MesWorkOrderAssemblyOffline>> workOrderAssemblyOfflineMap = getWorkOrderAssemblyOfflineMap(organizeCode, qty);
|
Integer qty = paramMap.containsKey(MesPcnExtConstWords.QTY) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.QTY)) : MesPcnExtConstWords.ONE_HUNDRED;
|
||||||
//
|
|
||||||
//
|
Map<String, List<MesWorkOrderAssemblyOffline>> workOrderAssemblyOfflineMap = getWorkOrderAssemblyOfflineMap(organizeCode, qty);
|
||||||
// }
|
|
||||||
//
|
if (CollectionUtils.isEmpty(workOrderAssemblyOfflineMap)) return;
|
||||||
// private Map<String, List<MesWorkOrderAssemblyOffline>> getWorkOrderAssemblyOfflineMap(String organizeCode, Integer qty) {
|
|
||||||
//
|
Map<String, MesWorkOrderOfflineRestoreRecord> workOrderOfflineRestoreRecordMap = getWorkOrderOfflineRestoreRecordMap(organizeCode, new ArrayList<>(workOrderAssemblyOfflineMap.keySet()));
|
||||||
// DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
||||||
// DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), MesPcnExtConstWords.SYSTEM_SYNC_STATUS, packBean);
|
for (Map.Entry<String, List<MesWorkOrderAssemblyOffline>> entry : workOrderAssemblyOfflineMap.entrySet()) {
|
||||||
// List<MesWorkOrderAssemblyOffline> workOrderAssemblyOfflineList = workOrderAssemblyOfflineRepository.findByHqlTopWhere(packBean, qty);
|
|
||||||
//
|
if (null == entry) continue;
|
||||||
// }
|
|
||||||
//
|
List<MesWorkOrderAssemblyOffline> workOrderAssemblyOfflineList = entry.getValue();
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询排序工单装配件离线数据[未同步的数据]
|
||||||
|
private Map<String, List<MesWorkOrderAssemblyOffline>> getWorkOrderAssemblyOfflineMap(String organizeCode, Integer qty) {
|
||||||
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||||
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), MesPcnExtConstWords.SYSTEM_SYNC_STATUS, packBean);
|
||||||
|
List<MesWorkOrderAssemblyOffline> workOrderAssemblyOfflineList = workOrderAssemblyOfflineRepository.findByHqlTopWhere(packBean, qty);
|
||||||
|
if (CollectionUtils.isEmpty(workOrderAssemblyOfflineList)) log.info("补录离线生产数据JOB --- 当前没有需要补录的工单装配件离线数据 ---");
|
||||||
|
return CollectionUtils.isEmpty(workOrderAssemblyOfflineList) ? null :
|
||||||
|
workOrderAssemblyOfflineList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderAssemblyOffline::getWorkOrderNo));
|
||||||
|
}
|
||||||
|
|
||||||
|
//离线工单补录记录表
|
||||||
|
private Map<String, MesWorkOrderOfflineRestoreRecord> getWorkOrderOfflineRestoreRecordMap(String organizeCode, List<String> workOrderNoList) {
|
||||||
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||||
|
DdlPreparedPack.getInPackList(workOrderNoList, MesPcnExtConstWords.WORK_ORDER_NO, packBean);
|
||||||
|
List<MesWorkOrderOfflineRestoreRecord> workOrderOfflineRestoreRecordList = workOrderOfflineRestoreRecordRepository.findByHqlWhere(packBean);
|
||||||
|
if (CollectionUtils.isEmpty(workOrderOfflineRestoreRecordList)) return null;
|
||||||
|
workOrderOfflineRestoreRecordList = workOrderOfflineRestoreRecordList.stream().filter(o -> null != o).
|
||||||
|
collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MesWorkOrderOfflineRestoreRecord::getWorkOrderNo))), ArrayList::new));
|
||||||
|
Map<String, MesWorkOrderOfflineRestoreRecord> workOrderOfflineRestoreRecordMap = workOrderOfflineRestoreRecordList.stream().filter(o -> null != o).collect(Collectors.toMap(MesWorkOrderOfflineRestoreRecord::getWorkOrderNo, o -> o));
|
||||||
|
log.info("补录离线生产数据JOB --- 查询到已补录过的生产工单包含: {} ---", workOrderOfflineRestoreRecordMap.keySet().toString());
|
||||||
|
return workOrderOfflineRestoreRecordMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue