Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
赵嘉伟 4 years ago
parent 159222189c 26d7ca3bd9
commit c0cee75003
6 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File

5
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -1411,7 +1411,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
}
return scrapDtoBySfc;
}
void creatInspectionTask(String site,String inspectionTaskBo,String sfc,String stepId){
void creatInspectionTask(String site,String inspectionTaskBo,String sfc,String stepId,String comments){
InspectionTask byId = inspectionTaskService.getById(inspectionTaskBo);
InspectionTask newInspectionTask = new InspectionTask();
if (StringUtil.notBlank(inspectionTaskBo)){
@ -1425,7 +1425,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
newInspectionTask.setTaskNo(newTaskNo);
newInspectionTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
newInspectionTask.setResult(null);
newInspectionTask.setComments(null);
newInspectionTask.setComments(comments);
newInspectionTask.setCreatedDateTime(LocalDateTime.now());
newInspectionTask.setModifiedDateTime(LocalDateTime.now());
}else {
@ -1458,6 +1458,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
task.setModifyUser(CommonMethods.getUser());
task.setModifiedDateTime(LocalDateTime.now());
task.setSfcDispatchBo(sfcDispatchBySfc.getHandle());
task.setComments(comments);
task.setSfc(sfc);
}
inspectionTaskService.save(newInspectionTask);

4
common/src/main/resources/mapper/ReportDataMapper.xml
Unescape Escape View File

@ -135,9 +135,9 @@
LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE
LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
WHERE ZSD.SITE = #{site}
<!--<if test="itemNumber != null and itemNumber != ''" >
<if test="itemNumber != null and itemNumber != ''" >
AND CFB.VALUE LIKE '%'||#{itemNumber}||'%'
</if>-->
</if>
<if test="workOrder != null and workOrder != ''" >
AND CFA.VALUE LIKE '%'||#{workOrder}||'%'
</if>

2
equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java
Unescape Escape View File

@ -34,6 +34,8 @@ public interface ResourceInspectTaskMapper extends BaseMapper<ResourceInspectTas
*/
List<ResourceInspectTask> getInspectTaskList(ResourceInspectTask resourceInspectTask);
List<ResourceInspectTask> getInspectTaskListByCondition(ResourceInspectTask resourceInspectTask);
/**
* 查找最新的任务创建时间
* @param resourceInspectTask

11
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskJobServiceImpl.java
Unescape Escape View File

@ -7,11 +7,11 @@ import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskJobService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService;
import com.foreverwin.modular.core.util.CommonMethods;
import org.apache.tomcat.jni.Local;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@ -32,10 +32,11 @@ public class ResourceInspectTaskJobServiceImpl implements ResourceInspectTaskJob
ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
resourceInspectTask.setSite(site);
resourceInspectTask.setCategory(Constants.INSPECTION_TYPE_DM);
LocalDateTime now = LocalDateTime.now();
LocalDateTime dateTime = LocalDateTime.now().minusDays(1);
resourceInspectTask.setPlanStartDate(dateTime);
resourceInspectTask.setPlanCompleteDate(now);
LocalDate now = LocalDate.now();
LocalDateTime startDate = LocalDateTime.parse(now.minusDays(1) + "T00:00:00");
LocalDateTime endDate = LocalDateTime.parse(now + "T00:00:00");
resourceInspectTask.setPlanStartDate(startDate);
resourceInspectTask.setPlanCompleteDate(endDate);
List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask);
for (ResourceInspectTask inspectTask: inspectTaskList) {
resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask);

26
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
Unescape Escape View File

@ -7,9 +7,12 @@ import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.helper.NextNumberHelper;
import com.foreverwin.mesnac.common.service.AnomalyService;
import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper;
import com.foreverwin.mesnac.equip.mapper.ResourceRepairTaskMapper;
import com.foreverwin.mesnac.equip.model.ResourceInspectTask;
import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare;
import com.foreverwin.mesnac.equip.model.ResourceRepairTask;
import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService;
import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
@ -28,6 +31,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.HashMap;
@ -66,6 +70,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
private DataFieldListService dataFieldListService;
@Autowired
private AnomalyService anomalyService;
@Autowired
private ResourceInspectTaskMapper resourceInspectTaskMapper;
@Autowired
private ResourceInspectPlanService resourceInspectPlanService;
@Override
public HashMap<String, Object> init() {
@ -238,6 +246,24 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
String resourceNo = repairTask.getResourceNo();
resrceService.updateResourceStatus(site, resourceNo, stopMachineT.equals("N")?"301":"5");
}
// 创建点检任务：维修完成时，若当前设备当日有点检不通过的任务，则为设备创建新的点检任务；
ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
resourceInspectTask.setSite(site);
resourceInspectTask.setCategory(Constants.INSPECTION_TYPE_DM);
LocalDate now = LocalDate.now();
LocalDateTime startDate = LocalDateTime.parse(now + "T00:00:00");
LocalDateTime endDate = LocalDateTime.parse(now.plusDays(1) + "T00:00:00");
resourceInspectTask.setPlanStartDate(startDate);
resourceInspectTask.setPlanCompleteDate(endDate);
resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
for (ResourceInspectTask inspectTask:inspectTaskList) {
if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask);
break;
}
}
break;
case "302":
// 取消代码、取消描述、取消时间、取消人员

17
equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
Unescape Escape View File

@ -729,6 +729,23 @@
AND ZRIT.TASK_CREATE_DATE &gt;= #{planStartDate}
</if>
</select>
<!--条件查询，查询点检任务-->
<select id="getInspectTaskListByCondition" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
WHERE ZRIT.SITE = #{site}
<if test="resrce != null and resrce != ''">
AND ZRIT.RESRCE = #{resrce}
</if>
<if test="category != null and category != ''">
AND ZRIT.CATEGORY = #{category}
</if>
<if test="planCompleteDate != null">
AND ZRIT.TASK_CREATE_DATE &lt;= #{planCompleteDate}
</if>
<if test="planStartDate != null">
AND ZRIT.TASK_CREATE_DATE &gt;= #{planStartDate}
</if>
</select>
<select id="findResourceTaskByResrceAndCategory" resultType="Integer">
SELECT COUNT(*) FROM Z_RESOURCE_INSPECT_TASK ZRIT

Write Preview
Loading…
Cancel
Save