forked from I3-YF/i3plus-mes-yfai
1、单据作业增加关闭原因、关闭时间、关闭操作人员
2、返修增加维修明细时维修判定枚举更改为页面维护，涉及修改查询报表：修理品票明细报表、维修记录报表；（工程不良报表影响最大，修改大，暂不修改）tags/yfai-mes-ext-v1.0
yxw
2 years ago
parent
57c6ee06fb
commit
db90ce0130
@ -0,0 +1,70 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base.jx;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesRepairJudgeType;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.BatchIdModel;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IJxRepairJudgeTypeService {
|
||||
|
||||
/**
|
||||
* 分页查询出货检验项目
|
||||
*
|
||||
* @param oqcProject 查询条件
|
||||
* @param pager 分页条件
|
||||
* @return 出货检验项目分页数据
|
||||
*/
|
||||
@ApiOperation(value = "分页查询出货检验项目", notes = "分页查询出货检验项目")
|
||||
ListPager<MesRepairJudgeType> queryRepairJudgeTypePager(MesRepairJudgeType oqcProject, Pager pager);
|
||||
|
||||
/**
|
||||
* 新增出货检验项目
|
||||
* @param model 出货检验项目信息
|
||||
*/
|
||||
@ApiOperation(value = "新增出货检验项目", notes = "新增出货检验项目")
|
||||
MesRepairJudgeType insertRepairJudgeType(MesRepairJudgeType model);
|
||||
|
||||
/**
|
||||
* 编辑出货检验项目
|
||||
* @param model 出货检验项目信息
|
||||
*/
|
||||
@ApiOperation(value = "编辑出货检验项目", notes = "编辑出货检验项目")
|
||||
void updateRepairJudgeType(MesRepairJudgeType model);
|
||||
|
||||
/**
|
||||
* 根据ID启用或禁用出货检验项目
|
||||
* @param model
|
||||
* @param userName
|
||||
*/
|
||||
@ApiOperation(value = "根据ID启用或禁用出货检验项目", notes = "根据ID启用或禁用出货检验项目")
|
||||
int updateRepairJudgeTypeValidById(BatchIdModel model, String userName);
|
||||
|
||||
/**
|
||||
* 根据ID启用或禁用出货检验项目
|
||||
* @param model
|
||||
* @param userName
|
||||
*/
|
||||
@ApiOperation(value = "根据ID启用或禁用出货检验项目", notes = "根据ID启用或禁用出货检验项目")
|
||||
int deleteRepairJudgeTypeValidById(BatchIdModel model, String userName);
|
||||
|
||||
/**
|
||||
* 获取维修判定类型信息集合
|
||||
* @param organizeCode 组织代码
|
||||
* @return 维修判定类型信息集合
|
||||
*/
|
||||
@ApiOperation(value = "获取维修判定类型信息集合", notes = "获取维修判定类型信息集合")
|
||||
List<MesRepairJudgeType> queryRepairJudgeList(String organizeCode);
|
||||
|
||||
/**
|
||||
* 获取维修判定类型信息集合
|
||||
* @param organizeCode 组织代码
|
||||
* @return 维修判定类型信息集合
|
||||
*/
|
||||
@ApiOperation(value = "获取维修判定类型信息集合", notes = "获取维修判定类型信息集合")
|
||||
Map<String, String> queryRepairJudgeMap(String organizeCode);
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.busi.jx;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesProdBindRecordExt;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* @PROJECT_NAME: i3plus-mes-panasonic-jx
|
||||
* @DESCRIPTION:
|
||||
* @USER: xinwang.yi
|
||||
* @DATE: 2023-11-13 17:04
|
||||
*/
|
||||
public interface IJxProductReportService {
|
||||
|
||||
@ApiOperation("获取物料绑定记录")
|
||||
ListPager<MesProdBindRecord> queryMesProdBindRecordByPager(MesProdBindRecordExt prodBindRecordExt, Pager pager);
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.busi.jx;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.jx.IJxProductReportService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesProdBindRecordExt;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.impp.framework.base.controller.MesBaseController;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @PROJECT_NAME: i3plus-mes-panasonic-jx
|
||||
* @DESCRIPTION:
|
||||
* @USER: xinwang.yi
|
||||
* @DATE: 2023-11-13 17:18
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(MesExtConstWords.BASE_URL_MES_JX + "/report")
|
||||
@Api(tags = "嘉兴报表")
|
||||
public class JxReportController extends MesBaseController {
|
||||
|
||||
@Autowired
|
||||
private IJxProductReportService productReportService;
|
||||
|
||||
@GetMapping(value = "/mes-prod-bind-record/query")
|
||||
@ApiOperation(value = "按条件分页查询MES物料绑定记录数据")
|
||||
public ResultBean queryMesProdBindRecord(MesProdBindRecordExt prodBindRecordExt, Pager pager) {
|
||||
try {
|
||||
prodBindRecordExt.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
|
||||
ListPager listPager = productReportService.queryMesProdBindRecordByPager(prodBindRecordExt, pager);
|
||||
return ResultBean.success("操作成功").setListPager(listPager)
|
||||
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,149 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.jx;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.jx.IJxRepairJudgeTypeService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesRepairJudgeType;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.BatchIdModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.repository.MesRepairJudgeTypeRepository;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.sqlpack.MesExtHqlPack;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @PROJECT_NAME: i3plus-mes-panasonic-jx
|
||||
* @DESCRIPTION:
|
||||
* @USER: xinwang.yi
|
||||
* @DATE: 2023-11-13 11:53
|
||||
*/
|
||||
public class JxMesRepairJudgeTypeService implements IJxRepairJudgeTypeService {
|
||||
|
||||
@Autowired
|
||||
private MesRepairJudgeTypeRepository repairJudgeTypeRepository;
|
||||
|
||||
@Override
|
||||
public ListPager<MesRepairJudgeType> queryRepairJudgeTypePager(MesRepairJudgeType model, Pager pager) {
|
||||
DdlPackBean hqlPack = MesExtHqlPack.getRepairJudgeType(model);
|
||||
pager = PagerHelper.getPager(pager, repairJudgeTypeRepository.findByHqlWhereCount(hqlPack));
|
||||
hqlPack.setOrderByStr(" order by seq asc ");
|
||||
return new ListPager(repairJudgeTypeRepository.findByHqlWherePage(hqlPack, pager), pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesRepairJudgeType insertRepairJudgeType(MesRepairJudgeType model) {
|
||||
//数据唯一性校验
|
||||
StringBuffer whereStr = new StringBuffer();
|
||||
|
||||
// 封装唯一校验查询条件
|
||||
HqlPack.getStringEqualPack(model.getOrganizeCode(), MesExtConstWords.ORGANIZE_CODE, whereStr);
|
||||
HqlPack.getStringEqualPack(model.getRepairJudgeCode(), MesExtConstWords.REPAIR_JUDGE_CODE, whereStr);
|
||||
|
||||
if (repairJudgeTypeRepository.isExitByHqlWhere(whereStr.toString())) {
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
|
||||
.setErrorDetail("维修判定类型代码【%s】在维修判定类型信息中已存在"
|
||||
, model.getRepairJudgeCode())
|
||||
.setErrorSolution("请更换新增参数")
|
||||
.build();
|
||||
}
|
||||
|
||||
ConvertBean.serviceModelInitialize(model, AuthUtil.getSessionUser().getUserName());
|
||||
return repairJudgeTypeRepository.insert(model);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateRepairJudgeType(MesRepairJudgeType model) {
|
||||
MesRepairJudgeType repairJudgeTypeDb = repairJudgeTypeRepository.getById(model.getId());
|
||||
|
||||
if (null == repairJudgeTypeDb)
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
|
||||
.setErrorDetail("ID[%s]记录不存在", model.getId())
|
||||
.build();
|
||||
|
||||
// 封装唯一校验查询条件
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
|
||||
DdlPreparedPack.getStringEqualPack(model.getRepairJudgeCode(), MesExtConstWords.REPAIR_JUDGE_CODE, packBean);
|
||||
MesRepairJudgeType repairJudgeTypeDbIsExist = repairJudgeTypeRepository.getByProperty(packBean);
|
||||
|
||||
if (null != repairJudgeTypeDbIsExist && repairJudgeTypeDbIsExist.getId().compareTo(repairJudgeTypeDbIsExist.getId()) != 0) {
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
|
||||
.setErrorDetail("维修判定类型代码【%s】在维修判定类型启用或禁用数据中已存在"
|
||||
, model.getRepairJudgeCode())
|
||||
.setErrorSolution("请更换新增参数")
|
||||
.build();
|
||||
}
|
||||
|
||||
repairJudgeTypeDb.setRepairJudgeCode(model.getRepairJudgeCode());
|
||||
repairJudgeTypeDb.setRepairJudgeName(model.getRepairJudgeName());
|
||||
repairJudgeTypeDb.setSeq(model.getSeq());
|
||||
repairJudgeTypeDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
|
||||
|
||||
ConvertBean.serviceModelUpdate(repairJudgeTypeDb, model.getModifyUser());
|
||||
repairJudgeTypeRepository.save(repairJudgeTypeDb);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateRepairJudgeTypeValidById(BatchIdModel model, String userName) {
|
||||
StringBuffer wheres = new StringBuffer();
|
||||
HqlPack.getInPack(String.join(",", model.getIds()), MesExtConstWords.ID, wheres);
|
||||
|
||||
int num = repairJudgeTypeRepository.updateByHqlWhere(
|
||||
wheres.toString(),
|
||||
new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.IS_VALID, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
|
||||
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), model.getStatus(), userName, TimeTool.getNowTime(true)}
|
||||
);
|
||||
return num;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteRepairJudgeTypeValidById(BatchIdModel model, String userName) {
|
||||
StringBuffer wheres = new StringBuffer();
|
||||
HqlPack.getInPack(String.join(",", model.getIds()), MesExtConstWords.ID, wheres);
|
||||
|
||||
int num = repairJudgeTypeRepository.updateByHqlWhere(
|
||||
wheres.toString(),
|
||||
new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.IS_VALID, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
|
||||
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), userName, TimeTool.getNowTime(true)}
|
||||
);
|
||||
return num;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesRepairJudgeType> queryRepairJudgeList(String organizeCode) {
|
||||
|
||||
return repairJudgeTypeRepository.findByProperty(
|
||||
new String[]{MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_DELETED, MesExtConstWords.IS_VALID},
|
||||
new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> queryRepairJudgeMap(String organizeCode) {
|
||||
List<MesRepairJudgeType> mesRepairJudgeTypes = queryRepairJudgeList(organizeCode);
|
||||
return CollectionUtils.isEmpty(mesRepairJudgeTypes) ? null :
|
||||
mesRepairJudgeTypes.stream().collect(Collectors.toMap(
|
||||
MesRepairJudgeType::getRepairJudgeCode, MesRepairJudgeType::getRepairJudgeName, (x,y) -> y));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.jx;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.jx.IJxProductReportService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesPartExt;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesProdBindRecordExt;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.repository.MesPartExtRepository;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.repository.MesProdBindRecordExtRepository;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.repository.MesProduceSnExtRepository;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.sqlpack.MesExtHqlPack;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import cn.estsh.i3plus.pojo.mes.sqlpack.MesHqlPack;
|
||||
import org.apache.shiro.util.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @PROJECT_NAME: i3plus-mes-panasonic-jx
|
||||
* @DESCRIPTION:
|
||||
* @USER: xinwang.yi
|
||||
* @DATE: 2023-11-13 17:06
|
||||
*/
|
||||
@Service
|
||||
public class JxProductReportService implements IJxProductReportService {
|
||||
|
||||
@Autowired
|
||||
private MesPartExtRepository partExtRepository;
|
||||
|
||||
@Autowired
|
||||
private MesProdBindRecordExtRepository prodBindRecordExtRepository;
|
||||
|
||||
@Override
|
||||
public ListPager<MesProdBindRecord> queryMesProdBindRecordByPager(MesProdBindRecordExt prodBindRecordExtExt, Pager pager) {
|
||||
DdlPackBean hqlPack = MesExtHqlPack.getMesProdBindRecordExt(prodBindRecordExtExt);
|
||||
int count = prodBindRecordExtRepository.findByHqlWhereCount(hqlPack);
|
||||
pager = PagerHelper.getPager(pager, count);
|
||||
hqlPack.setOrderByStr(prodBindRecordExtExt.orderBy());
|
||||
List<MesProdBindRecordExt> prodBindRecordExts = prodBindRecordExtRepository.findByHqlWherePage(hqlPack, pager);
|
||||
if (CollectionUtils.isEmpty(prodBindRecordExts)) {
|
||||
return new ListPager(prodBindRecordExts, pager);
|
||||
}
|
||||
|
||||
// 去重并获取物料代码
|
||||
Set<String> itemPartNoSet = prodBindRecordExts.stream().map(MesProdBindRecord::getItemPartNo).collect(Collectors.toSet());
|
||||
Set<String> partNoSet = prodBindRecordExts.stream().map(MesProdBindRecord::getPartNo).collect(Collectors.toSet());
|
||||
|
||||
partNoSet.addAll(itemPartNoSet);
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(prodBindRecordExtExt.getOrganizeCode());
|
||||
DdlPreparedPack.getInPackList(new ArrayList<>(partNoSet), MesExtConstWords.PART_NO, packBean);
|
||||
List<MesPartExt> parts = partExtRepository.findByHqlWhere(packBean);
|
||||
Map<String, String> partMap = parts.stream().collect(Collectors.toMap(MesPartExt::getPartNo, MesPartExt::getPartName));
|
||||
|
||||
for (MesProdBindRecordExt mesProdBindRecord : prodBindRecordExts) {
|
||||
if (!CollectionUtils.isEmpty(partMap)) {
|
||||
if (!StringUtil.isEmpty(mesProdBindRecord.getPartNo()) && partMap.containsKey(mesProdBindRecord.getPartNo())) {
|
||||
mesProdBindRecord.setPartName(partMap.get(mesProdBindRecord.getPartNo()));
|
||||
}
|
||||
if (!StringUtil.isEmpty(mesProdBindRecord.getItemPartNo()) && partMap.containsKey(mesProdBindRecord.getItemPartNo())) {
|
||||
mesProdBindRecord.setItemPartName(partMap.get(mesProdBindRecord.getItemPartNo()));
|
||||
}
|
||||
}
|
||||
mesProdBindRecord.setActionTypeName(StringUtil.isEmpty(mesProdBindRecord.getActionType()) ?
|
||||
null : MesEnumUtil.MES_ACTION_TYPE.valueOfDescription(mesProdBindRecord.getActionType()));
|
||||
mesProdBindRecord.setIsBindKeyName(mesProdBindRecord.getIsBindKey() == null ?
|
||||
null : MesEnumUtil.MES_IS_BIND_KEY.valueOfDescription(mesProdBindRecord.getIsBindKey()));
|
||||
}
|
||||
|
||||
return new ListPager(prodBindRecordExts, pager);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Index;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @PROJECT_NAME: i3plus-mes-panasonic-jx
|
||||
* @DESCRIPTION: 维修判定类型
|
||||
* @USER: xinwang.yi
|
||||
* @DATE: 2023-11-13 11:45
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_REPAIR_JUDGE_TYPE", indexes = {
|
||||
@Index(columnList = "REPAIR_JUDGE_CODE")
|
||||
})
|
||||
@Api("维修判定类型")
|
||||
public class MesRepairJudgeType extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 9046361474577275908L;
|
||||
|
||||
@Column(name = "REPAIR_JUDGE_CODE")
|
||||
@ApiParam("维修判定代码")
|
||||
private String repairJudgeCode;
|
||||
|
||||
@Column(name = "REPAIR_JUDGE_NAME")
|
||||
@ApiParam("维修判定名称")
|
||||
private String repairJudgeName;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("排序")
|
||||
private String seq;
|
||||
|
||||
@Column(name = "SYSTEM_SYNC_STATUS")
|
||||
@ColumnDefault("2")
|
||||
@ApiParam(value = "系统同步标志")
|
||||
public Integer systemSyncStatus = 2;
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.repository;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.bean.MesRepairJudgeType;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @author xinwang.yi
|
||||
* @version 1.0
|
||||
* @date 2023/11/13 9:17
|
||||
**/
|
||||
@Repository
|
||||
public interface MesRepairJudgeTypeRepository extends BaseRepository<MesRepairJudgeType, Long> {
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue