From bb78d98afc715f39a7700e2e74121ab539b4c0d2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 16 Nov 2024 22:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/IMesWorkOrderOfflineRestoreService.java | 13 ++++ .../schedulejob/MesWorkOrderOfflineRestoreJob.java | 77 ++++++++++++++++++++++ .../job/MesWorkOrderOfflineRestoreService.java | 52 +++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/job/IMesWorkOrderOfflineRestoreService.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkOrderOfflineRestoreJob.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreService.java diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/job/IMesWorkOrderOfflineRestoreService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/job/IMesWorkOrderOfflineRestoreService.java new file mode 100644 index 0000000..7549045 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/job/IMesWorkOrderOfflineRestoreService.java @@ -0,0 +1,13 @@ +//package cn.estsh.i3plus.ext.mes.pcn.api.job; +// +//import java.util.Map; +// +//public interface IMesWorkOrderOfflineRestoreService { +// +// /** +// * 补录离线生产数据JOB +// * @param paramMap +// */ +// void doRestoreWorkOrderOfflineData(Map paramMap); +// +//} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkOrderOfflineRestoreJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkOrderOfflineRestoreJob.java new file mode 100644 index 0000000..02794df --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkOrderOfflineRestoreJob.java @@ -0,0 +1,77 @@ +//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.pojo.util.MesPcnExtConstWords; +//import cn.estsh.impp.framework.boot.init.ApplicationProperties; +//import com.alibaba.fastjson.JSONObject; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.quartz.DisallowConcurrentExecution; +//import org.quartz.JobExecutionContext; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +//import org.springframework.util.CollectionUtils; +//import org.springframework.util.StopWatch; +//import org.springframework.util.StringUtils; +// +//import java.util.Map; +// +///** +// * @author wangjie +// * @Description 补录离线生产数据JOB +// * @version 1.0 +// * @date 2021/2/2 16:44 +// **/ +//@Slf4j +//@DisallowConcurrentExecution +//@Component +//@ApiOperation("补录离线生产数据JOB") +//public class MesWorkOrderOfflineRestoreJob extends BaseMesScheduleJob { +// +// public MesWorkOrderOfflineRestoreJob() { +// super(MesWorkOrderOfflineRestoreJob.class, "补录离线生产数据JOB"); +// } +// +// @Autowired +// private IMesWorkOrderOfflineRestoreService workOrderOfflineRestoreService; +// +// @Override +// public void executeMesJob(JobExecutionContext context, ApplicationProperties applicationProperties) { +// +// String jobParam = this.getJobParam(); +// if (StringUtils.isEmpty(jobParam)) { +// log.info("补录离线生产数据JOB --- 参数为空 ---"); +// return; +// } +// +// Map paramMap = JSONObject.parseObject(jobParam, Map.class); +// +// if (CollectionUtils.isEmpty(paramMap) || !paramMap.containsKey(MesPcnExtConstWords.ORGANIZE_CODE)) { +// log.info("补录离线生产数据JOB --- 参数未配置:工厂代码[organizeCode] ---"); +// return; +// } +// +// StopWatch stopWatch = new StopWatch(); +// +// try { +// +// stopWatch.start(); +// +// workOrderOfflineRestoreService.doRestoreWorkOrderOfflineData(paramMap); +// +// } catch (Exception e) { +// +// log.info("补录离线生产数据JOB --- ERROR --- {} ---", e.toString()); +// +// } finally { +// +// stopWatch.stop(); +// +// log.info("补录离线生产数据JOB --- END --- 耗时: {} ms ---", stopWatch.getTotalTimeMillis()); +// +// } +// +// } +// +//} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreService.java new file mode 100644 index 0000000..ccdfc70 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreService.java @@ -0,0 +1,52 @@ +//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.pojo.util.MesPcnExtConstWords; +//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +//import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +//import cn.estsh.i3plus.pojo.mes.bean.offline.MesWorkOrderAssemblyOffline; +//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderAssemblyOfflineRepository; +//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRepository; +//import cn.estsh.i3plus.pojo.mes.repository.offline.MesWorkOrderOfflineRestoreRecordRepository; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import java.util.List; +//import java.util.Map; +// +//@Slf4j +//@Service +//public class MesWorkOrderOfflineRestoreService implements IMesWorkOrderOfflineRestoreService { +// +// @Autowired +// private MesWorkOrderAssemblyOfflineRepository workOrderAssemblyOfflineRepository; +// +// @Autowired +// private MesWorkOrderOfflineRepository workOrderOfflineRepository; +// +// @Autowired +// private MesWorkOrderOfflineRestoreRecordRepository workOrderOfflineRestoreRecordRepository; +// +// @Override +// public void doRestoreWorkOrderOfflineData(Map paramMap) { +// +// String organizeCode = paramMap.get(MesPcnExtConstWords.ORGANIZE_CODE); +// +// Integer qty = paramMap.containsKey(MesPcnExtConstWords.QTY) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.QTY)) : MesPcnExtConstWords.ONE_HUNDRED; +// +// Map> workOrderAssemblyOfflineMap = getWorkOrderAssemblyOfflineMap(organizeCode, qty); +// +// +// } +// +// private Map> getWorkOrderAssemblyOfflineMap(String organizeCode, Integer qty) { +// +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); +// DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), MesPcnExtConstWords.SYSTEM_SYNC_STATUS, packBean); +// List workOrderAssemblyOfflineList = workOrderAssemblyOfflineRepository.findByHqlTopWhere(packBean, qty); +// +// } +// +//}