diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java index 3c7d8f4..de57c5d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderService; +import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob.MesReportNoSortJob; import cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob.MesReportWorkByPreDayJob; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; @@ -18,12 +19,11 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @RestController @@ -48,6 +48,9 @@ public class TestController { @Autowired private IMesConfigService configService; + @Autowired + private IMesWorkOrderOfflineRestoreService workOrderOfflineRestoreService; + @GetMapping("/reportWorkByPreDayJob") @ApiOperation(value = "查询设备交互") public ResultBean queryReworkTaskByPager(String organizeCode) { @@ -121,4 +124,17 @@ public class TestController { //testService.insertList(); } + + @PostMapping("/testRestoreWorkOrderOfflineData") + @ApiOperation(value = "补录离线生产工单数据JOB") + public ResultBean testRestoreWorkOrderOfflineData(@RequestBody Map paramMap) { + try { + workOrderOfflineRestoreService.doRestoreWorkOrderOfflineData(paramMap); + return ResultBean.success("操作成功"); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreDispatchService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreDispatchService.java index 958ac49..32140d4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreDispatchService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/MesWorkOrderOfflineRestoreDispatchService.java @@ -188,7 +188,7 @@ public class MesWorkOrderOfflineRestoreDispatchService implements IMesWorkOrderO List assemblyOfflineList = entry.getValue(); Boolean isExistProductionRecord = (CollectionUtils.isEmpty(productionRecordOfflineMap) || !productionRecordOfflineMap.containsKey(entry.getKey())) ? false : true; - Long productionRecordId = isExistProductionRecord ? snowflakeIdMaker.nextId() : Long.valueOf(productionRecordOfflineMap.get(entry.getKey())); + Long productionRecordId = !isExistProductionRecord ? snowflakeIdMaker.nextId() : Long.valueOf(productionRecordOfflineMap.get(entry.getKey())); //写入加工记录 MesProductionRecord productionRecord; @@ -239,7 +239,7 @@ public class MesWorkOrderOfflineRestoreDispatchService implements IMesWorkOrderO workOrderAssemblyRepository.insert(workOrderAssembly); MesProductionAssembly productionAssembly = new MesProductionAssembly(); - BeanUtils.copyProperties(workOrderAssembly, productionAssembly, MesPcnExtConstWords.ID); + BeanUtils.copyProperties(assemblyOffline, productionAssembly, MesPcnExtConstWords.ID); productionAssembly.setCustSn(workOrderOffline.getCustSn()); productionAssembly.setModifyDatetime(now); productionAssembly.setModifyUser(MesPcnExtConstWords.JOB);