diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrderJobService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrderJobService.java index 57a9f76..092241a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrderJobService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrderJobService.java @@ -60,13 +60,13 @@ public class MesOrderJobService implements IMesOrderJobService { @Autowired private MesEquipmentCheckDetailRepository equDetailRepository; @Autowired - private MesEpEquipmentCheckDetailRepository epEquDetailRepository; - @Autowired private MesAntiStaticCheckDetailRepository antiStaticCheckDetailRepository; @Autowired private MesFirstOrderDetailRepository mesFirstOrderDetailRDao; @Autowired private MesFailCaseCheckDetailRepository failCaseCheckDetailRDao; + @Autowired + private MesProcessTorqueManageTaskDetailRepository torqueManageTaskDetailRepository; @Override public List queryMesOrderJob(MesOrderJobModel orderJob) { @@ -202,6 +202,14 @@ public class MesOrderJobService implements IMesOrderJobService { List projectTourDetailList = projectTourDetailRDao.findByHqlWhere(packBean); return CollectionUtils.isEmpty(projectTourDetailList)? true : false; + case TORQUE_MANAGE: + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(orderNo, "orderJobNo", ddlPackBean); + DdlPreparedPack.getNotInPackArray(new Object[]{MesPcnExtEnumUtil.CHECK_RESULT.NG.getValue(), MesPcnExtEnumUtil.CHECK_RESULT.OK.getValue()}, + MesPcnExtConstWords.CHECK_RESULT, ddlPackBean); + List torqueManageTaskDetailList = torqueManageTaskDetailRepository.findByHqlWhere(ddlPackBean); + return CollectionUtils.isEmpty(torqueManageTaskDetailList)? true : false; + default: throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManage.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManage.java index 8921f89..12da4bf 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManage.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManage.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -58,4 +59,9 @@ public class MesProcessTorqueManage extends BaseBean implements Serializable { @ApiParam("下限值") private String downLimit; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java index 9010ea9..6716940 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,6 +52,10 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial @ApiParam("产线代码") private String workCenterCode; + @Column(name="WORK_CENTER_NAME") + @ApiParam("产线名称") + private String workCenterName; + @Column(name="WORK_CELL_CODE") @ApiParam("工位代码") private String workCellCode; @@ -71,6 +76,10 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial @ApiParam("零件编号") private String partNo; + @Column(name="PART_NAME") + @ApiParam("零件名称") + private String partName; + @Column(name = "PROCESS_CODE") @ApiParam(value = "工序编号") public String processCode; @@ -197,6 +206,11 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial @ApiParam("扭矩螺丝刀-扭矩管理NO3") private String torqueManageNo3; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Transient @ApiParam("全称扭矩螺丝刀-扭矩管理NO3") private String torqueManageNo3Full;