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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
master
philip 3 years ago
parent f02a379a3e e5a1dec8cd
commit 1bf2d97646
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -513,11 +513,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
AbnormalBillDispose abnormalBillDispose1 = abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle());
abnormalPlanService.saveAbnormalPlan(abnormalBill2,abnormalBillDispose1,now);
}
//判断该异常解决方案是否是让步放行、配作,如果是，就调用孙豪的方法
if(Constants.CONCESSION.equals(abnormalBillDispose.getAbnormalMethod()) ||
Constants.MATCH.equals(abnormalBillDispose.getAbnormalMethod())){
//判断该异常解决方案是否是让步放行、配作,并且关联来源不是空，如果是,就调用孙豪的方法
if((Constants.CONCESSION.equals(abnormalBillDispose.getAbnormalMethod()) ||
Constants.MATCH.equals(abnormalBillDispose.getAbnormalMethod()))
&& !StringUtil.isBlank(abnormalBill2.getObjectBo())){
try{
this.creatInspectionTask(site,abnormalBill2.getObjectBo(),abnormalBill2.getSfc(),abnormalBill2.getStepId(),null);
this.creatInspectionTask(site,abnormalBill2.getObjectBo(),abnormalBill2.getSfc(),abnormalBill2.getStepId(),AnomalyConstant.AnomalyMethod.msg(abnormalBillDispose.getAbnormalMethod()));
}catch (Exception e){
throw new BaseException("createInspectionTask方法报错,"+e.getMessage());
}

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

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

@ -257,7 +257,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
resourceInspectTask.setPlanStartDate(startDate);
resourceInspectTask.setPlanCompleteDate(endDate);
resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskList(resourceInspectTask);
List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
for (ResourceInspectTask inspectTask:inspectTaskList) {
if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
resourceInspectPlanService.autoCreateTaskByResourceInspectTask(inspectTask);

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