diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 3c9c7749..8a05db60 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -314,6 +314,7 @@ public class AbnormalBillController { public R saveDevice(@RequestBody List abnormalBillList) { Boolean flag; StringBuffer message = new StringBuffer(); + String site = CommonMethods.getSite(); List abnormalBills=new ArrayList<>(); try { for (AbnormalBillDto ab:abnormalBillList) { @@ -321,6 +322,7 @@ public class AbnormalBillController { abnormalBill.setHandle("AbnormalBillBo:1000,"+ab.getAbnormalNo()); abnormalBill.setUserConTime(LocalDateTime.now()); abnormalBill.setUserIsCon("true"); + abnormalBill.setSite(site); abnormalBills.add(abnormalBill); } flag=abnormalBillService.deviceRepairComplete(abnormalBills); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 19d12197..3c8e8b7f 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -1639,7 +1639,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 8ef42e32..195c05df 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -336,9 +336,8 @@ ELSE TO_CHAR(TO_NUMBER((SYSDATE -ZRRT.CREATED_DATE_TIME)*24),'FM9999990.000') END REPORT_WAIT_TIME , CASE WHEN ZRRT.ACTUAL_COMPLETE_DATE IS NOT NULL THEN - TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME)*24) - - NVL(ZRRT.WAIT_TIME,0),'FM9999990.000') - ELSE TO_CHAR(TO_NUMBER((SYSDATE- 8/24 - ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),'FM9999990.000') + TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME)*24),'FM9999990.000') + ELSE TO_CHAR(TO_NUMBER((SYSDATE- 8/24 - ZRRT.CREATED_DATE_TIME)*24),'FM9999990.000') END REPAIR_TIME , CASE WHEN ZRRT.STATUS = '401' THEN '待维修' WHEN ZRRT.STATUS = '501' THEN '维修中' diff --git a/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionTask.java b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionTask.java index c8c14ff3..c815d4fa 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionTask.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionTask.java @@ -124,8 +124,18 @@ public class InspectionTask extends Model { @TableField("SFC_DISPATCH_BO") private String sfcDispatchBo; + @TableField("QUESTION_C") + private String questionC; - public String getHandle() { + public String getQuestionC() { + return questionC; + } + + public void setQuestionC(String questionC) { + this.questionC = questionC; + } + + public String getHandle() { return handle; } diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java index 621f001d..78d73eed 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java @@ -227,6 +227,13 @@ public class ResourceRepairTask extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + /** + * 补充字段 OPERATOR_CONF_TIME 操作者确认时间 + */ + @TableField("OPERATOR_CONF_TIME") + private LocalDateTime operatorConfTime; + + /** * 设备HANDLE */ @@ -307,8 +314,15 @@ public class ResourceRepairTask extends Model { @TableField(exist = false) private String repairUserName; + public LocalDateTime getOperatorConfTime() { + return operatorConfTime; + } + + public void setOperatorConfTime(LocalDateTime operatorConfTime) { + this.operatorConfTime = operatorConfTime; + } - public String getRepairUserName() { + public String getRepairUserName() { return repairUserName; } diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index d48f6cac..f1a2decd 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -298,21 +298,18 @@ public class PodTemplateServiceImpl implements PodTemplateService { InspectionTask inspectionTask = list.get(0); String result = inspectionTask.getResult(); if (!inspectionTask.getStatus().equals(Constants.INSPECTION_TASK_STATUS_COMPLETE)||StringUtil.isBlank(result)){ - String checkUser = resrceMapper.findCustomFieldByResrce(site, inspectionTask.getResrce(), "CHECK_USR"); throw new BaseException("请联系"+checkUser+",处理专检任务。"); -// if (routerStep.getRework().equals("true") && stepId.startsWith("9")){ -// return; -// }else if (!result.equals(Constants.RSESULT_OK )||StringUtil.isBlank(result)){ -// -// String checkUser = resrceMapper.findCustomFieldByResrce(site, inspectionTask.getResrce(), "CHECK_USR"); -// throw new BaseException("请联系"+checkUser+",处理专检任务。"); -// } - /*** - * 判断这道工序是否是返修工序，返修工序不校验上工序不合格 - */ - }else if (routerStep.getRework().equals("true") && stepId.startsWith("9") && !result.equals(Constants.RSESULT_OK )){ + }else if ( !result.equals(Constants.RSESULT_OK ) && inspectionTask.getStatus().equals(Constants.INSPECTION_TASK_STATUS_COMPLETE) + && !routerStep.getRework().equals("true") && !stepId.startsWith("9")){ + String checkUser = resrceMapper.findCustomFieldByResrce(site, inspectionTask.getResrce(), "CHECK_USR"); + throw new BaseException("上工序不合格无法开始本工序，请联系"+checkUser+"处理专检任务"); + } + /*** + * 判断这道工序是否是返修工序，返修工序不校验上工序不合格 + */ + else if (routerStep.getRework().equals("true") && stepId.startsWith("9") && !result.equals(Constants.RSESULT_OK )){ try { sfcCrossService.startAction(site, currentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); } catch (Exception e) { @@ -322,14 +319,16 @@ public class PodTemplateServiceImpl implements PodTemplateService { sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.START.getCode(),null); return; } + }else { + try { + sfcCrossService.startAction(site, currentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); + } catch (Exception e) { + ExceptionUtil.throwException(e); + } + //更改派工单状态 + sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.START.getCode(),null); } - try { - sfcCrossService.startAction(site, currentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); - } catch (Exception e) { - ExceptionUtil.throwException(e); - } - //更改派工单状态 - sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.START.getCode(),null); + }); } diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionTaskManageController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionTaskManageController.java index 0b02beaf..379af0ae 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionTaskManageController.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionTaskManageController.java @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.quality.controller; import cn.hutool.core.date.DateUtil; import com.foreverwin.mesnac.common.service.InspectionTaskService; import com.foreverwin.mesnac.quality.dto.InspectionTaskManageRequest; +import com.foreverwin.mesnac.quality.model.AbnormalBillDisposeinspectionTask; import com.foreverwin.mesnac.quality.model.InspectionTaskManage; import com.foreverwin.mesnac.quality.service.InspectionTaskManageService; import com.foreverwin.modular.core.exception.BusinessException; @@ -86,7 +87,7 @@ public class InspectionTaskManageController { @ResponseBody @PostMapping("/saveInspectionTaskDetail") - public R saveInspectionTaskDetail(@RequestBody InspectionTaskManage inspectionTaskManage ) { + public R saveInspectionTaskDetail(@RequestBody InspectionTaskManage inspectionTaskManage) { try { String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); @@ -94,10 +95,10 @@ public class InspectionTaskManageController { } catch (Exception e) { return R.failed(e.getMessage()); } - return R.ok(); } + @Autowired private InspectionTaskService inspectionTaskService; diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionTaskManageMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionTaskManageMapper.java index 95548775..16caf40e 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionTaskManageMapper.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionTaskManageMapper.java @@ -16,4 +16,6 @@ public interface InspectionTaskManageMapper { List selectInspectionItemDetail(@Param("inspectionItemBo") String inspectionItemBo); List selectInspectionTaskDetail(@Param("inspectionTaskBo") String inspectionTaskBo); + + } diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java index 5f162390..488fc822 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java @@ -39,10 +39,6 @@ public class InspectionTaskManage implements Serializable { private String questionC; private String itemBo; - - - - public String getItemBo() { return itemBo; } diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index 0b43eb5a..a90e88b9 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -55,9 +55,11 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ @Autowired private RouterService routerService; + private static Logger logger = LoggerFactory.getLogger(InspectionTaskManageServiceImpl.class); + @Override public List findInspectionTask(InspectionTaskManageRequest inspectionTaskManageRequest) { return inspectionTaskManageMapper.findInspectionTask(inspectionTaskManageRequest); @@ -174,7 +176,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ queryWrapper.eq(SfcDispatch.DISPATCH_SEQ,String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq())+1)); SfcDispatch nextsfcDispatch=sfcDispatchService.getOne(queryWrapper); //判断下道工序是否为空 - if (nextsfcDispatch!=null && !nextsfcDispatch.getOperation().equals("HJ_6106JYGX") && !nextsfcDispatch.getOperation().equals("HJ_6106JRGX")){ + if (nextsfcDispatch!=null && (!nextsfcDispatch.getOperation().equals("HJ_6106JYGX") || !nextsfcDispatch.getOperation().equals("HJ_6106JRGX"))){ logger.error("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); //如果不等于空，判断下道工序的工作中心和质检完的工作中心是否一致 if (!sfcDispatchById.getWorkCenter().equals(nextsfcDispatch.getWorkCenter())){ @@ -290,7 +292,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ queryWrapper.eq(SfcDispatch.DISPATCH_SEQ,String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq())+1)); SfcDispatch nextsfcDispatch=sfcDispatchService.getOne(queryWrapper); //判断下道工序是否为空 - if (nextsfcDispatch!=null && !nextsfcDispatch.getOperation().equals("HJ_6106JYGX") && !nextsfcDispatch.getOperation().equals("HJ_6106JRGX")){ + if (nextsfcDispatch!=null && (!nextsfcDispatch.getOperation().equals("HJ_6106JYGX") || !nextsfcDispatch.getOperation().equals("HJ_6106JRGX")) ){ logger.error("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); //如果不等于空，判断下道工序的工作中心和质检完的工作中心是否一致 if (!sfcDispatchById.getWorkCenter().equals(nextsfcDispatch.getWorkCenter())){ @@ -340,6 +342,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ inspectionTaskModel.setComments(inspectionTaskManage.getComments()); inspectionTaskModel.setModifyUser(user); inspectionTaskModel.setModifiedDateTime(dateTime); + inspectionTaskModel.setQuestionC(inspectionTaskManage.getQuestionC()); inspectionTaskService.updateById(inspectionTaskModel);