diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java index a5fe55c..c347cb1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java @@ -1,74 +1,16 @@ -package cn.estsh.i3plus.ext.mes.apiservice.controller.base;/* package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IMesEnumExtService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.icloud.core.sdk.ICoreLocaleResourceCloud; -import cn.estsh.i3plus.icloud.core.sdk.ICorePersonnelCloud; -import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud; -import cn.estsh.i3plus.mes.api.iservice.base.*; -import cn.estsh.i3plus.mes.api.iservice.busi.*; -import cn.estsh.i3plus.mes.apiservice.serviceimpl.base.FileService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; -import cn.estsh.i3plus.platform.common.exception.BaseImppException; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.platform.common.tool.ExcelTool; -import cn.estsh.i3plus.platform.common.tool.SerializeTool; -import cn.estsh.i3plus.platform.common.tool.StringTool; -import cn.estsh.i3plus.platform.common.util.MesConstWords; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.base.bean.ImppFile; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.mes.bean.*; -import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; -import cn.estsh.i3plus.pojo.mes.model.*; -import cn.estsh.i3plus.pojo.model.mes.ExcelImportModel; -import cn.estsh.i3plus.pojo.model.platform.UserDetailModel; -import cn.estsh.i3plus.pojo.platform.bean.*; 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.fileservice.ImppFileService; -import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.persistence.EntityManager; -import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -*/ - -import cn.estsh.i3plus.ext.mes.api.base.IMesEnumExtService; -import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.impp.framework.base.controller.MesBaseController; -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 com.alibaba.excel.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -89,8303 +31,33 @@ import java.util.Map; @Api(description = "MES基础数据") @RequestMapping(MesCommonConstant.MES_YANFEN + "/base-data") public class BaseExtDataController extends MesBaseController { -/* - public static final Logger LOGGER = LoggerFactory.getLogger(BaseExtDataController.class); @Autowired - private INumberRuleService numberRuleService; - @Autowired - private IShiftService shiftService; - @Autowired - private IBomService bomService; - @Autowired - private IKeyDataService keyDataService; - @Autowired - private IProdCfgService prodCfgService; - @Autowired - private IPartDataService partDataService; - @Autowired - private IPLCService plcService; - @Autowired - private IEsopService esopService; - @Autowired - private IRepairService repairService; - @Autowired - private IScrapService scrapService; - @Autowired - private IBtnBindEvtService btnBindEvtService; - @Autowired - private IEventActionSerivce eventActionSerivce; - @Autowired - private IActionService actionService; - @Autowired - private IMethodService methodService; - @Autowired - private IActionMethodService actionMethodService;*/ - @Autowired private IMesEnumExtService enumService; - /*@Autowired - private IButtonStatusService buttonStatusService; - @Autowired - private IEquipmentService equipmentService; - @Autowired - private IWcCheckService wcCheckService; - @Autowired - private IMesPlcService mesPlcService; - @Autowired - private IDatasourceService datasourceService; - @Autowired - private IDefectService defectService; - @Autowired - private IProduceCtgyPictureService produceCtgyPictureService; - @Autowired - private ITypeCfgService typeCfgService; - @Autowired - private IDefectCauseService defectCauseService; - @Autowired - private IQcCheckStandardService qcCheckStandardService; - @Autowired - private IFiCfgService fiCfgService; - @Autowired - private IObjectCfgService objectCfgService; - @Autowired - private IProdPackService prodPackService; - @Autowired - private IProductEncodeCfgService productEncodeCfgService; - @Autowired - private IOrganizationInitService organizationInitService; - @Autowired - private ILabelTemplateService labelTemplateService; - @Autowired - private IKeyActionService keyActionService; - @Autowired - private IActionIfService actionIfService; - @Autowired - private IIfService ifService; - @Autowired - private IPartObjectService partObjectService; - @Autowired - private IMesQualityStandardCfgService qualityStandardCfgService; - @Autowired - private ICoreLocaleResourceCloud coreLocaleResourceCloud; - @Autowired - private IPartProduceTypeService partProduceTypeService; - @Autowired - private IBaseDataService baseDataService; - @Autowired - private IMesPartFormulaService mesPartFormulaService; - @Autowired - private IMesProdScatterDetailService prodScatterDetailService; - @Autowired - private EntityManager entityManager; - @Autowired - private IPartStockScheduleService partStockScheduleService; - @Autowired - private IModelGradeService modelGradeService; - @Autowired - private IPartColorService partColorService; - @Autowired - private IProdModelCfgService prodModelCfgService; - @Autowired - private IScatterPartCfgBomService scatterPartCfgBomService; - @Autowired - private IScatterPartProdCfgService scatterPartProdCfgService; - @Autowired - private IMesBlindService mesBlindService; - @Autowired - private IMesScatterBomCfgService scatterBomCfgService; - @Autowired - private IMesPartProdCfgTypeService partProdCfgTypeService; - @Autowired - private IMesWorkCellDefectService workCellDefectService; - @Autowired - private IMesEncodeRuleMapService encodeRuleMapService; - @Autowired - private IMesLocationService mesLocationService; - - @Autowired - private IMesInterfaceDataMapperService interfaceDataMapperService; - - @Autowired - private ImppFileService imppFileService; - - @Autowired - private FileService fileService; - - @Autowired - private ICoreSysFileCloud coreSysFileCloud; - - @Autowired - private IBaseDataSyncService baseDataSyncService; - - @Autowired - private IBypassMappingService bypassMappingService; - - @Autowired - private IMesSubPartService mesSubPartService; - - @Autowired - private IMesExceptionAlertCfgService mesExceptionAlertCfgService; - @Autowired - private ICorePersonnelCloud personnelCloud; - @Autowired - private IPartFurnaceService partFurnaceService; - @Autowired - private IMesEnumService mesEnumService; - @Autowired - private IMesProduceCtgyPictureService mesProduceCtgyPictureService; - - @Autowired - private ICustomerService customerService; - - @Autowired - private ICustomerSnRuleService customerSnRuleService; - - @Autowired - private IContainerService containerService; - - @Autowired - private IElectrotestingPrintDataService electrotestingPrintDataService; - - @Autowired - private IMesPartCarModelService mesPartCarModelService; - - @Autowired - private IMesPartSpecificService mesPartSpecificService; - - @Autowired - private IHolidayVacationService holidayVacationService; - - @Autowired - private IMesDbDataCheckService mesDbDataCheckService; - - @Autowired - private IMesPendingReportTypeService mesPendingReportTypeService; - - @Autowired - private IMesFailureModePartsService mesFailureModePartsService; - - @Autowired - private IMesFailureModeApprovalService mesFailureModeApprovalService; - - @Resource(name = "redisRes") - private ImppRedis redisRes; - - private static final String EXCEL_NAME = "MES_PROD_CFG_CACHE_IMPORTSPEED"; - - */ -/*************MES BYPASS项映射关系****start***********//* - - - @GetMapping(value = "/mes-bypass-mapping/query") - @ApiOperation(value = "按条件分页查询MES BYPASS项映射关系数据") - public ResultBean queryMesQualityStandardCfg(MesBypassMapping bypassMapping, Pager pager) { - try { - bypassMapping.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = bypassMappingService.queryBypassMappingByPager(bypassMapping, 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); - } - } - - @PostMapping(value = "/mes-bypass-mapping/insert") - @ApiOperation(value = "新增mes BYPASS项映射关系信息") - public ResultBean insertBypassMapping(MesBypassMapping bypassMapping) { - try { - //条件验证 - ValidatorBean.beginValid(bypassMapping) - .notNull("workCenterCode", bypassMapping.getWorkCenterCode()) - .notNull("bypassSeq", bypassMapping.getBypassSeq()) - .notNull("checkName", bypassMapping.getCheckName()); - bypassMapping.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - bypassMappingService.insertBypassMapping(bypassMapping, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-bypass-mapping/update") - @ApiOperation(value = "更新mes BYPASS项映射关系信息") - public ResultBean updateBypassMapping(MesBypassMapping bypassMapping) { - try { - ValidatorBean.beginValid(bypassMapping) - .notNull("workCenterCode", bypassMapping.getWorkCenterCode()) - .notNull("bypassSeq", bypassMapping.getBypassSeq()) - .notNull("checkName", bypassMapping.getCheckName()); - bypassMapping.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - bypassMappingService.updateBypassMapping(bypassMapping, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-bypass-mapping/status-update") - @ApiOperation(value = "根据id启用或禁用库存排程配置信息") - public ResultBean updateBypassMappingStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - bypassMappingService.updateMesActionIfStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES MES_BYPASS项映射关系****end***********//* - - - */ -/*************MES 库存排程配置****start***********//* - - - @GetMapping(value = "/mes-part-stock-schedule/query") - @ApiOperation(value = "按条件分页查询MES库存排程配置数据") - public ResultBean queryMesQualityStandardCfg(MesPartStockSchedule qualityStandardCfg, Pager pager) { - try { - qualityStandardCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = partStockScheduleService.queryPartStockScheduleByPager(qualityStandardCfg, 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); - } - } - - @PostMapping(value = "/mes-part-stock-schedule/insert") - @ApiOperation(value = "新增mes库存排程配置信息") - public ResultBean insertMesPartStockSchedule(MesPartStockSchedule partStockSchedule) { - try { - //条件验证 - ValidatorBean.beginValid(partStockSchedule) - .notNull("partNo", partStockSchedule.getPartNo()) - .notNull("minCapacity", partStockSchedule.getMinCapacity()) - .notNull("totalCapacity", partStockSchedule.getTotalCapacity()) - .notNull("processCode", partStockSchedule.getProcessCode()); - partStockSchedule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(partStockSchedule, AuthUtil.getSessionUser()); - - partStockScheduleService.insertPartStockSchedule(partStockSchedule, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-stock-schedule/update") - @ApiOperation(value = "更新mes库存排程配置信息") - public ResultBean updateMesPartStockSchedule(MesPartStockSchedule partStockSchedule) { - try { - //条件验证 - ValidatorBean.beginValid(partStockSchedule) - .notNull("partNo", partStockSchedule.getPartNo()) - .notNull("minCapacity", partStockSchedule.getMinCapacity()) - .notNull("totalCapacity", partStockSchedule.getTotalCapacity()) - .notNull("processCode", partStockSchedule.getProcessCode()); - - partStockScheduleService.updatePartStockSchedule(partStockSchedule, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-stock-schedule/delete") - @ApiOperation(value = "根据id删除库存排程配置信息") - public ResultBean deletePartStockScheduleById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - partStockScheduleService.deletePartStockScheduleById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-stock-schedule/status-update") - @ApiOperation(value = "根据id启用或禁用库存排程配置信息") - public ResultBean updateMesPartStockScheduleStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - partStockScheduleService.updateMesPartStockScheduleStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 质量检测标准****start***********//* - - - */ -/*************MES 质量检测标准****start***********//* - - - @GetMapping(value = "/mes-quality-standard-cfg/query") - @ApiOperation(value = "按条件分页查询MES质量检测标准数据") - public ResultBean queryMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, Pager pager) { - try { - ListPager listPager = qualityStandardCfgService.queryMesQualityStandardCfgByPager(qualityStandardCfg, 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); - } - } - - @PostMapping(value = "/mes-quality-standard-cfg/insert") - @ApiOperation(value = "新增mes质量检测标准信息") - public ResultBean insertMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg) { - try { - //条件验证 - ValidatorBean.beginValid(qualityStandardCfg) - .notNull("standardType", qualityStandardCfg.getStandardType()) - .notNull("objectType", qualityStandardCfg.getObjectType()) - .notNull("objectKey", qualityStandardCfg.getObjectKey()) - .notNull("objectKeyValue", qualityStandardCfg.getObjectKeyValue()); - qualityStandardCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(qualityStandardCfg, AuthUtil.getSessionUser()); - - qualityStandardCfgService.insertMesQualityStandardCfg(qualityStandardCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-quality-standard-cfg/update") - @ApiOperation(value = "更新mes质量检测标准信息") - public ResultBean updateMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg) { - try { - //条件验证 - ValidatorBean.beginValid(qualityStandardCfg) - .notNull("standardType", qualityStandardCfg.getStandardType()) - .notNull("objectType", qualityStandardCfg.getObjectType()) - .notNull("objectKey", qualityStandardCfg.getObjectKey()) - .notNull("objectKeyValue", qualityStandardCfg.getObjectKeyValue()); - - qualityStandardCfgService.updateMesQualityStandardCfg(qualityStandardCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - @PutMapping(value = "/mes-quality-standard-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用质量检测标准信息") - public ResultBean updateMesQualityStandardCfgStatusById(Long id, int status) { + @GetMapping(value = "/enumlist") + @ApiOperation(value = "获取MES系统所有枚举") + public ResultBean enumlist(@RequestParam(name = "enumName", required = false) String enumName) { + List> mapList; + Map map; try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); + if (StringUtils.isEmpty(enumName)) { + mapList = enumService.getAllMesEnums(); + return ResultBean.success("查询成功") + .setResultList(mapList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } else { + map = enumService.doGetMesEnumByEnumName(enumName); + return ResultBean.success("查询成功") + .setResultObject(map) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } - qualityStandardCfgService.updateMesQualityStandardCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 质量检测标准****start***********//* - - - */ -/*************MES 物料对象****start***********//* - - @GetMapping(value = "/mes-part-object/query") - @ApiOperation(value = "按条件分页查询MES物料对象数据") - public ResultBean queryMesPartObjectPager(MesPartObject partObject, Pager pager) { - try { - partObject.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = partObjectService.queryMesPartObjectByPager(partObject, 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); - } - } - - @PostMapping(value = "/mes-part-object/insert") - @ApiOperation(value = "新增mes物料对象信息") - public ResultBean insertMesPartObject(MesPartObject partObject) { - try { - //条件验证 - ValidatorBean.beginValid(partObject) - .notNull("workCenterCode", partObject.getWorkCenterCode()) - .notNull("objectCode", partObject.getObjectCode()); - partObject.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(partObject, AuthUtil.getSessionUser()); - - partObjectService.insertMesPartObject(partObject); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-object/update") - @ApiOperation(value = "更新mes物料对象信息") - public ResultBean updateMesPartObject(MesPartObject partObject) { - try { - //条件验证 - ValidatorBean.beginValid(partObject) - .notNull("workCenterCode", partObject.getWorkCenterCode()) - .notNull("objectCode", partObject.getObjectCode()); - - partObjectService.updateMesPartObject(partObject); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-object/status-update") - @ApiOperation(value = "根据id启用或禁用物料对象信息") - public ResultBean updateMesPartObjectStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - partObjectService.updateMesPartObjectStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 物料对象****start***********//* - - - */ -/*************MES 接口清单****start***********//* - - - @GetMapping(value = "/mes-if/query") - @ApiOperation(value = "按条件分页查询MES接口清单数据") - public ResultBean queryMesIfPager(MesIf mesIf, Pager pager) { - try { - mesIf.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = ifService.queryMesIfByPager(mesIf, 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); - } - } - - @PostMapping(value = "/mes-if/insert") - @ApiOperation(value = "新增mes接口清单信息") - public ResultBean insertMesIf(MesIf mesIf) { - try { - //条件验证 - ValidatorBean.beginValid(mesIf) - .notNull("ifCode", mesIf.getIfCode()) - .notNull("ifClass", mesIf.getIfClass()) - .notNull("ifName", mesIf.getIfName()); - mesIf.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesIf, AuthUtil.getSessionUser()); - - ifService.insertMesIf(mesIf); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-if/update") - @ApiOperation(value = "更新mes接口清单信息") - public ResultBean updateMesIf(MesIf mesIf) { - try { - //条件验证 - ValidatorBean.beginValid(mesIf) - .notNull("ifCode", mesIf.getIfCode()) - .notNull("ifClass", mesIf.getIfClass()) - .notNull("ifName", mesIf.getIfName()); - - ifService.updateMesIf(mesIf); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-if/status-update") - @ApiOperation(value = "根据id启用或禁用接口清单信息") - public ResultBean updateMesIfStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - ifService.updateMesIfStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 接口清单****start***********//* - - - */ -/*************MES 动作接口配置****start***********//* - - - @GetMapping(value = "/mes-action-if/query") - @ApiOperation(value = "按条件分页查询MES动作接口配置数据") - public ResultBean queryMesActionIfPager(MesActionIf mesActionIf, Pager pager) { - try { - mesActionIf.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = actionIfService.queryMesActionIfByPager(mesActionIf, 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); - } - } - - @PostMapping(value = "/mes-action-if/insert") - @ApiOperation(value = "新增mes动作接口配置信息") - public ResultBean insertMesActionIf(MesActionIf mesActionIf) { - try { - //条件验证 - ValidatorBean.beginValid(mesActionIf) - .notNull("actionCode", mesActionIf.getActionCode()) - .notNull("ifCode", mesActionIf.getIfCode()); - mesActionIf.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesActionIf, AuthUtil.getSessionUser()); - - actionIfService.insertMesActionIf(mesActionIf); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-action-if/update") - @ApiOperation(value = "更新mes动作接口配置信息") - public ResultBean updateMesActionIf(MesActionIf mesActionIf) { - try { - //条件验证 - ValidatorBean.beginValid(mesActionIf) - .notNull("actionCode", mesActionIf.getActionCode()) - .notNull("ifCode", mesActionIf.getIfCode()); - - actionIfService.updateMesActionIf(mesActionIf); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-action-if/status-update") - @ApiOperation(value = "根据id启用或禁用动作接口配置信息") - public ResultBean updateMesActionIfStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - actionIfService.updateMesActionIfStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 动作接口配置****start***********//* - - - */ -/*************MES 关键动作****start***********//* - - - @GetMapping(value = "/mes-key-action/query") - @ApiOperation(value = "按条件分页查询MES关键动作数据") - public ResultBean queryMesKeyActionPager(MesKeyAction mesKeyAction, Pager pager) { - try { - - ListPager listPager = keyActionService.queryMesKeyActionByPager(mesKeyAction, 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); - } - } - - @PostMapping(value = "/mes-key-action/insert") - @ApiOperation(value = "新增mes关键动作信息") - public ResultBean insertMesKeyAction(MesKeyAction mesKeyAction) { - try { - //条件验证 - ValidatorBean.beginValid(mesKeyAction) - .notNull("actionCode", mesKeyAction.getActionCode()) - .notNull("actionName", mesKeyAction.getActionName()); - mesKeyAction.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesKeyAction, AuthUtil.getSessionUser()); - - keyActionService.insertMesKeyAction(mesKeyAction); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-key-action/update") - @ApiOperation(value = "更新mes关键动作信息") - public ResultBean updateMesKeyAction(MesKeyAction mesKeyAction) { - try { - //条件验证 - ValidatorBean.beginValid(mesKeyAction) - .notNull("actionCode", mesKeyAction.getActionCode()) - .notNull("actionName", mesKeyAction.getActionName()); - - keyActionService.updateMesKeyAction(mesKeyAction); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-key-action/status-update") - @ApiOperation(value = "根据id启用或禁用关键动作信息") - public ResultBean updateMesKeyActionStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - keyActionService.updateMesKeyActionStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 关键动作****start***********//* - - - */ -/*************MES 模板配置****start***********//* - - - @GetMapping(value = "/mes-label-template/query") - @ApiOperation(value = "获取模板配置") - public ResultBean queryMesLabelTemplate(MesLabelTemplate mesLabelTemplate, Pager pager) { - try { - mesLabelTemplate.setOrganizeCode(null); - ListPager listPager = labelTemplateService.queryMesMesLabelTemplateByPager(mesLabelTemplate, 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); - } - } - - */ -/*************MES 模板配置****start***********//* - - - */ -/*************MES 工厂初始化****start***********//* - - - @PostMapping(value = "/mes-org-init/insert") - @ApiOperation(value = "工厂初始化") - public ResultBean insetOrganizationInit(String sourceOrgCode) { - try { - if (AuthUtil.getOrganize().getOrganizeCode().equals(sourceOrgCode)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("目的工厂不能是本工厂") - .build(); - } - organizationInitService.insertOrganizationInit(sourceOrgCode, AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 工厂初始化****start***********//* - - - */ -/*************MES 产品编码配置****start***********//* - - - @GetMapping(value = "/mes-prod-encode-cfg/query") - @ApiOperation(value = "按条件分页查询MES产品编码配置数据") - public ResultBean queryMesProductEncodeCfgPager(MesProductEncodeCfg mesProductEncodeCfg, Pager pager) { - try { - ListPager listPager = productEncodeCfgService.queryMesProductEncodeCfgByPager(mesProductEncodeCfg, 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); - } - } - - @PostMapping(value = "/mes-prod-encode-cfg/insert") - @ApiOperation(value = "新增mes产品编码配置信息") - public ResultBean insertMesProductEncodeCfg(MesProductEncodeCfg mesProductEncodeCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesProductEncodeCfg) - .notNull("matchValue", mesProductEncodeCfg.getMatchValue()) - .notNull("codeType", mesProductEncodeCfg.getCodeType()) - .notNull("matchType", mesProductEncodeCfg.getMatchType()) - .notNull("ruleCode", mesProductEncodeCfg.getRuleCode()); - mesProductEncodeCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesProductEncodeCfg, AuthUtil.getSessionUser()); - - productEncodeCfgService.insertMesProductEncodeCfg(mesProductEncodeCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-encode-cfg/update") - @ApiOperation(value = "更新mes产品编码配置信息") - public ResultBean updateMesProductEncodeCfg(MesProductEncodeCfg mesProductEncodeCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesProductEncodeCfg) - .notNull("matchValue", mesProductEncodeCfg.getMatchValue()) - .notNull("codeType", mesProductEncodeCfg.getCodeType()) - .notNull("matchType", mesProductEncodeCfg.getMatchType()) - .notNull("ruleCode", mesProductEncodeCfg.getRuleCode()); - - productEncodeCfgService.updateMesProductEncodeCfg(mesProductEncodeCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-encode-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用产品编码配置信息") - public ResultBean updateMesProductEncodeCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - productEncodeCfgService.updateMesProductEncodeCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 产品编码配置****start***********//* - - - */ -/*************MES 数据对象****start***********//* - - - @GetMapping(value = "/mes-data-object/query") - @ApiOperation(value = "按条件分页查询MES数据对象数据") - public ResultBean queryMesDataObjectPager(MesDataObject mesDataObject, Pager pager) { - try { - ListPager listPager = objectCfgService.queryMesDataObjectByPager(mesDataObject, 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); - } - } - - @PostMapping(value = "/mes-data-object/insert") - @ApiOperation(value = "新增mes数据对象信息") - public ResultBean insertMesDataObject(MesDataObject mesDataObject) { - try { - //条件验证 - ValidatorBean.beginValid(mesDataObject) - .notNull("objectCode", mesDataObject.getObjectCode()) - .notNull("objectName", mesDataObject.getObjectName()) - .notNull("operateType", mesDataObject.getOperateType()) - .notNull("fieldPk", mesDataObject.getFieldPk()); - mesDataObject.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesDataObject, AuthUtil.getSessionUser()); - - objectCfgService.insertMesDataObject(mesDataObject); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-data-object/update") - @ApiOperation(value = "更新mes数据对象信息") - public ResultBean updateMesDataObject(MesDataObject mesDataObject) { - try { - //条件验证 - ValidatorBean.beginValid(mesDataObject) - .notNull("objectCode", mesDataObject.getObjectCode()) - .notNull("objectName", mesDataObject.getObjectName()) - .notNull("operateType", mesDataObject.getOperateType()) - .notNull("fieldPk", mesDataObject.getFieldPk()); - - objectCfgService.updateMesDataObject(mesDataObject); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-data-object/status-update") - @ApiOperation(value = "根据id启用或禁用数据对象信息") - public ResultBean updateMesDataObjectStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - objectCfgService.updateMesDataObjectStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 数据对象****start***********//* - - - */ -/*************MES 产品包装关系****start***********//* - - - @GetMapping(value = "/mes-prod-pack/query") - @ApiOperation(value = "按条件分页查询MES产品包装关系数据") - public ResultBean queryMesProdPackPager(MesProdPack mesProdPack, Pager pager) { - try { - ListPager listPager = prodPackService.queryMesProdPackByPager(mesProdPack, 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); - } - } - - @PostMapping(value = "/mes-prod-pack/insert") - @ApiOperation(value = "新增mes产品包装关系信息") - public ResultBean insertMesProdPack(MesProdPack mesProdPack) { - try { - //条件验证 - ValidatorBean.beginValid(mesProdPack) - .notNull("partNo", mesProdPack.getPartNo()) - .notNull("packSpec", mesProdPack.getPackSpec()) - .notNull("prodLabelTemplate", mesProdPack.getProdLabelTemplate()) - .notNull("packLabelTemplate", mesProdPack.getPackLabelTemplate()); - mesProdPack.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesProdPack, AuthUtil.getSessionUser()); - - prodPackService.insertMesProdPack(mesProdPack); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-pack/update") - @ApiOperation(value = "更新mes产品包装关系信息") - public ResultBean updateMesProdPack(MesProdPack mesProdPack) { - try { - //条件验证 - ValidatorBean.beginValid(mesProdPack) - .notNull("id", mesProdPack.getId()) - .notNull("partNo", mesProdPack.getPartNo()) - .notNull("packSpec", mesProdPack.getPackSpec()) - .notNull("prodLabelTemplate", mesProdPack.getProdLabelTemplate()) - .notNull("packLabelTemplate", mesProdPack.getPackLabelTemplate()); - - prodPackService.updateMesProdPack(mesProdPack); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-pack/status-update") - @ApiOperation(value = "根据id启用或禁用产品包装关系信息") - public ResultBean updateMesProdPackStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodPackService.updateMesProdPackStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 产品包装关系****start***********//* - - - */ -/*************MES 对象结构****start***********//* - - - @GetMapping(value = "/mes-object-cfg/query") - @ApiOperation(value = "按条件分页查询MES对象结构数据") - public ResultBean queryMesObjectCfgPager(MesObjectCfg mesObjectCfg, Pager pager) { - try { - ListPager listPager = objectCfgService.queryMesObjectCfgByPager(mesObjectCfg, 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); - } - } - - @PostMapping(value = "/mes-object-cfg/insert") - @ApiOperation(value = "新增mes对象结构信息") - public ResultBean insertMesObjectCfg(MesObjectCfg mesObjectCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesObjectCfg) - .notNull("objectCode", mesObjectCfg.getObjectCode()) - .notNull("fieldName", mesObjectCfg.getFieldName()) - .notNull("fieldCode", mesObjectCfg.getFieldCode()) - .notNull("fieldType", mesObjectCfg.getFieldType()); - mesObjectCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesObjectCfg, AuthUtil.getSessionUser()); - objectCfgService.insertMesObjectCfg(mesObjectCfg); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-object-cfg/update") - @ApiOperation(value = "更新mes对象结构信息") - public ResultBean updateMesObjectCfg(MesObjectCfg mesObjectCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesObjectCfg) - .notNull("objectCode", mesObjectCfg.getObjectCode()) - .notNull("fieldName", mesObjectCfg.getFieldName()) - .notNull("fieldCode", mesObjectCfg.getFieldCode()) - .notNull("fieldType", mesObjectCfg.getFieldType()); - - objectCfgService.updateMesObjectCfg(mesObjectCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-object-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用对象结构信息") - public ResultBean updateMesObjectCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - objectCfgService.updateMesObjectCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 对象结构****start***********//* - - - */ -/*************MES 首检件配置****start***********//* - - - @GetMapping(value = "/mes-fi-cfg/query") - @ApiOperation(value = "按条件分页查询MES首检件配置数据") - public ResultBean queryMesFiCfgByPager(MesFiCfg mesFiCfg, Pager pager) { - try { - ListPager listPager = fiCfgService.queryMesFiCfgByPager(mesFiCfg, 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); - } - } - - @PostMapping(value = "/mes-fi-cfg/insert") - @ApiOperation(value = "新增mes首检件配置信息") - public ResultBean insertMesFiCfg(MesFiCfg mesFiCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesFiCfg) - .notNull("workCenterCode", mesFiCfg.getWorkCenterCode()) - .notNull("partNo", mesFiCfg.getPartNo()) - .notNull("fiQty", mesFiCfg.getFiQty()); - - mesFiCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesFiCfg, AuthUtil.getSessionUser()); - - fiCfgService.insertMesFiCfg(mesFiCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-fi-cfg/update") - @ApiOperation(value = "更新mes首检件配置信息") - public ResultBean updateMesFiCfg(MesFiCfg mesFiCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesFiCfg) - .notNull("id", mesFiCfg.getWorkCenterCode()) - .notNull("fiQty", mesFiCfg.getFiQty()); - - fiCfgService.updateMesFiCfg(mesFiCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-fi-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用首检件配置信息") - public ResultBean updateMesFiCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - fiCfgService.updateMesFiCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 首检件配置****start***********//* - - - */ -/*************MES 缺陷原因****start***********//* - - - @GetMapping(value = "/mes-defect-causes/query") - @ApiOperation(value = "查询MES缺陷原因") - public ResultBean queryMesDefectCause() { - try { - List defectCauses = defectCauseService.queryMesDefectCauses(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(defectCauses) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-defect-cause/query") - @ApiOperation(value = "按条件分页查询MES缺陷原因") - public ResultBean queryMesDefectCauseByPager(MesDefectCause mesDefectCause, Pager pager) { - try { - mesDefectCause.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = defectCauseService.queryMesDefectCauseByPager(mesDefectCause, 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); - } - } - - @PostMapping(value = "/mes-defect-cause/insert") - @ApiOperation(value = "新增MES缺陷原因") - public ResultBean insertMesDefectCause(MesDefectCause mesDefectCause) { - try { - //条件验证 - ValidatorBean.beginValid(mesDefectCause) - .notNull("dcCode", mesDefectCause.getDcCode()) - .notNull("dcName", mesDefectCause.getDcName()) - .notNull("dcType", mesDefectCause.getDcType()); - mesDefectCause.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesDefectCause, AuthUtil.getSessionUser()); - - defectCauseService.insertMesDefectCause(mesDefectCause); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-defect-cause/update") - @ApiOperation(value = "更新MES缺陷原因") - public ResultBean updateMesDefectCause(MesDefectCause mesDefectCause) { - try { - //条件验证 - ValidatorBean.beginValid(mesDefectCause) - .notNull("dcCode", mesDefectCause.getDcCode()) - .notNull("dcName", mesDefectCause.getDcName()) - .notNull("dcType", mesDefectCause.getDcType()); - defectCauseService.updateMesDefectCause(mesDefectCause); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-defect-cause/status-update") - @ApiOperation(value = "根据id启用或禁用MES缺陷原因") - public ResultBean updateMesDefectCauseStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - defectCauseService.updateMesDefectCauseStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 缺陷原因*****end***********//* - - - */ -/*************MES 类型信息****start***********//* - - - @GetMapping(value = "/mes-type-cfg/query") - @ApiOperation(value = "按条件分页查询MES类型信息") - public ResultBean queryMesTypeCfgByPager(MesTypeCfg mesTypeCfg, Pager pager) { - try { - mesTypeCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = typeCfgService.queryMesTypeCfgByPager(mesTypeCfg, 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); - } - } - - @PostMapping(value = "/mes-type-cfg/insert") - @ApiOperation(value = "新增MES类型信息") - public ResultBean insertMesTypeCfg(MesTypeCfg mesTypeCfg) { - try { - //条件验证 - ValidatorBean.beginValid(mesTypeCfg) - .notNull("typeCode", mesTypeCfg.getTypeCode()) - .notNull("typeName", mesTypeCfg.getTypeName()) - .notNull("businessTypeCode", mesTypeCfg.getBusinessTypeCode()) - .notNull("businessTypeName", mesTypeCfg.getBusinessTypeName()); - mesTypeCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesTypeCfg, AuthUtil.getSessionUser()); - - typeCfgService.insertMesTypeCfg(mesTypeCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-type-cfg/update") - @ApiOperation(value = "更新MES类型信息") - public ResultBean updateMesTypeCfg(MesTypeCfg mesTypeCfg) { - try { - ValidatorBean.beginValid(mesTypeCfg) - .notNull("typeCode", mesTypeCfg.getTypeCode()) - .notNull("typeName", mesTypeCfg.getTypeName()) - .notNull("businessTypeCode", mesTypeCfg.getBusinessTypeCode()) - .notNull("businessTypeName", mesTypeCfg.getBusinessTypeName()); - typeCfgService.updateMesTypeCfg(mesTypeCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-type-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用MES类型信息") - public ResultBean updateMesTypeCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - typeCfgService.updateMesTypeCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-type-cfg/find") - @ApiOperation(value = "按条件查询MES类型信息") - public ResultBean findMesTypeCfg(MesTypeCfg mesTypeCfg) { - try { - mesTypeCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success("操作成功").setResultList(typeCfgService.findMesTypeCfg(mesTypeCfg)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 类型信息*****end***********//* - - - */ -/*************MES 产品类型图片****start***********//* - - - @GetMapping(value = "/mes-produce-ctgy-picture/query") - @ApiOperation(value = "按条件分页查询MES产品类型图片信息") - public ResultBean queryMesProduceCtgyPictureByPager(MesProduceCtgyPicture mesProduceCtgyPicture, Pager pager) { - try { - mesProduceCtgyPicture.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = produceCtgyPictureService.queryMesProduceCtgyPictureByPager(mesProduceCtgyPicture, 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); - } - } - - @PostMapping(value = "/mes-produce-ctgy-picture/insert") - @ApiOperation(value = "新增MES产品类型图片信息") - public ResultBean insertMesProduceCtgyPicture(MultipartFile file, MesProduceCtgyPicture mesProduceCtgyPicture) { - try { - if (file == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("上传的文件为null，后台未能接收到") - .build(); - } - //条件验证 - ValidatorBean.beginValid(mesProduceCtgyPicture) - .notNull("produceCtgyCode", mesProduceCtgyPicture.getProduceCtgyCode()) - .notNull("sideLocation", mesProduceCtgyPicture.getSideLocation()); - mesProduceCtgyPicture.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - SessionUser sessionUser = AuthUtil.getSessionUser(); - ConvertBean.modelInitialize(mesProduceCtgyPicture, sessionUser); - produceCtgyPictureService.insertMesProduceCtgyPicture(file, mesProduceCtgyPicture, sessionUser); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-produce-ctgy-picture/update") - @ApiOperation(value = "更新MES产品类型图片信息") - public ResultBean updateMesProduceCtgyPicture(MultipartFile file, MesProduceCtgyPicture mesProduceCtgyPicture) { - try { - if (file == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("上传的文件为null，后台未能接收到") - .build(); - } - //条件验证 - ValidatorBean.beginValid(mesProduceCtgyPicture) - .notNull("produceCtgyCode", mesProduceCtgyPicture.getProduceCtgyCode()) - .notNull("sideLocation", mesProduceCtgyPicture.getSideLocation()); - produceCtgyPictureService.updateMesProduceCtgyPicture(file, mesProduceCtgyPicture, AuthUtil.getSessionUser()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-produce-ctgy-picture/status-update") - @ApiOperation(value = "根据id启用或禁用MES产品类型图片信息") - public ResultBean updateMesProduceCtgyPictureStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - produceCtgyPictureService.updateMesProduceCtgyPictureStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 产品类型图片*****end***********//* - - - */ -/*************MES 缺陷****start***********//* - - - @GetMapping(value = "/mes-defects/query") - @ApiOperation(value = "查询MES缺陷信息") - public ResultBean queryMesDefect() { - try { - List defects = defectService.queryMesDefect(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(defects) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-defect/query") - @ApiOperation(value = "按条件分页查询MES缺陷信息") - public ResultBean queryMesDefectByPager(MesDefect mesDefect, Pager pager) { - try { - - mesDefect.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = defectService.queryMesDefectByPager(mesDefect, 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); - } - } - - @PostMapping(value = "/mes-defect/insert") - @ApiOperation(value = "新增MES缺陷信息") - public ResultBean insertMesDefect(MesDefect mesDefect) { - try { - final int defectCodeLength = 25; - //条件验证 - ValidatorBean.beginValid(mesDefect) - .notNull("defectCode", mesDefect.getDefectCode()) - .notNull("defectName", mesDefect.getDefectName()) -// .notNull("defectType", mesDefect.getDefectType()) - ; - mesDefect.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesDefect, AuthUtil.getSessionUser()); - - if (mesDefect.getDefectCode().length() > defectCodeLength) { - return ResultBean.fail("缺陷代码长度不能超过25位"); - } - - defectService.insertMesDefect(mesDefect); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-defect/update") - @ApiOperation(value = "更新MES缺陷信息") - public ResultBean updateMesDefect(MesDefect mesDefect) { - try { - - //条件验证 - ValidatorBean.beginValid(mesDefect) - .notNull("defectCode", mesDefect.getDefectCode()) - .notNull("defectName", mesDefect.getDefectName()) -// .notNull("defectType", mesDefect.getDefectType()) - ; - defectService.updateMesDefect(mesDefect); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-defect/status-update") - @ApiOperation(value = "根据id启用或禁用MES缺陷信息") - public ResultBean updateMesDefectStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - defectService.updateMesDefectStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 缺陷*****end***********//* - - - */ -/*************MES 过程质量检验****start***********//* - - - @GetMapping(value = "/mes-qc-check-standard/query") - @ApiOperation(value = "按条件分页查询MES过程质量检验信息") - public ResultBean queryMesQcCheckStandardByPager(MesQcCheckStandard mesQcCheckStandard, Pager pager) { - try { - - ListPager listPager = qcCheckStandardService.queryMesQcCheckStandardByPager(mesQcCheckStandard, 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); - } - } - - @PostMapping(value = "/mes-qc-check-standard/insert") - @ApiOperation(value = "新增MES过程质量检验信息") - public ResultBean insertMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard) { - try { - - //条件验证 - ValidatorBean.beginValid(mesQcCheckStandard) - //.notNull("partNo", mesQcCheckStandard.getPartNo()) - .notNull("workCenterCode", mesQcCheckStandard.getWorkCenterCode()) - .notNull("workCellCode", mesQcCheckStandard.getWorkCellCode()) - .notNull("checkType", mesQcCheckStandard.getCheckType()) - .notNull("checkItem", mesQcCheckStandard.getCheckItem()); - mesQcCheckStandard.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesQcCheckStandard, AuthUtil.getSessionUser()); - - qcCheckStandardService.insertMesQcCheckStandard(mesQcCheckStandard); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-qc-check-standard/update") - @ApiOperation(value = "更新MES过程质量检验信息") - public ResultBean updateMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard) { - try { - - //条件验证 - ValidatorBean.beginValid(mesQcCheckStandard) - .notNull("id", mesQcCheckStandard.getId()) - //.notNull("partNo", mesQcCheckStandard.getPartNo()) - .notNull("workCenterCode", mesQcCheckStandard.getWorkCenterCode()) - .notNull("workCellCode", mesQcCheckStandard.getWorkCellCode()) - .notNull("checkType", mesQcCheckStandard.getCheckType()) - .notNull("checkItem", mesQcCheckStandard.getCheckItem()); - qcCheckStandardService.updateMesQcCheckStandard(mesQcCheckStandard); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-qc-check-standard/status-update") - @ApiOperation(value = "根据id启用或禁用MES过程质量检验信息") - public ResultBean updateMesQcCheckStandardStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - qcCheckStandardService.updateMesQcCheckStandardStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 过程质量检验*****end***********//* - - - */ -/*************MES_DB地址清单*****start***********//* - - - @GetMapping(value = "/mes-datasource/query") - @ApiOperation(value = "按条件分页查询MES_DB地址清单信息") - public ResultBean queryMesDatasourceByPager(MesDatasource mesDatasource, Pager pager) { - try { - - mesDatasource.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = datasourceService.queryMesDatasourceByPager(mesDatasource, 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); - } - } - - @PostMapping(value = "/mes-datasource/insert") - @ApiOperation(value = "新增MES_DB地址清单信息") - public ResultBean insertMesDatasource(MesDatasource mesDatasource) { - try { - - //条件验证 - ValidatorBean.beginValid(mesDatasource) - .notNull("dsCode", mesDatasource.getDsCode()) - .notNull("dsName", mesDatasource.getDsName()) - .notNull("dsType", mesDatasource.getDsType()) - .notNull("dsDbName", mesDatasource.getDsDbName()); - mesDatasource.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesDatasource, AuthUtil.getSessionUser()); - - datasourceService.insertMesDatasource(mesDatasource); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-datasource/update") - @ApiOperation(value = "更新MES_DB地址清单信息") - public ResultBean updateMesDatasource(MesDatasource mesDatasource) { - try { - - //条件验证 - ValidatorBean.beginValid(mesDatasource) - .notNull("id", mesDatasource.getId()) - .notNull("dsCode", mesDatasource.getDsCode()) - .notNull("dsName", mesDatasource.getDsName()) - .notNull("dsType", mesDatasource.getDsType()) - //.notNull("equipmentCode", mesDatasource.getEquipmentCode()) - .notNull("dsDbName", mesDatasource.getDsDbName()); - - datasourceService.updateMesDatasource(mesDatasource); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-datasource/status-update") - @ApiOperation(value = "根据id启用或禁用MES_DB地址清单信息") - public ResultBean updateMesDatasourceStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - datasourceService.updateMesDatasourceStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES_DB地址清单*****end***********//* - - - */ -/*************新版-PLC设备信息配置服务*****start***********//* - - - @GetMapping(value = "/plc/query") - @ApiOperation(value = "按条件分页查询PLC设备信息配置信息") - public ResultBean queryMesPlcByPager(MesPlc mesPlc, Pager pager) { - try { - - mesPlc.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = mesPlcService.queryMesPlcByPager(mesPlc, 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); - } - } - - @PostMapping(value = "/plc/insert") - @ApiOperation(value = "新增PLC设备信息配置信息") - public ResultBean insertMesPlc(@RequestBody MesPlc mesPlc) { - try { - - //条件验证 - ValidatorBean.beginValid(mesPlc) - .notNull("plcCode", mesPlc.getPlcCode()) - .notNull("plcName", mesPlc.getPlcName()) - .notNull("plcIp", mesPlc.getPlcIp()) - .notNull("channel", mesPlc.getChannel()) - .notNull("tagAddress", mesPlc.getTagAddress()) - .notNull("dataType", mesPlc.getDataType()) - .notNull("device", mesPlc.getDevice()) - .notNull("workCellCode", mesPlc.getWorkCellCode()) - .notNull("workCenterCode", mesPlc.getWorkCenterCode()); - mesPlc.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesPlc, AuthUtil.getSessionUser()); - - mesPlcService.insertMesPlc(mesPlc); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/plc/update") - @ApiOperation(value = "更新PLC设备信息配置信息") - public ResultBean updateMesPlc(@RequestBody MesPlc mesPlc) { - try { - - //条件验证 - ValidatorBean.beginValid(mesPlc) - .notNull("id", mesPlc.getId()) - .notNull("plcCode", mesPlc.getPlcCode()) - .notNull("plcName", mesPlc.getPlcName()) - .notNull("plcIp", mesPlc.getPlcIp()) - .notNull("channel", mesPlc.getChannel()) - .notNull("tagAddress", mesPlc.getTagAddress()) - .notNull("dataType", mesPlc.getDataType()) - .notNull("workCellCode", mesPlc.getWorkCellCode()) - .notNull("workCenterCode", mesPlc.getWorkCenterCode()); - - mesPlcService.updateMesPlc(mesPlc); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/plc/status-update") - @ApiOperation(value = "根据id启用或禁用PLC设备信息配置信息") - public ResultBean updateMesPlcStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesPlcService.updateMesPlcStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************新版-PLC设备信息配置服务*****end***********//* - - - */ -/*************MES按钮条件配置服务*****start***********//* - - - @GetMapping(value = "/mes-button-status/query") - @ApiOperation(value = "按条件分页查询MES按钮条件配置数据") - public ResultBean queryMesButtonStatusByPager(MesButtonStatus buttonStatus, Pager pager) { - try { - - ListPager listPager = buttonStatusService.queryMesButtonStatusByPager(buttonStatus, 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); - } - } - - @PostMapping(value = "/mes-button-status/insert") - @ApiOperation(value = "新增MES按钮条件配置信息") - public ResultBean insertMesButtonStatus(MesButtonStatus buttonStatus) { - try { - - //条件验证 - ValidatorBean.beginValid(buttonStatus) - .notNull("className", buttonStatus.getClassName()) - .notNull("appendHql", buttonStatus.getAppendHql()) - .notNull("buttonCode", buttonStatus.getButtonCode()); - - buttonStatus.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(buttonStatus, AuthUtil.getSessionUser()); - - buttonStatusService.insertMesButtonStatus(buttonStatus); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-button-status/update") - @ApiOperation(value = "更新mes按钮条件配置信息") - public ResultBean updateMesButtonStatus(MesButtonStatus buttonStatus) { - try { - - //条件验证 - ValidatorBean.beginValid(buttonStatus) - .notNull("appendHql", buttonStatus.getAppendHql()); - - buttonStatusService.updateMesButtonStatus(buttonStatus); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-button-status/status-update") - @ApiOperation(value = "根据id启用或禁用按钮条件配置信息") - public ResultBean updateMesButtonStatusStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - buttonStatusService.updateMesButtonStatusStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES按钮条件配置服务*****end***********//* - - - */ -/*************MES班组服务*****start***********//* - - - @GetMapping(value = "/mes-shift-group/query") - @ApiOperation(value = "按条件分页查询MES班组数据") - public ResultBean queryMesShiftGroupByPager(MesShiftGroup shiftGroup, Pager pager) { - try { - - ListPager listPager = shiftService.queryMesShiftGroupByPager(shiftGroup, 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); - } - } - - @PostMapping(value = "/mes-shift-group/insert") - @ApiOperation(value = "新增mes班组信息") - public ResultBean insertMesShiftGroup(MesShiftGroup shiftGroup) { - try { - - shiftGroup.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(shiftGroup, AuthUtil.getSessionUser()); - - shiftService.insertMesShiftGroup(shiftGroup); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift-group/update") - @ApiOperation(value = "更新mes班组信息") - public ResultBean updateMesShiftGroup(MesShiftGroup shiftGroup) { - try { - - //条件验证 - ValidatorBean.beginValid(shiftGroup) - .notNull("groupCode", shiftGroup.getGroupCode()) - .notNull("workCenterCode", shiftGroup.getWorkCenterCode()) - .notNull("groupName", shiftGroup.getGroupName()); - - shiftService.updateMesShiftGroup(shiftGroup); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift-group/status-update") - @ApiOperation(value = "根据id启用或禁用班组信息") - public ResultBean updateMesShiftGroupStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - shiftService.updateMesShiftGroupStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-shift-group-all/query") - @ApiOperation(value = "按条件查询班组所有有效数据") - public ResultBean queryMesShiftGroupAll(MesShiftGroup shiftGroup) { - try { - - shiftGroup.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - List shiftGroupList = shiftService.queryMesShiftGroupAll(shiftGroup); - - return ResultBean.success("操作成功").setResultList(shiftGroupList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES班组服务*****end***********//* - - - */ -/*************获取类的field*****start***********//* - - @GetMapping(value = "/mes-class-field/query") - @ApiOperation(value = "按class名字获取没有transient的field") - public ResultBean queryClassField(MesPcnSyncCfg mesPcnSyncCfg) { - try { - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(baseDataSyncService.queryClassField(mesPcnSyncCfg)); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************获取类的field*****end***********//* - - */ -/*************MES条码生成规则*****start***********//* - - - @GetMapping(value = "/mes-number-rule/query") - @ApiOperation(value = "按条件分页查询MES条码生成规则") - public ResultBean queryMesNumberRuleByPager(MesNumberRule numberRule, Pager pager) { - try { - - ListPager listPager = numberRuleService.queryMesNumberRuleByPager(numberRule, 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); - } - } - - @PostMapping(value = "/mes-number-rule/insert") - @ApiOperation(value = "新增mes条码生成规则") - public ResultBean insertMesNumberRule(MesNumberRule numberRule) { - try { - ValidatorBean.beginValid(numberRule) - .notNull("ruleCode", numberRule.getRuleCode()) - .notNull("numberRule", numberRule.getNumberRule()) - .notNull("serialnoLength", numberRule.getSerialnoLength()) - .notNull("serialnoIncrement", numberRule.getSerialnoIncrement()) - .notNull("beginVal", numberRule.getBeginVal()) - .notNull("isCycle", numberRule.getIsCycle()); - - numberRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(numberRule, AuthUtil.getSessionUser()); - - numberRuleService.insertMesNumberRule(numberRule); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-number-rule/update") - @ApiOperation(value = "更新mes条码生成规则") - public ResultBean updateMesNumberRule(MesNumberRule numberRule) { - try { - ValidatorBean.beginValid(numberRule) - .notNull("id", numberRule.getId()) - .notNull("ruleCode", numberRule.getRuleCode()) - .notNull("numberRule", numberRule.getNumberRule()) - .notNull("serialnoLength", numberRule.getSerialnoLength()) - .notNull("serialnoIncrement", numberRule.getSerialnoIncrement()) - .notNull("beginVal", numberRule.getBeginVal()) - .notNull("isCycle", numberRule.getIsCycle()); - - numberRuleService.updateMesNumberRule(numberRule); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-number-rule/status-update") - @ApiOperation(value = "根据id启用或禁用条码生成规则") - public ResultBean updateMesNumberRuleStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - numberRuleService.updateMesNumberRuleStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-number-rule-all/query") - @ApiOperation(value = "按条件查询条码生成规则所有有效数据") - public ResultBean queryMesNumberRuleAll(MesNumberRule numberRule) { - try { - - numberRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - List mesNumberRuleList = numberRuleService.queryMesNumberRuleAll(numberRule); - - return ResultBean.success("操作成功").setResultList(mesNumberRuleList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES条码生成规则*****end***********//* - - - - */ -/*************MES班次服务*****start***********//* - - - @GetMapping(value = "/mes-shift/query") - @ApiOperation(value = "按条件分页查询MES班次数据") - public ResultBean queryMesShiftByPager(MesShift shift, Pager pager) { - try { - - ListPager listPager = shiftService.queryMesShiftByPager(shift, 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); - } - } - - @PostMapping(value = "/mes-shift/insert") - @ApiOperation(value = "新增mes班次信息") - public ResultBean insertMesShift(MesShift shift) { - try { - ValidatorBean.beginValid(shift) - //.notNull("workCenterCode", shift.getWorkCenterCode()) - .notNull("shiftName", shift.getShiftName()) - .notNull("startTime", shift.getStartTime()) - .notNull("endTime", shift.getEndTime()) - .notNull("shiftCode", shift.getShiftCode()); - - shift.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(shift, AuthUtil.getSessionUser()); - - shiftService.insertMesShift(shift); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift/update") - @ApiOperation(value = "更新mes班次信息") - public ResultBean updateMesShift(MesShift shift) { - try { - ValidatorBean.beginValid(shift) - .notNull("id", shift.getId()) - .notNull("shiftName", shift.getShiftName()) - .notNull("startTime", shift.getStartTime()) - .notNull("endTime", shift.getEndTime()); - - shiftService.updateMesShift(shift); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift/status-update") - @ApiOperation(value = "根据id启用或禁用班次信息") - public ResultBean updateMesShiftStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - shiftService.updateMesShiftStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-shift-all/query") - @ApiOperation(value = "按条件查询班次所有有效数据") - public ResultBean queryMesShiftAll(MesShift shift) { - try { - - shift.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - List shiftList = shiftService.queryMesShiftAll(shift); - - return ResultBean.success("操作成功").setResultList(shiftList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES班次服务*****end***********//* - - - */ -/*************MES班次休息服务*****start***********//* - - - @GetMapping(value = "/mes-shift-rest/query") - @ApiOperation(value = "按条件分页查询MES班次休息数据") - public ResultBean queryMesShiftRestByPager(MesShiftRest shiftRest, Pager pager) { - try { - - ListPager listPager = shiftService.queryMesShiftRestByPager(shiftRest, 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); - } - } - - @PostMapping(value = "/mes-shift-rest/insert") - @ApiOperation(value = "新增mes班次休息信息") - public ResultBean insertMesShiftRest(MesShiftRest shiftRest) { - try { - - shiftRest.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(shiftRest, AuthUtil.getSessionUser()); - - shiftService.insertMesShiftRest(shiftRest); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift-rest/update") - @ApiOperation(value = "更新mes班次休息信息") - public ResultBean updateMesShiftRest(MesShiftRest shiftRest) { - try { - - //条件验证 - ValidatorBean.beginValid(shiftRest) - //.notNull("workCenterCode", shiftRest.getWorkCenterCode()) - .notNull("shiftCode", shiftRest.getShiftCode()); - - shiftService.updateMesShiftRest(shiftRest); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-shift-rest/status-update") - @ApiOperation(value = "根据id启用或禁用班次休息信息") - public ResultBean updateMesShiftRestStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - shiftService.updateMesShiftRestStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES班次休息服务*****end***********//* - - - */ -/*************MES BOM服务*****start***********//* - - - @GetMapping(value = "/mes-bom/query") - @ApiOperation(value = "按条件分页查询MES BOM数据") - public ResultBean queryMesBomByPager(MesBom bom, Pager pager) { - try { - - ListPager listPager = bomService.queryMesBomByPager(bom, 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); - } - } - - @PostMapping(value = "/mes-bom/insert") - @ApiOperation(value = "新增mes BOM信息") - public ResultBean insertMesBom(MesBom bom) { - try { - - bom.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(bom, AuthUtil.getSessionUser()); - - bomService.insertMesBom(bom); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-bom/update") - @ApiOperation(value = "更新mes BOM信息") - public ResultBean updateMesBom(MesBom bom) { - try { - - //条件验证 - ValidatorBean.beginValid(bom) - .notNull("bomVersion", bom.getBomVersion()) - .notNull("partNo", bom.getPartNo()) - .notNull("itemPartNo", bom.getItemPartNo()); - - bomService.updateMesBom(bom); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-bom/status-update") - @ApiOperation(value = "根据id启用或禁用BOM信息") - public ResultBean updateMesBomStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - bomService.updateMesBomStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES BOM服务*****end***********//* - - - */ -/*************MES工位BOM服务*****start***********//* - - - @GetMapping(value = "/mes-station-bom/query") - @ApiOperation(value = "按条件分页查询MES工位BOM数据") - public ResultBean queryStationBomByPager(MesStationBom stationBom, Pager pager) { - try { - ListPager listPager = bomService.queryStationBomByPager(stationBom, 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); - } - } - - @PostMapping(value = "/mes-station-bom/insert") - @ApiOperation(value = "新增mes工位BOM信息") - public ResultBean insertStationBom(MesStationBom stationBom) { - try { - stationBom.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(stationBom, AuthUtil.getSessionUser()); - bomService.insertStationBom(stationBom); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-station-bom/update") - @ApiOperation(value = "更新mes工位BOM信息") - public ResultBean updateStationBom(MesStationBom stationBom) { - try { - ValidatorBean.beginValid(stationBom) -// .notNull("partNo", stationBom.getPartNo()) - .notNull("itemPartNo", stationBom.getItemPartNo()); - bomService.updateStationBom(stationBom); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-station-bom/status-update") - @ApiOperation(value = "根据id启用或禁用工位BOM信息") - public ResultBean updateMesStationBomStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - bomService.updateStationBomStatusById(id, status, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-station-bom/status-update-batch") - @ApiOperation(value = "批量启用或禁用工位BOM信息") - public ResultBean updateMesStationBomStatusById(@RequestBody List stationBomList, int status) { - try { - - bomService.updateBatchStationBomStatus(stationBomList, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES工位BOM服务*****end***********//* - - - */ -/*************MES设备关键数据服务*****start***********//* - - - @GetMapping(value = "/mes-key-data/query") - @ApiOperation(value = "按条件分页查询设备关键数据信息") - public ResultBean queryMesKeyDataByPager(MesKeyData keyData, Pager pager) { - try { - - ListPager listPager = keyDataService.queryMesKeyDataByPager(keyData, 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); - } - } - - @PostMapping(value = "/mes-key-data/insert") - @ApiOperation(value = "新增设备关键数据信息") - public ResultBean insertMesKeyData(MesKeyData keyData) { - try { - - keyData.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(keyData, AuthUtil.getSessionUser()); - - keyDataService.insertMesKeyData(keyData); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-key-data/update") - @ApiOperation(value = "更新设备关键数据信息") - public ResultBean updateMesKeyData(MesKeyData keyData) { - try { - - //条件验证 - ValidatorBean.beginValid(keyData) - .notNull("keyDataCode", keyData.getKeyDataCode()) - .notNull("keyDataName", keyData.getKeyDataName()); - - keyDataService.updateMesKeyData(keyData); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-key-data/status-update") - @ApiOperation(value = "根据id启用或禁用设备关键数据信息") - public ResultBean updateMesKeyDataStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - keyDataService.updateMesKeyDataStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-key-data-all/query") - @ApiOperation(value = "查询设备关键数据所有有效数据") - public ResultBean queryMesKeyDataByProperties() { - try { - - List keyDataList = keyDataService.queryMesKeyDataByProperties(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(keyDataList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES设备关键数据服务*****end***********//* - - - */ -/*************MES物料关键数据关系服务*****start***********//* - - - @GetMapping(value = "/mes-kp-data/query") - @ApiOperation(value = "按条件分页查询物料关键数据关系信息") - public ResultBean queryMesKpDataByPager(MesKpData kpData, Pager pager) { - try { - - ListPager listPager = keyDataService.queryMesKpDataByPager(kpData, 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); - } - } - - @PostMapping(value = "/mes-kp-data/insert") - @ApiOperation(value = "新增物料关键数据关系信息") - public ResultBean insertMesKpData(MesKpData kpData) { - try { - - kpData.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(kpData, AuthUtil.getSessionUser()); - - keyDataService.insertMesKpData(kpData); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-kp-data/update") - @ApiOperation(value = "更新物料关键数据关系信息") - public ResultBean updateMesKpData(MesKpData kpData) { - try { - - //条件验证 - ValidatorBean.beginValid(kpData) - .notNull("workCellCode", kpData.getWorkCellCode()) - .notNull("workCenterCode", kpData.getWorkCenterCode()) - .notNull("keyDataCode", kpData.getKeyDataCode()); - - keyDataService.updateMesKpData(kpData); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-kp-data/status-update") - @ApiOperation(value = "根据id启用或禁用物料关键数据关系信息") - public ResultBean updateMesKpDataStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - keyDataService.updateMesKpDataStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES物料关键数据关系服务*****end***********//* - - - */ -/*************MES产品配置类型服务*****start***********//* - - - @GetMapping(value = "/mes-prod-cfg-type/query") - @ApiOperation(value = "按条件分页查询产品配置类型信息") - public ResultBean queryMesProdCfgTypeByPager(MesProdCfgType prodCfgType, Pager pager) { - try { - - ListPager listPager = prodCfgService.queryMesProdCfgTypeByPager(prodCfgType, 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); - } - } - - @PostMapping(value = "/mes-prod-cfg-type/insert") - @ApiOperation(value = "新增产品配置类型信息") - public ResultBean insertMesProdCfgType(MesProdCfgType prodCfgType) { - try { - - prodCfgType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(prodCfgType, AuthUtil.getSessionUser()); - - prodCfgService.insertMesProdCfgType(prodCfgType); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg-type/update") - @ApiOperation(value = "更新产品配置类型信息") - public ResultBean updateMesProdCfgType(MesProdCfgType prodCfgType) { - try { - - //条件验证 - ValidatorBean.beginValid(prodCfgType) - .notNull("prodCfgTypeCode", prodCfgType.getProdCfgTypeCode()) - .notNull("prodCfgTypeName", prodCfgType.getProdCfgTypeName()); - - prodCfgService.updateMesProdCfgType(prodCfgType); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg-type/status-update") - @ApiOperation(value = "根据id启用或禁用产品配置类型信息") - public ResultBean updateMesProdCfgTypeStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodCfgService.updateMesProdCfgTypeStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-prod-cfg-type-all/query") - @ApiOperation(value = "查询产品配置类型所有有效信息") - public ResultBean queryMesProdCfgTypeAll() { - try { - - List prodCfgTypeList = prodCfgService.queryMesProdCfgTypeAll(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(prodCfgTypeList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-prod-cfg-type/by-code") - @ApiOperation(value = "查询产品配置类型有效信息") - public ResultBean queryProdCfgTypeByCode(String prodCfgTypeCode) { - try { - - MesProdCfgType prodCfgType = prodCfgService.queryProdCfgTypeByCode(AuthUtil.getOrganize().getOrganizeCode(), prodCfgTypeCode); - - return ResultBean.success("操作成功").setResultObject(prodCfgType) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES产品配置类型服务*****end***********//* - - - */ -/*************MES产品配置服务*****start***********//* - - - @GetMapping(value = "/mes-prod-cfg/query") - @ApiOperation(value = "按条件分页查询产品配置信息") - public ResultBean queryMesProdCfgByPager(MesProdCfg prodCfg, Pager pager) { - try { - - ListPager listPager = prodCfgService.queryMesProdCfgByPager(prodCfg, 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); - } - } - - @PostMapping(value = "/mes-prod-cfg/insert") - @ApiOperation(value = "新增产品配置信息") - public ResultBean insertMesProdCfg(MesProdCfg prodCfg) { - try { - - prodCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(prodCfg, AuthUtil.getSessionUser()); - - prodCfgService.insertMesProdCfg(prodCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg/update") - @ApiOperation(value = "更新产品配置信息") - public ResultBean updateMesProdCfgType(MesProdCfg prodCfg) { - try { - - //条件验证 - ValidatorBean.beginValid(prodCfg) - .notNull("prodCfgCode", prodCfg.getProdCfgCode()) - .notNull("prodCfgName", prodCfg.getProdCfgName()) - .notNull("prodCfgTypeCode", prodCfg.getProdCfgTypeCode()); - - prodCfgService.updateMesProdCfg(prodCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用产品配置信息") - public ResultBean updateMesProdCfgStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodCfgService.updateMesProdCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-prod-cfg-all/query") - @ApiOperation(value = "查询产品配置所有有效信息") - public ResultBean queryMesProdCfgAll(MesProdCfg prodCfg) { - try { - prodCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - List prodCfgList = prodCfgService.queryMesProdCfgAll(prodCfg); - - return ResultBean.success("操作成功").setResultList(prodCfgList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES产品配置服务*****end***********//* - - - */ -/*************MES设备服务*****start***********//* - - @GetMapping("/equipment/get-by-work-center") - @ApiOperation(value = "根据工作中心查询设备") - public ResultBean queryEquipmentByWorkCenter(MesEquipment mesEquipment) { - mesEquipment.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - List mesEquipments; - try { - ValidatorBean.beginValid(mesEquipment) - .notNull(mesEquipment.getWorkCenterCode(), "workCenterCode") - .notNull(mesEquipment.getOrganizeCode(), MesConstWords.ORGANIZE_CODE); - mesEquipments = equipmentService.findEquipmentsByWorkCenterCode(mesEquipment); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - return ResultBean.success("查询成功").setResultList(mesEquipments) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @GetMapping("/equipment/get-by-work-center-cell") - @ApiOperation(value = "根据工作中心，工作单元查询设备") - public ResultBean queryEquipmentByWorkCenterCell(MesEquipment mesEquipment) { - mesEquipment.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - List mesEquipments; - try { - ValidatorBean.beginValid(mesEquipment) - .notNull(mesEquipment.getWorkCenterCode(), "workCenterCode") - .notNull(mesEquipment.getWorkCellCode(), "workCellCode") - .notNull(mesEquipment.getOrganizeCode(), MesConstWords.ORGANIZE_CODE); - mesEquipments = equipmentService.findEquipmentsByWorkCenterCellCode(mesEquipment); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - return ResultBean.success("查询成功").setResultList(mesEquipments) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - */ -/*************MES设备服务*****end***********//* - - - */ -/*************MES产品配置明细服务*****start***********//* - - - @GetMapping(value = "/mes-prod-cfg-detail/query") - @ApiOperation(value = "按条件分页查询产品配置明细信息") - public ResultBean queryMesProdCfgDetailByPager(MesProdCfgDetail prodCfgDetail, Pager pager) { - try { - - ListPager listPager = prodCfgService.queryMesProdCfgDetailByPager(prodCfgDetail, 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); - } - } - - @PostMapping(value = "/mes-prod-cfg-detail/insert") - @ApiOperation(value = "新增产品配置明细信息") - public ResultBean insertMesProdCfgDetail(MesProdCfgDetail prodCfgDetail) { - try { - - prodCfgDetail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(prodCfgDetail, AuthUtil.getSessionUser()); - - prodCfgService.insertMesProdCfgDetail(prodCfgDetail); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg-detail/update") - @ApiOperation(value = "更新产品配置明细信息") - public ResultBean updateMesProdCfgDetail(MesProdCfgDetail prodCfgDetail) { - try { - - //条件验证 - ValidatorBean.beginValid(prodCfgDetail) - .notNull("prodCfgCode", prodCfgDetail.getProdCfgCode()) - .notNull("partNo", prodCfgDetail.getPartNo()); - - prodCfgService.updateMesProdCfgDetail(prodCfgDetail); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-cfg-detail/status-update") - @ApiOperation(value = "根据id启用或禁用产品配置明细信息") - public ResultBean updateMesProdCfgDetailStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodCfgService.updateMesProdCfgDetailStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES产品配置明细服务*****end***********//* - - - */ -/*************MES物料服务*****start***********//* - - - @GetMapping(value = "/mes-part/query") - @ApiOperation(value = "按条件分页查询物料信息") - public ResultBean queryMesPartByPager(MesPart part, Pager pager) { - try { - - ListPager listPager = partDataService.queryMesPartByPager(part, 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); - } - } - - @PostMapping(value = "/mes-part/insert") - @ApiOperation(value = "新增物料信息") - public ResultBean insertMesPart(MesPart part) { - try { - - part.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(part, AuthUtil.getSessionUser()); - - partDataService.insertMesPart(part); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part/update") - @ApiOperation(value = "更新物料信息") - public ResultBean updateMesPart(MesPart part) { - try { - - //条件验证 - ValidatorBean.beginValid(part) - .notNull("partNo", part.getPartNo()); - - partDataService.updateMesPart(part); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part/status-update") - @ApiOperation(value = "根据id启用或禁用物料信息") - public ResultBean updateMesPartStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partDataService.updateMesPartStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES物料服务*****end***********//* - - - */ -/*************MES物料类型服务*****start***********//* - - - @GetMapping(value = "/mes-part-category/query") - @ApiOperation(value = "按条件分页查询物料类型信息") - public ResultBean queryMesPartCategoryByPager(MesPartCategory partCategory, Pager pager) { - try { - - ListPager listPager = partDataService.queryMesPartCategoryByPager(partCategory, 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); - } - } - - @PostMapping(value = "/mes-part-category/insert") - @ApiOperation(value = "新增物料类型信息") - public ResultBean insertMesPartCategory(MesPartCategory partCategory) { - try { - - partCategory.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(partCategory, AuthUtil.getSessionUser()); - - partDataService.insertMesPartCategory(partCategory); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-category/update") - @ApiOperation(value = "更新物料类型信息") - public ResultBean updateMesPartCategory(MesPartCategory partCategory) { - try { - - //条件验证 - ValidatorBean.beginValid(partCategory) - .notNull("categoryCode", partCategory.getCategoryCode()) - .notNull("categoryName", partCategory.getCategoryName()); - - partDataService.updateMesPartCategory(partCategory); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-category/status-update") - @ApiOperation(value = "根据id启用或禁用物料类型信息") - public ResultBean updateMesPartCategoryStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partDataService.updateMesPartCategoryStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-category-property/query") - @ApiOperation(value = "按条件查询物料类型1、2、3信息") - public ResultBean queryMesPartCategoryByProperties(MesPartCategory partCategory) { - try { - partCategory.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - List partCategoryList = partDataService.queryMesPartCategoryByProperties(partCategory); - - return ResultBean.success("操作成功").setResultList(partCategoryList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES物料类型服务*****end***********//* - - - */ -/*************MES包装规格服务*****start***********//* - - - @GetMapping(value = "/mes-pack-spec/query") - @ApiOperation(value = "按条件分页查询包装规格信息") - public ResultBean queryMesPackSpecByPager(MesPackSpec packSpec, Pager pager) { - try { - - ListPager listPager = partDataService.queryMesPackSpecByPager(packSpec, 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); - } - } - - @PostMapping(value = "/mes-pack-spec/insert") - @ApiOperation(value = "新增包装规格信息") - public ResultBean insertMesPackSpec(MesPackSpec packSpec) { - try { - - packSpec.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(packSpec, AuthUtil.getSessionUser()); - - partDataService.insertMesPackSpec(packSpec); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-pack-spec/update") - @ApiOperation(value = "更新包装规格信息") - public ResultBean updateMesPackSpec(MesPackSpec packSpec) { - try { - - //条件验证 - ValidatorBean.beginValid(packSpec) - .notNull("specCode", packSpec.getSpecCode()) - .notNull("specName", packSpec.getSpecName()); - - partDataService.updateMesPackSpec(packSpec); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-pack-spec/status-update") - @ApiOperation(value = "根据id启用或禁用包装规格信息") - public ResultBean updateMesPackSpecStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partDataService.updateMesPackSpecStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-pack-parent-spec/query") - @ApiOperation(value = "查询所有父包装规格信息") - public ResultBean queryMesParentPackSpecByPager() { - try { - - List packSpecList = partDataService.queryMesParentPackSpecByPager(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(packSpecList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-pack-spec-all/query") - @ApiOperation(value = "查询所有包装规格有效信息") - public ResultBean queryMesPackSpecAll() { - try { - - List packSpecList = partDataService.queryMesPackSpecAll(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(packSpecList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES包装规格服务*****end***********//* - - - */ -/*************MES产品类型服务*****start***********//* - - - @GetMapping(value = "/mes-prod-category/query") - @ApiOperation(value = "按条件分页查询产品类型信息") - public ResultBean queryMesProduceCategoryByPager(MesProduceCategory produceCategory, Pager pager) { - try { - - ListPager listPager = partDataService.queryMesProduceCategoryByPager(produceCategory, 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); - } - } - - @PostMapping(value = "/mes-prod-category/insert") - @ApiOperation(value = "新增产品类型信息") - public ResultBean insertMesProduceCategory(MesProduceCategory produceCategory) { - try { - ValidatorBean.beginValid(produceCategory) - .notNull("produceCategoryCode", produceCategory.getProduceCategoryCode()) - .notNull("workCenterCode", produceCategory.getWorkCenterCode()) - .notNull("produceCategoryName", produceCategory.getProduceCategoryName()); - produceCategory.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(produceCategory, AuthUtil.getSessionUser()); - - partDataService.insertMesProduceCategory(produceCategory); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-category/update") - @ApiOperation(value = "更新产品类型信息") - public ResultBean updateMesProduceCategory(MesProduceCategory produceCategory) { - try { - ValidatorBean.beginValid(produceCategory) - .notNull("produceCategoryCode", produceCategory.getProduceCategoryCode()) - .notNull("workCenterCode", produceCategory.getWorkCenterCode()) - .notNull("produceCategoryName", produceCategory.getProduceCategoryName()); - - partDataService.updateMesProduceCategory(produceCategory); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-category/status-update") - @ApiOperation(value = "根据id启用或禁用产品类型信息") - public ResultBean updateMesProduceCategoryStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partDataService.updateMesProduceCategoryStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-prod-category-all/query") - @ApiOperation(value = "查询所有产品类型有效信息") - public ResultBean queryMesProduceCategoryAll() { - try { - - List produceCategoryList = partDataService.queryMesProduceCategoryAll(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(produceCategoryList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES产品类型服务*****end***********//* - - - */ -/*************MES关键件条码规则服务*****start***********//* - - - @GetMapping(value = "/mes-kpsn-rule/query") - @ApiOperation(value = "按条件分页查询关键件条码规则信息") - public ResultBean queryMesKpsnRuleByPager(MesKpsnRule kpsnRule, Pager pager) { - try { - - ListPager listPager = partDataService.queryMesKpsnRuleByPager(kpsnRule, 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); - } - } - - @PostMapping(value = "/mes-kpsn-rule/insert") - @ApiOperation(value = "新增关键件条码规则信息") - public ResultBean insertMesKpsnRule(MesKpsnRule kpsnRule) { - try { - - - kpsnRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(kpsnRule, AuthUtil.getSessionUser()); - - partDataService.insertMesKpsnRule(kpsnRule); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-kpsn-rule/update") - @ApiOperation(value = "更新关键件条码规则信息") - public ResultBean updateMesKpsnRule(MesKpsnRule kpsnRule) { - try { - - - partDataService.updateMesKpsnRule(kpsnRule); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-kpsn-rule/status-update") - @ApiOperation(value = "根据id启用或禁用关键件条码规则信息") - public ResultBean updateMesKpsnRuleStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partDataService.updateMesKpsnRuleStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES关键件条码规则服务*****end***********//* - - - */ -/*************PLC设备信息配置服务*****start***********//* - - - @GetMapping(value = "/plc-configure/query") - @ApiOperation(value = "按条件分页查询PLC设备信息配置信息") - public ResultBean queryMesPLCConfigureByPager(MesPLCConfigure plcConfigure, Pager pager) { - try { - - ListPager listPager = plcService.queryMesPLCConfigureByPager(plcConfigure, 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); - } - } - - @PostMapping(value = "/plc-configure/insert") - @ApiOperation(value = "新增PLC设备信息配置信息") - public ResultBean insertMesPLCConfigure(MesPLCConfigure plcConfigure) { - try { - - plcConfigure.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(plcConfigure, AuthUtil.getSessionUser()); - - plcService.insertMesPLCConfigure(plcConfigure); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/plc-configure/update") - @ApiOperation(value = "更新PLC设备信息配置信息") - public ResultBean updateMesPLCConfigure(MesPLCConfigure plcConfigure) { - try { - - //条件验证 - ValidatorBean.beginValid(plcConfigure) - .notNull("channelName", plcConfigure.getChannelName()) - .notNull("deviceName", plcConfigure.getDeviceName()) - .notNull("tagName", plcConfigure.getTagName()); - - plcService.updateMesPLCConfigure(plcConfigure); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/plc-configure/status-update") - @ApiOperation(value = "根据id启用或禁用PLC设备信息配置信息") - public ResultBean updateMesPLCConfigureStatusById(Long id, int status) { - try { - - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - plcService.updateMesPLCConfigureStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************PLC设备信息配置服务*****end***********//* - - - - */ -/*************MES ODS组件文件基础服务*****start***********//* - - - @GetMapping(value = "/mes-ods-file/query") - @ApiOperation(value = "按条件分页查询MES ODS文件数据") - public ResultBean queryMesESOPByPager(MesEsop mesESOP, Pager pager) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - ListPager listPager = esopService.queryPagerByCriteria(mesESOP, pager, org); - - 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); - } - } - - @PostMapping(value = "/mes-ods-file/insert") - @ApiOperation(value = "新增ODS文件数据") - public ResultBean insertMesESOP(MultipartFile file, MesEsop esop) { - try { - if (file == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("上传的文件为null，后台未能接收到") - .build(); - } - - ValidatorBean.beginValid(esop) - .notNull("workCenterCode", esop.getWorkCenterCode()) - .notNull("workCellCode", esop.getWorkCellCode()); - - esopService.insertEsop(file, esop, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-ods-routes/find") - @ApiOperation(value = "找到对应流程给下拉框") - public ResultBean findEsopRoutes(String workCenterCode, String workCellCode, String partNo) { - try { - if (StringUtils.isAnyEmpty(workCenterCode, workCellCode, partNo)) { - return ResultBean.success("查询成功").setResultList(null) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - String org = AuthUtil.getOrganize().getOrganizeCode(); - List routes = esopService.queryEsopRoutes(org, workCenterCode, workCellCode, partNo); - return ResultBean.success("查询成功").setResultList(routes) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-ods-routes/query") - @ApiOperation(value = "流程弹窗") - public ResultBean getEsopRoutes(MesRoute route, Pager pager) { - try { - route.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager routes = esopService.queryEsopRoutes(route, pager); - return ResultBean.success("查询成功").setListPager(routes) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-ods-processes/query") - @ApiOperation(value = "工序弹窗") - public ResultBean findEsopProcesses(MesProcess process, Pager pager) { - try { - process.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager processes = esopService.queryEsopProcesses(process, pager); - return ResultBean.success("查询成功").setListPager(processes) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-ods-processes/find") - @ApiOperation(value = "找到对应流程给下拉框") - public ResultBean findEsopProcesses(String workCenterCode, String workCellCode, String partNo, String routeCode) { - try { - if (StringUtils.isAnyEmpty(workCenterCode, workCellCode, partNo, routeCode)) { - return ResultBean.success("查询成功").setResultList(null) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - String org = AuthUtil.getOrganize().getOrganizeCode(); - List processes = esopService.queryEsopProcesses(org, workCenterCode, workCellCode, partNo, routeCode); - return ResultBean.success("查询成功").setResultList(processes) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-ods-steps/query") - @ApiOperation(value = "工步弹窗") - public ResultBean findEsopSteps(MesStep step, Pager pager) { - try { - step.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager steps = esopService.queryEsopSteps(step, pager); - return ResultBean.success("查询成功").setListPager(steps) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-ods-file/update") - @ApiOperation(value = "更新ODS文件数据") - public ResultBean updateMesESOP(MultipartFile file, MesEsop mesESOP) { - try { - //字段空判断 - ValidatorBean.beginValid(mesESOP).notNull("id", mesESOP.getId()) - .notNull("workCenterCode", mesESOP.getWorkCenterCode()) - .notNull("workCellCode", mesESOP.getWorkCellCode()) - .notNull("esopUrl", mesESOP.getEsopUrl()); - - startMultiService(); - - String userName = AuthUtil.getSessionUser().getUserName(); - String org = AuthUtil.getOrganize().getOrganizeCode(); - esopService.updateInfoByEsop(file, mesESOP, userName, org); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-ods-file/status-update") - @ApiOperation(value = "根据id启用或禁用ODS文件数据") - public ResultBean updateMesESOPValidById(Long id, Integer status) { - try { - if (null == id || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - startMultiService(); - - esopService.updateStatusById(id, status, AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES ODS组件文件基础服务*****end***********//* - - - - */ -/*************MES 事件基础服务*****start***********//* - - @GetMapping(value = "/mes-event/queryPager") - @ApiOperation(value = "按条件分页查询MES Event数据") - public ResultBean queryMesEventByPager(MesEvent mesEvent, Pager pager) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - mesEvent.setOrganizeCode(org); - ListPager listPager = btnBindEvtService.queryMesEventByPager(mesEvent, 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); - } - } - - @GetMapping(value = "/mes-event/queryByButtonCode") - @ApiOperation(value = "按条件分页查询MES Event数据") - public ResultBean queryByButtonCode(MesEvent mesEvent) { - try { - if (mesEvent == null || mesEvent.getButtonCode() == null) { - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - String org = AuthUtil.getOrganize().getOrganizeCode(); - mesEvent.setOrganizeCode(org); - List mesEvents = btnBindEvtService.queryByButtonCode(mesEvent); - - return ResultBean.success("操作成功").setResultObject(CollectionUtils.isEmpty(mesEvents) ? null : mesEvents.get(0)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-event/queryById") - @ApiOperation(value = "按id查询MES Event数据") - public ResultBean queryMesEventById(Long id) { - try { - if (id == null || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("id为空。") - .build(); - } - MesEvent mesEvent = btnBindEvtService.queryMesEventById(id); - - return ResultBean.success("操作成功").setResultObject(mesEvent) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-event/queryAll") - @ApiOperation(value = "获取所有未删除的") - public ResultBean queryMesEventAll() { - String org = AuthUtil.getOrganize().getOrganizeCode(); - if (StringUtils.isEmpty(org)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("组织代码为空") - .build(); - } - List mesEvents = btnBindEvtService.queryMesEventAll(org); - return ResultBean.success("查询成功").setResultList(mesEvents).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value = "/mes-event/insert") - @ApiOperation(value = "新增事件") - public ResultBean insertMesEvent(MesEvent mesEvent) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - mesEvent.setOrganizeCode(org); - ValidatorBean.beginValid(mesEvent) - .notNull("eventName", mesEvent.getEventName()) - .notNull("eventCode", mesEvent.getEventCode()) - .notNull(MesConstWords.ORGANIZE_CODE, org); - - ConvertBean.modelInitialize(mesEvent, AuthUtil.getSessionUser()); - - startMultiService(); - - btnBindEvtService.insertMesEvent(mesEvent); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - - @PutMapping(value = "/mes-event/update") - @ApiOperation(value = "更新事件") - public ResultBean updateMesEvent(MesEvent mesEvent) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - String userName = AuthUtil.getSessionUser().getUserName(); - mesEvent.setOrganizeCode(org); - mesEvent.setModifyUser(userName); - //字段空判断 - ValidatorBean.beginValid(mesEvent) - .notNull("eventCode", mesEvent.getEventCode()) - .notNull("eventName", mesEvent.getEventName()) - .notNull("id", mesEvent.getId()); - - startMultiService(); - - btnBindEvtService.updateMesEvent(mesEvent); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-event/delete") - @ApiOperation(value = "软删除事件") - public ResultBean deleteMesEvent(Long id, String userName) { - try { - startMultiService(); - - btnBindEvtService.deleteMesEvent(id, userName); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-event/status-update") - @ApiOperation(value = "根据id启用或禁用") - public ResultBean updateMesEventIsValidById(Long id, Integer status, String userName) { - try { - if (null == id || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - startMultiService(); - - btnBindEvtService.updateMesEventIsValidById(id, status, userName); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 事件基础服务*****end***********//* - - - - */ -/*************MES 事件与动作服务*****start***********//* - - @GetMapping("/mes-event-action/query") - @ApiOperation(value = "按条件分页查询MES Event Action数据") - public ResultBean queryMesEventActionByPager(MesEventAction mesEventAction, Pager pager) { - try { - ValidatorBean.beginValid(mesEventAction).notNull(mesEventAction.getEventCode(), "eventCode"); - String org = AuthUtil.getOrganize().getOrganizeCode(); - mesEventAction.setOrganizeCode(org); - ListPager listPager = eventActionSerivce.queryMesEventActionByPager(mesEventAction, 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); - } - } - - @GetMapping("/mes-event-action/queryByEventCode") - @ApiOperation(value = "按事件查询动作数据") - public ResultBean queryMesEventActionByEventCodeAll(String eventCode) { - try { - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - List mesEventActionModels = eventActionSerivce.queryMesEventActionAll(organizeCode, eventCode); - - return ResultBean.success("查询成功").setResultList(mesEventActionModels) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping("/mes-event-action/update") - @ApiOperation(value = "更新事件对应的action及其顺序") - public ResultBean updateEventAction(@RequestBody List mesEventActions, @RequestParam("eventCode") String eventCode) { - try { - startMultiService(); - - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - String userName = AuthUtil.getSessionUser().getUserName(); - eventActionSerivce.updateEventAction(mesEventActions, eventCode, userName, organizeCode); - - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 事件与动作服务*****end***********//* - - - - */ -/*************MES 动作基础服务*****start***********//* - - @GetMapping(value = "/mes-action/queryPager") - @ApiOperation(value = "按条件分页查询MES Action") - public ResultBean queryMesActionByPager(MesAction mesAction, Pager pager) { - try { - mesAction.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = actionService.queryMesActionByPager(mesAction, 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); - } - } - - @GetMapping("/mes-action/queryAll") - @ApiOperation(value = "按照组织代码查询所有动作") - public ResultBean queryMesActionByOrg() { - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - if (StringUtils.isEmpty(organizeCode)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("组织代码为空") - .build(); - } - List mesActions = actionService.queryAllByOrganizeCode(organizeCode); - return ResultBean.success("查询成功").setResultList(mesActions).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PutMapping(value = "/mes-action/delete") - @ApiOperation(value = "软删除动作") - public ResultBean deleteMesAction(Long id, String userName) { - try { - startMultiService(); - - actionService.deleteMesAction(id, userName); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-action/status-update") - @ApiOperation(value = "根据id启用或禁用") - public ResultBean updateMesActionIsValidById(Long id, Integer status) { - try { - if (null == id || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - startMultiService(); - - String userName = AuthUtil.getSessionUser().getUserName(); - - actionService.updateMesActionIsValidById(id, status, userName); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-action/update") - @ApiOperation(value = "更新事件") - public ResultBean updateMesAction(MesAction mesAction) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - String userName = AuthUtil.getSessionUser().getUserName(); - mesAction.setOrganizeCode(org); - mesAction.setModifyUser(userName); - //字段空判断 - ValidatorBean.beginValid(mesAction) - .notNull("actionCode", mesAction.getActionCode()) - .notNull("actionName", mesAction.getActionName()) - .notNull("id", mesAction.getId()); - - startMultiService(); - - mesAction.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - actionService.updateMesAction(mesAction, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-action/insert") - @ApiOperation(value = "新增事件") - public ResultBean insertMesAction(MesAction mesAction) { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - mesAction.setOrganizeCode(org); - ValidatorBean.beginValid(mesAction) - .notNull("actionCode", mesAction.getActionCode()) - .notNull("actionName", mesAction.getActionName()); - - ConvertBean.modelInitialize(mesAction, AuthUtil.getSessionUser()); - - startMultiService(); - - actionService.insertMesAction(mesAction, org); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-action/queryById") - @ApiOperation(value = "按id查询MES Event数据") - public ResultBean queryMesActionById(Long id) { - try { - if (id == null || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("id为空。") - .build(); - } - MesAction mesAction = actionService.queryMesActionById(id); - - return ResultBean.success("操作成功").setResultObject(mesAction) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 动作基础服务*****end***********//* - - - - */ -/*************MES 函数基础服务*****start***********//* - - @GetMapping(value = "/mes-method/queryPager") - @ApiOperation(value = "按条件分页查询MES method") - public ResultBean queryMesMethodByPager(MesMethod mesMethod, Pager pager) { - try { - mesMethod.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = methodService.queryMesMethodByPager(mesMethod, 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); - } - } - - @GetMapping("/mes-method/queryAll") - @ApiOperation(value = "按照组织代码查询所有函数") - public ResultBean queryMesMethodByOrg() { - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - if (StringUtils.isEmpty(organizeCode)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("组织代码为空") - .build(); - } - List mesMethods = methodService.queryAllByOrganizeCode(organizeCode); - return ResultBean.success("查询成功").setResultList(mesMethods).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PutMapping(value = "/mes-method/delete") - @ApiOperation(value = "软删除") - public ResultBean deleteMesMethod(Long id, String userName) { - try { - startMultiService(); - - methodService.deleteMesMethodById(id, userName); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-method/status-update") - @ApiOperation(value = "根据id启用或禁用") - public ResultBean updateMesMethodIsValidById(Long id, Integer status, String userName) { - try { - if (null == id || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - startMultiService(); - - methodService.updateMesMethodIsValidById(id, status, userName); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-method/update") - @ApiOperation(value = "更新函数") - public ResultBean updateMesMethod(MesMethod mesMethod) { - try { - mesMethod.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesMethod.setModifyUser(AuthUtil.getSessionUser().getUserName()); - //字段空判断 - ValidatorBean.beginValid(mesMethod) - .notNull("methodCode", mesMethod.getMethodCode()) - .notNull("methodName", mesMethod.getMethodName()) - .notNull("id", mesMethod.getId()); - - startMultiService(); - - methodService.updateMesMethod(mesMethod); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-method/insert") - @ApiOperation(value = "新增函数") - public ResultBean insertMesMethod(MesMethod mesMethod) { - try { - mesMethod.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ValidatorBean.beginValid(mesMethod) - .notNull("methodCode", mesMethod.getMethodCode()) - .notNull("methodName", mesMethod.getMethodName()) - .notNull(MesConstWords.ORGANIZE_CODE, mesMethod.getOrganizeCode()); - - ConvertBean.modelInitialize(mesMethod, AuthUtil.getSessionUser()); - - startMultiService(); - - methodService.insertMesMethod(mesMethod); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-method/queryById") - @ApiOperation(value = "按id查询MES method数据") - public ResultBean queryMesMethodById(Long id) { - try { - if (id == null || id == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("id为空。") - .build(); - } - MesMethod mesMethod = methodService.queryMesMethodById(id); - - return ResultBean.success("操作成功").setResultObject(mesMethod) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 函数基础服务*****end***********//* - - - - */ -/*************MES 动作与方法服务*****start***********//* - - @GetMapping("/mes-action-method/query") - @ApiOperation(value = "按条件分页查询MES Action Method数据") - public ResultBean queryMesActionMethodByPager(MesActionMethod mesActionMethod, Pager pager) { - try { - ValidatorBean.beginValid(mesActionMethod).notNull(mesActionMethod.getActionCode(), "actionCode"); - mesActionMethod.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = actionMethodService.queryMesActionMethodByPager(mesActionMethod, 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); - } - } - - @GetMapping("/mes-action-method/queryByActionCode") - @ApiOperation(value = "按动作查询函数数据") - public ResultBean queryMesActionMethodByActionCodeAll(String actionCode) { - try { - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - - List mesActionMethodModels = actionMethodService.queryMesActionMethodAll(organizeCode, actionCode); - return ResultBean.success("查询成功").setResultList(mesActionMethodModels) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping("/mes-action-method/update") - @ApiOperation(value = "更新动作对应函数及其顺序") - public ResultBean updateActionMethod(@RequestBody List mesActionMethods, @RequestParam("actionCode") String actionCode) { - try { - startMultiService(); - - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - String userName = AuthUtil.getSessionUser().getUserName(); - actionMethodService.updateMesActionMethod(mesActionMethods, actionCode, userName, organizeCode); - - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 动作与方法服务*****end***********//* - - - */ -/*************MES 维修信息基础服务*****start***********//* - - @GetMapping(value = "/mes-repairs/query") - @ApiOperation(value = "查询维修信息数据") - public ResultBean queryMesRepairs() { - try { - List repairs = repairService.queryMesRepair(AuthUtil.getOrganize().getOrganizeCode()); - - return ResultBean.success("操作成功").setResultList(repairs) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-repair/query") - @ApiOperation(value = "按条件分页查询维修信息数据") - public ResultBean queryMesRepairByPager(MesRepair mesRepair, Pager pager) { - try { - if (mesRepair == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请输入有效的查询参数") - .build(); - } - ListPager listPager = repairService.queryMesRepairByPager(mesRepair, 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); - } - } - - @PostMapping(value = "/mes-repair/insert") - @ApiOperation(value = "新增维修数据") - public ResultBean insertMesRepair(MesRepair mesRepair) { - try { - if (mesRepair == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("待新增的维修信息为空") - .build(); - } - ValidatorBean.beginValid(mesRepair) - .notNull("repairCode", mesRepair.getRepairCode()) - .notNull("repairName", mesRepair.getRepairName()) - .notNull("repairType", mesRepair.getRepairType()); - - mesRepair.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - repairService.insertMesRepair(mesRepair); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-repair/update") - @ApiOperation(value = "更新维修数据") - public ResultBean updateMesRepair(MesRepair mesRepair) { - try { - if (mesRepair.getId() == null || mesRepair.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - repairService.updateMesRepair(mesRepair); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-repair/status-update") - @ApiOperation(value = "根据id启用或禁用维修数据") - public ResultBean updateMesRepairValidById(Long id, Integer status) { - try { - if (id == null || id.longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - repairService.updateMesRepairStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 维修信息基础服务*****end***********//* - - - */ -/*************MES 报废信息基础服务*****start***********//* - - @GetMapping(value = "/mes-scrap/query") - @ApiOperation(value = "按条件分页查询报废信息数据") - public ResultBean queryMesScrapByPager(MesScrap mesScrap, Pager pager) { - try { - if (mesScrap == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请输入有效的查询参数") - .build(); - } - ListPager listPager = scrapService.queryMesScrapByPager(mesScrap, 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); - } - } - - @PostMapping(value = "/mes-scrap/insert") - @ApiOperation(value = "新增报废数据") - public ResultBean insertMesScrap(MesScrap mesScrap) { - try { - if (mesScrap == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("待新增的维修信息为空") - .build(); - } - ValidatorBean.beginValid(mesScrap) - .notNull("scrapCode", mesScrap.getScrapCode()) - .notNull("scrapName", mesScrap.getScrapName()); - - mesScrap.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - scrapService.insertMesScrap(mesScrap); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scrap/update") - @ApiOperation(value = "更新报废数据") - public ResultBean updateMesScrap(MesScrap mesScrap) { - try { - if (mesScrap.getId() == null || mesScrap.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - scrapService.updateMesScrap(mesScrap); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scrap/status-update") - @ApiOperation(value = "根据id启用或禁用报废数据") - public ResultBean updateMesScrapValidById(Long id, Integer status) { - try { - if (id == null || id.longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - scrapService.updateMesScrapStatusById(id, status); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 报废信息基础服务*****end***********//* - - - - */ -/*************MES 开线管控基础服务*****start***********//* - - @GetMapping(value = "/mes-wc-check/query") - @ApiOperation(value = "按条件分页查询开线管控数据") - public ResultBean queryMesWcCheckByPager(MesWcCheck mesWcCheck, Pager pager) { - try { - if (mesWcCheck == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请输入有效的查询参数") - .build(); - } - ListPager listPager = wcCheckService.queryMesWcCheckByPager(mesWcCheck, 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); - } - } - - @GetMapping(value = "/mes-wc-check/query-select-params") - @ApiOperation(value = "获取到开先检查 下拉项") - public ResultBean queryMesWcCheckSelect(MesWcCheck wcCheck) { - try { - String userName = AuthUtil.getSessionUser().getUserName(); - String org = AuthUtil.getOrganize().getOrganizeCode(); - Map selects = wcCheckService.queryWcCheckSelect(userName, org); - - return ResultBean.success("操作成功").setResultMap(selects) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-wc-check/insert") - @ApiOperation(value = "新增开线管控") - public ResultBean insertMesWcCheck(MesWcCheck mesWcCheck) { - try { - if (mesWcCheck == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("待新增的维修信息为空") - .build(); - } - ValidatorBean.beginValid(mesWcCheck) - .notNull("workCenterCode", mesWcCheck.getWorkCenterCode()) - .notNull("partNo", mesWcCheck.getPartNo()) - .notNull("checkType", mesWcCheck.getCheckType()) - .notNull("checkObj", mesWcCheck.getCheckObj()) - .notNull("checkItem", mesWcCheck.getCheckItem()); - - mesWcCheck.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - wcCheckService.insertMesWcCheck(mesWcCheck, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-wc-check/update") - @ApiOperation(value = "更新开线管控") - public ResultBean updateMesWcCheck(MesWcCheck mesWcCheck) { - try { - if (mesWcCheck.getId() == null || mesWcCheck.getId() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - wcCheckService.updateMesWcCheck(mesWcCheck, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-wc-check/status-update") - @ApiOperation(value = "根据id启用或禁用开线管控") - public ResultBean updateMesWcCheckValidById(Long id, Integer status) { - try { - if (id == null || id.longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - wcCheckService.updateMesWcCheckStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 开线管控基础服务*****end***********//* - - - - */ -/*************MES 枚举信息*****start***********/ - - @GetMapping(value = "/enumlist") - @ApiOperation(value = "获取MES系统所有枚举") - public ResultBean enumlist(@RequestParam(name = "enumName", required = false) String enumName) { - List> mapList; - Map map; - try { - if (StringUtils.isEmpty(enumName)) { - mapList = enumService.getAllMesEnums(); - return ResultBean.success("查询成功") - .setResultList(mapList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } else { - map = enumService.doGetMesEnumByEnumName(enumName); - return ResultBean.success("查询成功") - .setResultObject(map) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } -/* - @GetMapping(value = "/enumlist-db") - @ApiOperation(value = "获取MES系统所有枚举或指定枚举") - public ResultBean getEnumList(@RequestParam(name = "enumName", required = false) String enumName) { - List> mapList; - Map map; - try { - if (StringUtils.isEmpty(enumName)) { - mapList = enumService.getAllEnums(AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功") - .setResultList(mapList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } else { - map = enumService.getEnumByEnumName(AuthUtil.getOrganizeCode(), enumName); - return ResultBean.success("查询成功") - .setResultObject(map) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/save-enum") - @ApiOperation(value = "新增或更新所有枚举") - public ResultBean saveEnums() { - try { - enumService.saveEnums(AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 枚举信息*****end***********//* - - - */ -/*************MES和PCN的国际化资源*****start***********//* - - @GetMapping(value = "/getLocaleRes") - @ApiOperation(value = "获取MES系统所有枚举") - public BaseResultBean getLocaleRes(String softType) { - try { - SysLocaleResource localeResource = new SysLocaleResource(); - localeResource.setSoftType(CommonEnumUtil.SOFT_TYPE.codeOfValue(softType)); - BaseResultBean resultBean = coreLocaleResourceCloud.findSysLocaleResource(localeResource); - return resultBean; - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - - @GetMapping(value = "/getLocaleResByLanguageSoftType") - @ApiOperation(value = "获取语言包") - public BaseResultBean getLocaleResByLanguageSoftType(String language, String softType) { - try { - BaseResultBean resultBean = coreLocaleResourceCloud.findSysLocaleResourceByLanguageCode(language, CommonEnumUtil.SOFT_TYPE.codeOfValue(softType), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - return resultBean; - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/find-resource/languageCode-query") - @ApiOperation(value = "根据语言代码查询PCN语言包带通用数据") - public BaseResultBean findLanguagePackByLanguageCode(String languageCode) { - try { - BaseResultBean resultBean = coreLocaleResourceCloud.findSysLocaleResourceByLanguageCode(languageCode, CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - return resultBean; - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/find-resource/resourceKey-query") - @ApiOperation(value = "根据资源编码查询pcn语言包") - public BaseResultBean findLanguagePackByResourceKey(String resourceKey) { - try { - SysLocaleResource sysLocaleResource = new SysLocaleResource(); - sysLocaleResource.setResourceKey(resourceKey); - sysLocaleResource.setSoftType(CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()); - BaseResultBean resultBean = coreLocaleResourceCloud.findSysLocaleResource(sysLocaleResource); - return resultBean; - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES和PCN的国际化资源*****end***********//* - - - - @GetMapping(value = "/ppt/drop-data") - @ApiOperation(value = "获取产品生产类型下拉数据") - public ResultBean findPptDropData() { - try { - String org = AuthUtil.getOrganize().getOrganizeCode(); - List partProduceTypes = partProduceTypeService.findPartProduceTypeDropData(org); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(partProduceTypes); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-interface-data-mapper/query") - @ApiOperation(value = "根据条件分页查询移库单详情集合") - public ResultBean queryMesDocMovementDetailsByPager(MesInterfaceDataMapper interfaceDataMapper, Pager pager) { - try { - ListPager mesInterfaceDataMapperListPager = interfaceDataMapperService.queryMesInterfaceDataMapperByPager(interfaceDataMapper, pager); - return ResultBean.success("查询成功").setListPager(mesInterfaceDataMapperListPager) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-interface-data-mapper/insert") - @ApiOperation(value = "新增接口映射详情") - public ResultBean insertMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) { - try { - //属性验证 - ValidatorBean.beginValid(mesInterfaceDataMapper) - .notNull("seq", mesInterfaceDataMapper.getSeq()) - .notNull("srcGetLimit", mesInterfaceDataMapper.getSrcGetLimit()) - .notNull("dataSource", mesInterfaceDataMapper.getDataSource()) - .notNull("srcTableName", mesInterfaceDataMapper.getSrcTableName()) - .notNull("srcOrderBy", mesInterfaceDataMapper.getSrcOrderBy()) - .notNull("srcWhere", mesInterfaceDataMapper.getSrcWhere()) - .notNull("srcUpdateSync", mesInterfaceDataMapper.getSrcUpdateSync()) - .notNull("srcPkColumns", mesInterfaceDataMapper.getSrcPkColumns()) - .notNull("destBeanName", mesInterfaceDataMapper.getDestBeanName()) - .notNull("destColumnMapping", mesInterfaceDataMapper.getDestColumnMapping()) - .notNull("groupName", mesInterfaceDataMapper.getGroupName()) - .notNull("busiRoute", mesInterfaceDataMapper.getBusiRoute()); - - interfaceDataMapperService.insertMesInterfaceDataMapper(mesInterfaceDataMapper); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-interface-data-mapper/update") - @ApiOperation(value = "修改接口映射详情") - public ResultBean updateMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) { - try { - //属性验证 - ValidatorBean.beginValid(mesInterfaceDataMapper) - .notNull("seq", mesInterfaceDataMapper.getSeq()) - .notNull("srcGetLimit", mesInterfaceDataMapper.getSrcGetLimit()) - .notNull("dataSource", mesInterfaceDataMapper.getDataSource()) - .notNull("srcTableName", mesInterfaceDataMapper.getSrcTableName()) - .notNull("srcOrderBy", mesInterfaceDataMapper.getSrcOrderBy()) - .notNull("srcWhere", mesInterfaceDataMapper.getSrcWhere()) - .notNull("srcUpdateSync", mesInterfaceDataMapper.getSrcUpdateSync()) - .notNull("srcPkColumns", mesInterfaceDataMapper.getSrcPkColumns()) - .notNull("destBeanName", mesInterfaceDataMapper.getDestBeanName()) - .notNull("destColumnMapping", mesInterfaceDataMapper.getDestColumnMapping()) - .notNull("groupName", mesInterfaceDataMapper.getGroupName()) - .notNull("busiRoute", mesInterfaceDataMapper.getBusiRoute()); - - interfaceDataMapperService.updateMesInterfaceDataMapper(mesInterfaceDataMapper, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-interface-data-mapper/update-status") - @ApiOperation(value = "根据id批量禁用/启用移库单详情") - public ResultBean updateMesDocMovementDetailsValidStatusByIds(String[] idsStr, int status) { - try { - // 数据校验 - ValidatorBean.checkNotNull(idsStr, "idsStr不能为空"); - //数组验证 - idsStr = ConvertBean.modelSafeArrayNumber(idsStr, true); - - interfaceDataMapperService.updateMesInterfaceDataMapperIsValidStatusByIds(StringTool.getArrayLong(idsStr), status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("批量操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part/import-excel") - @ApiOperation(value = "散件BOM导入") - public ResultBean excelImportSpeed(String excelName) { - try { - if (StringUtils.isEmpty(excelName) || !EXCEL_NAME.equals(excelName)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.PARAMETER_EXCEPTION.getCode()) - .setErrorDetail("参数异常。") - .build(); - } - String org = AuthUtil.getOrganize().getOrganizeCode(); - String userName = AuthUtil.getSessionUser().getUserName(); - ExcelImportResultModel excelImportResultModel = baseDataService.excelImportSpeed(org, userName); - return ResultBean.success("查询成功").setResultObject(excelImportResultModel) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-part-formula/insert") - @ApiOperation(value = "新增产品配方信息") - public ResultBean insertMesPartFormula(MesPartFormula mesPartFormula) { - try { - //属性验证 - ValidatorBean.beginValid(mesPartFormula) - .notNull("formulaType", mesPartFormula.getFormulaType()) - .notNull("formulaContent", mesPartFormula.getFormulaContent()); - - mesPartFormulaService.insertMesPartFormula(mesPartFormula); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-formula/update") - @ApiOperation(value = "更新产品配方信息") - public ResultBean updateMesPartFormula(MesPartFormula mesPartFormula) { - try { - ValidatorBean.beginValid(mesPartFormula) - .notNull("formulaType", mesPartFormula.getFormulaType()) - .notNull("formulaContent", mesPartFormula.getFormulaContent()); - - if (mesPartFormula.getId() == null || mesPartFormula.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesPartFormulaService.updateMesPartFormula(mesPartFormula, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part-formula/query") - @ApiOperation(value = "分页查询产品配方信息列表", notes = "分页查询产品配方信息列表") - public ResultBean querysMesPartFormulaByPager(MesPartFormula mesPartFormula, Pager pager) { - try { - return ResultBean.success().setListPager(mesPartFormulaService.queryMesPartFormulaByPager(mesPartFormula, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-formula/update-status-batch") - @ApiOperation(value = "产品配方信息批量启用或禁用", notes = "产品配方信息批量启用或禁用") - public ResultBean updateMesPartFormulaStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesPartFormulaService.updateMesPartFormulaStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-formula/batch-delete") - @ApiOperation(value = "批量删除产品配方信息", notes = "批量删除产品配方信息") - public ResultBean deleteMesPartFormulaWeaklyByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesPartFormulaService.deleteWeaklyMesPartFormulaByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/import-mes-part-formula") - @ApiOperation(value = "导入产品配方") - public ResultBean importMesPartFormulFile(@RequestParam("file") MultipartFile file) { - try { - return importMesPartFormula(file); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (BaseImppException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ResultBean.fail(e); - } - } - - */ -/** - * 导入产品配方 - * - * @param file - * @return - *//* - - public ResultBean importMesPartFormula(MultipartFile file) { - try { - ExcelTool excelTool = new ExcelTool(entityManager, redisRes).setThrowAllErrorMode(true); - - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - - if (file.getOriginalFilename().indexOf("产品配方导入模板") == -1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("模板不正确") - .setErrorSolution("请选择正确的模板【模板名称包含产品配方导入模板】！") - .build(); - } - - ExcelImportModel excelImportModel = excelTool.importDataModel(file.getOriginalFilename(), file.getInputStream(), MesPartFormulaModel.class); - - if (!CollectionUtils.isEmpty(excelImportModel.getImportErrorModels())) { - return ResultBean.success("失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setResultList(excelImportModel.getImportErrorModels()); - } - - List mesPartFormulaModelList = excelImportModel.getExcelList(); - if (CollectionUtils.isEmpty(mesPartFormulaModelList)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("导入数据为空") - .setErrorSolution("请重新操作或查看服务！") - .build(); - } - - //循环放入下标值 - int i = 1; - for (MesPartFormulaModel mesPartFormulaModel : mesPartFormulaModelList) { - mesPartFormulaModel.setIndex(i); - i++; - } - - return mesPartFormulaService.doImportMesPartFormula(mesPartFormulaModelList, organizeCode); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (BaseImppException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ResultBean.fail(e); - } - } - - */ -/*************MES 散件产品组配置****start***********//* - - - @GetMapping(value = "/mes-scatter-detail/query") - @ApiOperation(value = "按条件分页查询MES散件产品组配置") - public ResultBean queryMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, Pager pager) { - try { - ListPager listPager = prodScatterDetailService.queryMesScatterDetail(mesProdScatterDetail, 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); - } - } - - @PostMapping(value = "/mes-scatter-detail/insert") - @ApiOperation(value = "新增mes散件产品组配置") - public ResultBean insertMesScatterDetail(MesProdScatterDetail mesProdScatterDetail) { - try { - //条件验证 - ValidatorBean.beginValid(mesProdScatterDetail) - .notNull("spCfgCode", mesProdScatterDetail.getSpCfgCode()) - .notNull("produceCtgyCode", mesProdScatterDetail.getProduceCtgyCode()) - .notNull("partName", mesProdScatterDetail.getPartName()) - .notNull("partNo", mesProdScatterDetail.getPartNo()); - - mesProdScatterDetail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(mesProdScatterDetail, AuthUtil.getSessionUser()); - - prodScatterDetailService.insertScatterDetail(mesProdScatterDetail); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-detail/update") - @ApiOperation(value = "更新mes散件产品组配置") - public ResultBean updateMesScatterDetail(MesProdScatterDetail mesProdScatterDetail) { - try { - //条件验证 - ValidatorBean.beginValid(mesProdScatterDetail) - .notNull("spCfgCode", mesProdScatterDetail.getSpCfgCode()) - .notNull("produceCtgyCode", mesProdScatterDetail.getProduceCtgyCode()) - .notNull("partName", mesProdScatterDetail.getPartName()) - .notNull("partNo", mesProdScatterDetail.getPartNo()); - - mesProdScatterDetail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - prodScatterDetailService.updateMesScatterDetail(mesProdScatterDetail); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-detail/status-update") - @ApiOperation(value = "根据id启用或禁用散件产品组配置") - public ResultBean updateMesScatterDetailStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodScatterDetailService.updateMesScatterDetailStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-qc-order-accessory/upload") - @ApiOperation(value = "上传mes-pcn发货检验文件") - public ResultBean uploadMesQcOrderAccessory(@RequestBody Map params) { - try { - startMultiService(); - - if (StringUtils.isBlank(params.get("file"))) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("不允许上传空文件") - .build(); - } - - byte[] bytes = (byte[]) SerializeTool.deserialization(params.get("file")); - - //通过发送DFS封装附件数据 - ImppFile imppFile = imppFileService.upload(new ByteArrayInputStream(bytes), params.get("fileName"), params.get("fileExt")); - SysFile sysFile = imppFileService.upload(imppFile, CommonEnumUtil.SOFT_TYPE.MES.getValue()); - BaseResultBean result = coreSysFileCloud.insertFile(sysFile); - - if (result.isSuccess()) { - return ResultBean.success("操作成功").setResultObject(result.getResultObject()); - } else { - return ResultBean.fail(result.getErrorMsg()).setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setMsg(result.getErrorMsg()); - } - - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 散件产品组配置****start***********//* - - - */ -/*************MES 海纳川 基础数据-车型等级****start***********//* - - @GetMapping(value = "/mes-model-grade/query") - @ApiOperation(value = "按条件分页查询MES车型等级") - public ResultBean queryMesModelGrade(MesModelGrade modelGrade, Pager pager) { - try { - modelGrade.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = modelGradeService.queryMesModelGrade(modelGrade, 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); - } - } - - @PostMapping(value = "/mes-model-grade/insert") - @ApiOperation(value = "新增mes车型等级") - public ResultBean insertMesModelGrade(MesModelGrade modelGrade) { - try { - //条件验证 - ValidatorBean.beginValid(modelGrade) - .notNull("gradeCode", modelGrade.getGradeCode()); - - modelGrade.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(modelGrade, AuthUtil.getSessionUser()); - - modelGradeService.insertMesModelGrade(modelGrade); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-model-grade/update") - @ApiOperation(value = "更新mes车型等级") - public ResultBean updateMesModelGrade(MesModelGrade modelGrade) { - try { - //条件验证 - ValidatorBean.beginValid(modelGrade) - .notNull("gradeCode", modelGrade.getGradeCode()); - - modelGrade.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - modelGradeService.updateMesModelGrade(modelGrade); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-model-grade/status-update") - @ApiOperation(value = "根据id启用或禁用车型等级") - public ResultBean updateMesModelGradeStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - modelGradeService.updateMesModelGradeStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @DeleteMapping(value = "/mes-model-grade/delete") - @ApiOperation(value = "根据id删除车型等级") - public ResultBean deleteMesModelGradeById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - modelGradeService.deleteMesModelGradeById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-车型等级****end***********//* - - - */ -/*************MES 海纳川 基础数据-产品颜色****start***********//* - - @GetMapping(value = "/mes-part-color/query") - @ApiOperation(value = "按条件分页查询MES产品颜色") - public ResultBean queryMesPartColor(MesPartColor partColor, Pager pager) { - try { - partColor.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = partColorService.queryMesPartColor(partColor, 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); - } - } - - @PostMapping(value = "/mes-part-color/insert") - @ApiOperation(value = "新增mes产品颜色") - public ResultBean insertMesPartColor(MesPartColor partColor) { - try { - //条件验证 - ValidatorBean.beginValid(partColor) - .notNull("colorCode", partColor.getColorCode()) - .notNull("colorType", partColor.getColorType()); - - partColor.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(partColor, AuthUtil.getSessionUser()); - - partColorService.insertMesPartColor(partColor); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-color/update") - @ApiOperation(value = "更新mes产品颜色") - public ResultBean updateMesPartColor(MesPartColor partColor) { - try { - //条件验证 - ValidatorBean.beginValid(partColor) - .notNull("colorCode", partColor.getColorCode()) - .notNull("colorType", partColor.getColorType()); - - partColor.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - partColorService.updateMesPartColor(partColor); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-color/status-update") - @ApiOperation(value = "根据id启用或禁用产品颜色") - public ResultBean updateMesPartColorStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - partColorService.updateMesPartColorStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @DeleteMapping(value = "/mes-part-color/delete") - @ApiOperation(value = "根据id删除产品颜色") - public ResultBean deleteMesPartColorById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - partColorService.deleteMesPartColorById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-产品颜色****end***********//* - - - */ -/*************MES 海纳川 基础数据-产品车型配置****start***********//* - - @GetMapping(value = "/mes-prod-model-cfg/query") - @ApiOperation(value = "按条件分页查询MES产品车型配置") - public ResultBean queryMesProdModelCfg(MesProdModelCfg prodModelCfg, Pager pager) { - try { - prodModelCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = prodModelCfgService.queryMesProdModelCfg(prodModelCfg, 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); - } - } - - @PostMapping(value = "/mes-prod-model-cfg/insert") - @ApiOperation(value = "新增mes产品车型配置") - public ResultBean insertMesProdModelCfg(MesProdModelCfg prodModelCfg) { - try { - //条件验证 - ValidatorBean.beginValid(prodModelCfg) - .notNull("prodCfgTypeCode", prodModelCfg.getProdCfgTypeCode()) - .notNull("produceCtgyCode", prodModelCfg.getProduceCtgyCode()) - .notNull("modelYear", prodModelCfg.getModelYear()) - .notNull("custPlantCode", prodModelCfg.getCustPlantCode()) - .notNull("gradeCode", prodModelCfg.getGradeCode()); - - prodModelCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(prodModelCfg, AuthUtil.getSessionUser()); - - prodModelCfgService.insertMesProdModelCfg(prodModelCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-model-cfg/update") - @ApiOperation(value = "更新mes产品车型配置") - public ResultBean updateMesProdModelCfg(MesProdModelCfg prodModelCfg) { - try { - //条件验证 - ValidatorBean.beginValid(prodModelCfg) - .notNull("prodCfgTypeCode", prodModelCfg.getProdCfgTypeCode()) - .notNull("produceCtgyCode", prodModelCfg.getProduceCtgyCode()) - .notNull("modelYear", prodModelCfg.getModelYear()) - .notNull("custPlantCode", prodModelCfg.getCustPlantCode()) - .notNull("gradeCode", prodModelCfg.getGradeCode()); - - prodModelCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - prodModelCfgService.updateMesProdModelCfg(prodModelCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-prod-model-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用产品车型配置") - public ResultBean updateMesProdModelCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - prodModelCfgService.updateMesProdModelCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @DeleteMapping(value = "/mes-prod-model-cfg/delete") - @ApiOperation(value = "根据id删除产品车型配置") - public ResultBean deleteMesProdModelCfgById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - prodModelCfgService.deleteMesProdModelCfgById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-产品车型配置****end***********//* - - - */ -/*************MES 海纳川 基础数据-车型散件配置清单****start***********//* - - @GetMapping(value = "/mes-scatter-part-cfg-bom/query") - @ApiOperation(value = "按条件分页查询MES车型散件配置清单") - public ResultBean queryMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, Pager pager) { - try { - scatterPartCfgBom.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = scatterPartCfgBomService.queryMesScatterPartCfgBom(scatterPartCfgBom, 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); - } - } - - @PostMapping(value = "/mes-scatter-part-cfg-bom/insert") - @ApiOperation(value = "新增mes车型散件配置清单") - public ResultBean insertMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom) { - try { - //条件验证 - ValidatorBean.beginValid(scatterPartCfgBom) - .notNull("prodCfgTypeCode", scatterPartCfgBom.getProdCfgTypeCode()) - .notNull("produceCtgyCode", scatterPartCfgBom.getProduceCtgyCode()) - .notNull("modelYear", scatterPartCfgBom.getModelYear()) - .notNull("custPlantCode", scatterPartCfgBom.getCustPlantCode()) - .notNull("partNo", scatterPartCfgBom.getPartNo()); - - scatterPartCfgBom.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(scatterPartCfgBom, AuthUtil.getSessionUser()); - - scatterPartCfgBomService.insertMesScatterPartCfgBom(scatterPartCfgBom); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-part-cfg-bom/update") - @ApiOperation(value = "更新mes车型散件配置清单") - public ResultBean updateMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom) { - try { - //条件验证 - ValidatorBean.beginValid(scatterPartCfgBom) - .notNull("prodCfgTypeCode", scatterPartCfgBom.getProdCfgTypeCode()) - .notNull("produceCtgyCode", scatterPartCfgBom.getProduceCtgyCode()) - .notNull("modelYear", scatterPartCfgBom.getModelYear()) - .notNull("custPlantCode", scatterPartCfgBom.getCustPlantCode()) - .notNull("partNo", scatterPartCfgBom.getPartNo()); - - scatterPartCfgBom.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - scatterPartCfgBomService.updateMesScatterPartCfgBom(scatterPartCfgBom); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-part-cfg-bom/status-update") - @ApiOperation(value = "根据id启用或禁用车型散件配置清单") - public ResultBean updateMesScatterPartCfgBomStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - scatterPartCfgBomService.updateMesScatterPartCfgBomStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @DeleteMapping(value = "/mes-scatter-part-cfg-bom/delete") - @ApiOperation(value = "根据id删除车型散件配置清单") - public ResultBean deleteMesScatterPartCfgBomById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - scatterPartCfgBomService.deleteMesScatterPartCfgBomById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-车型散件配置清单****end***********//* - - - */ -/*************MES 海纳川 基础数据-散件零件生产配置****start***********//* - - @GetMapping(value = "/mes-scatter-part-prod-cfg/query") - @ApiOperation(value = "按条件分页查询MES散件零件生产配置") - public ResultBean queryMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, Pager pager) { - try { - scatterPartProdCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = scatterPartProdCfgService.queryMesScatterPartProdCfg(scatterPartProdCfg, 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); - } - } - - @PostMapping(value = "/mes-scatter-part-prod-cfg/insert") - @ApiOperation(value = "新增mes散件零件生产配置") - public ResultBean insertMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg) { - try { - //条件验证 - ValidatorBean.beginValid(scatterPartProdCfg) - .notNull("cfgId", scatterPartProdCfg.getCfgId()); - - scatterPartProdCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(scatterPartProdCfg, AuthUtil.getSessionUser()); - - scatterPartProdCfgService.insertMesScatterPartProdCfg(scatterPartProdCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-part-prod-cfg/update") - @ApiOperation(value = "更新mes散件零件生产配置") - public ResultBean updateMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg) { - try { - //条件验证 - ValidatorBean.beginValid(scatterPartProdCfg) - .notNull("cfgId", scatterPartProdCfg.getCfgId()); - - scatterPartProdCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - scatterPartProdCfgService.updateMesScatterPartProdCfg(scatterPartProdCfg); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-part-prod-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用散件零件生产配置") - public ResultBean updateMesScatterPartProdCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - scatterPartProdCfgService.updateMesScatterPartProdCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @DeleteMapping(value = "/mes-scatter-part-prod-cfg/delete") - @ApiOperation(value = "根据id删除散件零件生产配置") - public ResultBean deleteMesScatterPartProdCfgById(Long id) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - scatterPartProdCfgService.deleteMesScatterPartProdCfgById(id, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-散件零件生产配置****end***********//* - - - */ -/*************MES 海纳川 基础数据-盲检记录****start***********//* - - @GetMapping(value = "/mes-blind-history/find") - @ApiOperation(value = "按条件查询MES盲检记录") - public ResultBean findMesBlindHistory(MesBlindHistory mesBlindHistory, Pager pager) { - try { - mesBlindHistory.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success("操作成功").setListPager(mesBlindService.findMesBlindHistory(mesBlindHistory, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - */ -/*************MES 海纳川 基础数据-盲检记录****end***********//* - - - */ -/*************MES 海纳川 基础数据-盲检规则****start***********//* - - - @PostMapping(value = "/mes-blind-rule/insert") - @ApiOperation(value = "新增盲检规则信息") - public ResultBean insertMesBlindRule(MesBlindRule mesBlindRule) { - try { - //属性验证 - ValidatorBean.beginValid(mesBlindRule) - .notNull("carType", mesBlindRule.getCarType()) - .notNull("carColor", mesBlindRule.getCarColor()) - .notNull("partCode", mesBlindRule.getPartCode()) - .notNull("partName", mesBlindRule.getPartName()) - .notNull("carConfig", mesBlindRule.getCarConfig()) - .notNull("carLevel", mesBlindRule.getCarLevel()) - .notNull("partColor", mesBlindRule.getPartColor()); - - mesBlindRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesBlindService.insertMesBlindRule(mesBlindRule); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-rule/update") - @ApiOperation(value = "更新盲检规则信息") - public ResultBean updateMesBlindRule(MesBlindRule mesBlindRule) { - try { - //属性验证 - ValidatorBean.beginValid(mesBlindRule) - .notNull("carType", mesBlindRule.getCarType()) - .notNull("carColor", mesBlindRule.getCarColor()) - .notNull("partCode", mesBlindRule.getPartCode()) - .notNull("partName", mesBlindRule.getPartName()) - .notNull("carConfig", mesBlindRule.getCarConfig()) - .notNull("carLevel", mesBlindRule.getCarLevel()) - .notNull("partColor", mesBlindRule.getPartColor()); - - if (mesBlindRule.getId() == null || mesBlindRule.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesBlindService.updateMesBlindRule(mesBlindRule, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-blind-rule/query") - @ApiOperation(value = "分页查询盲检规则信息列表", notes = "分页查询盲检规则信息列表") - public ResultBean querysMesBlindRuleByPager(MesBlindRule mesBlindRule, Pager pager) { - try { - return ResultBean.success().setListPager(mesBlindService.queryMesBlindRuleByPager(mesBlindRule, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-rule/update-status-batch") - @ApiOperation(value = "盲检规则信息批量启用或禁用", notes = "盲检规则信息批量启用或禁用") - public ResultBean updateMesBlindRuleStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesBlindService.updateMesBlindRuleStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-rule/batch-delete") - @ApiOperation(value = "批量删除盲检规则信息", notes = "批量删除盲检规则信息") - public ResultBean deleteMesBlindRuleWeaklyByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesBlindService.deleteWeaklyMesBlindRuleByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/import-mes-blind-rule") - @ApiOperation(value = "导入盲检规则") - public ResultBean importMesBlindRuleFile(@RequestParam("file") MultipartFile file) { - try { - return importMesBlindRule(file); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (BaseImppException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ResultBean.fail(e); - } - } - - */ -/** - * 导入盲检规则 - * - * @param file - * @return - *//* - - public ResultBean importMesBlindRule(MultipartFile file) { - try { - ExcelTool excelTool = new ExcelTool(entityManager, redisRes).setThrowAllErrorMode(true); - - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); - - if (file.getOriginalFilename().indexOf("盲检规则导入模板") == -1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("模板不正确") - .setErrorSolution("请选择正确的模板【模板名称包含盲检规则导入模板】！") - .build(); - } - - ExcelImportModel excelImportModel = excelTool.importDataModel(file.getOriginalFilename(), file.getInputStream(), MesBlindRuleModel.class); - - if (!CollectionUtils.isEmpty(excelImportModel.getImportErrorModels())) { - return ResultBean.success("失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setResultList(excelImportModel.getImportErrorModels()); - } - - List mesBlindRuleModelList = excelImportModel.getExcelList(); - if (CollectionUtils.isEmpty(mesBlindRuleModelList)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("导入数据为空") - .setErrorSolution("请重新操作或查看服务！") - .build(); - } - - //循环放入下标值 - int i = 1; - for (MesBlindRuleModel mesBlindRuleModel : mesBlindRuleModelList) { - mesBlindRuleModel.setIndex(i); - i++; - } - - return mesBlindService.doImportMesBlindRules(mesBlindRuleModelList, organizeCode); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (BaseImppException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ResultBean.fail(e); - } - } - - */ -/*************MES 海纳川 基础数据-盲检规则****end***********//* - - - */ -/*************MES 海纳川 基础数据-盲检问题设置****start***********//* - - - @PostMapping(value = "/mes-blind-topic-setting/insert") - @ApiOperation(value = "新增盲检问题设置信息") - public ResultBean insertMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { - try { - //属性验证 - ValidatorBean.beginValid(mesBlindTopicSetting) - .notNull("topicCode", mesBlindTopicSetting.getTopicCode()) - .notNull("topicId", mesBlindTopicSetting.getTopicId()) - .notNull("topicDesc", mesBlindTopicSetting.getTopicDesc()) - .notNull("topicObject", mesBlindTopicSetting.getTopicObject()) - .notNull("topicType", mesBlindTopicSetting.getTopicType()) - .notNull("workCellCode", mesBlindTopicSetting.getWorkCellCode()) - .notNull("workCenterCode", mesBlindTopicSetting.getWorkCenterCode()); - - mesBlindTopicSetting.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesBlindService.insertMesBlindTopicSetting(mesBlindTopicSetting); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-topic-setting/update") - @ApiOperation(value = "更新盲检问题设置信息") - public ResultBean updateMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { - try { - ValidatorBean.beginValid(mesBlindTopicSetting) - .notNull("topicCode", mesBlindTopicSetting.getTopicCode()) - .notNull("topicId", mesBlindTopicSetting.getTopicId()) - .notNull("topicDesc", mesBlindTopicSetting.getTopicDesc()) - .notNull("topicObject", mesBlindTopicSetting.getTopicObject()) - .notNull("topicType", mesBlindTopicSetting.getTopicType()) - .notNull("workCellCode", mesBlindTopicSetting.getWorkCellCode()) - .notNull("workCenterCode", mesBlindTopicSetting.getWorkCenterCode()); - - if (mesBlindTopicSetting.getId() == null || mesBlindTopicSetting.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesBlindService.updateMesBlindTopicSetting(mesBlindTopicSetting, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-blind-topic-setting/query") - @ApiOperation(value = "分页查询盲检问题设置信息列表", notes = "分页查询盲检问题设置信息列表") - public ResultBean querysMesBlindTopicSettingByPager(MesBlindTopicSetting mesBlindTopicSetting, Pager pager) { - try { - return ResultBean.success().setListPager( - mesBlindService.queryMesBlindTopicSettingByPager(mesBlindTopicSetting, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-topic-setting/update-status-batch") - @ApiOperation(value = "盲检问题设置信息批量启用或禁用", notes = "盲检问题设置信息批量启用或禁用") - public ResultBean updateMesBlindTopicSettingStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesBlindService.updateMesBlindTopicSettingStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-blind-topic-setting/batch-delete") - @ApiOperation(value = "批量删除盲检问题设置信息", notes = "批量删除盲检问题设置信息") - public ResultBean deleteMesBlindTopicSettingWeaklyByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesBlindService.deleteWeaklyMesBlindTopicSettingByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 海纳川 基础数据-盲检问题设置****end***********//* - - - */ -/*************MES 北京麦格纳 基础数据-散件BOM****start***********//* - - - @GetMapping(value = "/mes-scatter-bom-cfg/query") - @ApiOperation(value = "按条件分页查询MES散件BOM") - public ResultBean queryMesScatterBomCfg(MesScatterBomCfg scatterBomCfg, Pager pager) { - try { - ListPager listPager = scatterBomCfgService.queryMesScatterBomCfg(scatterBomCfg, 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); - } - } - - @PostMapping(value = "/mes-scatter-bom-cfg/insert") - @ApiOperation(value = "新增mes散件BOM") - public ResultBean insertMesScatterBomCfg(MesScatterBomCfg scatterBomCfg) { - try { - //条件验证 - ValidatorBean.beginValid(scatterBomCfg) - .notNull("partNo", scatterBomCfg.getPartNo()) - .notNull("customerPartNo", scatterBomCfg.getCustomerPartNo()) - .notNull("prodCfgTypeCode", scatterBomCfg.getProdCfgTypeCode()); - scatterBomCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - scatterBomCfgService.insertMesScatterBomCfg(scatterBomCfg); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-bom-cfg/update") - @ApiOperation(value = "更新mes散件BOM") - public ResultBean updateMesScatterBomCfg(MesScatterBomCfg scatterBomCfg) { - try { - //条件验证 - ValidatorBean.beginValid(scatterBomCfg) - .notNull("partNo", scatterBomCfg.getPartNo()) - .notNull("customerPartNo", scatterBomCfg.getCustomerPartNo()) - .notNull("prodCfgTypeCode", scatterBomCfg.getProdCfgTypeCode()); - String userName = AuthUtil.getSessionUser().getUserName(); - scatterBomCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - scatterBomCfgService.updateMesScatterBomCfg(scatterBomCfg, userName); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-bom-cfg/status-update") - @ApiOperation(value = "根据id启用或禁用散件BOM") - public ResultBean updateMesScatterBomCfgStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - scatterBomCfgService.updateMesScatterBomCfgStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-scatter-bom-cfg/status-update-batch") - @ApiOperation(value = "批量启用或禁用散件BOM") - public ResultBean updateBatchScatterBomCfgStatus(@RequestBody List scatterBomCfgList, int status) { - try { - - scatterBomCfgService.updateBatchScatterBomCfgStatus(scatterBomCfgList, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 北京麦格纳 基础数据-散件BOM****end***********//* - - - */ -/*************MES 北京麦格纳 基础数据-物料项目关系****start***********//* - - - @GetMapping(value = "/mes-part-prod-cfg-type/query") - @ApiOperation(value = "按条件分页查询MES物料项目关系") - public ResultBean queryMesPartProdCfgType(MesPartProdCfgType partProdCfgType, Pager pager) { - try { - ListPager listPager = partProdCfgTypeService.queryMesPartProdCfgType(partProdCfgType, 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); - } - } - - @PostMapping(value = "/mes-part-prod-cfg-type/insert") - @ApiOperation(value = "新增mes物料项目关系") - public ResultBean insertMesPartProdCfgType(MesPartProdCfgType partProdCfgType) { - try { - //条件验证 - ValidatorBean.beginValid(partProdCfgType) - .notNull("partNo", partProdCfgType.getPartNo()) - .notNull("prodCfgTypeCode", partProdCfgType.getProdCfgTypeCode()); - partProdCfgType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(partProdCfgType, AuthUtil.getSessionUser()); - - partProdCfgTypeService.insertMesPartProdCfgType(partProdCfgType); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-prod-cfg-type/update") - @ApiOperation(value = "更新mes物料项目关系") - public ResultBean updateMesPartProdCfgType(MesPartProdCfgType partProdCfgType) { - try { - //条件验证 - ValidatorBean.beginValid(partProdCfgType) - .notNull("partNo", partProdCfgType.getPartNo()) - .notNull("prodCfgTypeCode", partProdCfgType.getProdCfgTypeCode()); - - String userName = AuthUtil.getSessionUser().getUserName(); - partProdCfgType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - partProdCfgTypeService.updateMesPartProdCfgType(partProdCfgType, userName); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-prod-cfg-type/status-update") - @ApiOperation(value = "根据id启用或禁用物料项目关系") - public ResultBean updateMesPartProdCfgTypeStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - partProdCfgTypeService.updateMesPartProdCfgTypeStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 北京麦格纳 基础数据-物料项目关系****end***********//* - - - */ -/*************MES 北京麦格纳 基础数据-工位缺陷****start***********//* - - - @GetMapping(value = "/mes-work-cell-defect/query") - @ApiOperation(value = "按条件分页查询MES工位缺陷") - public ResultBean queryMesWorkCellDefect(MesWorkCellDefect workCellDefect, Pager pager) { - try { - ListPager listPager = workCellDefectService.queryMesWorkCellDefect(workCellDefect, 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); - } - } - - @PostMapping(value = "/mes-work-cell-defect/insert") - @ApiOperation(value = "新增mes工位缺陷") - public ResultBean insertMesWorkCellDefect(MesWorkCellDefect workCellDefect) { - try { - workCellDefect.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(workCellDefect, AuthUtil.getSessionUser()); - - workCellDefectService.insertMesWorkCellDefect(workCellDefect); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-work-cell-defect/update") - @ApiOperation(value = "更新mes工位缺陷") - public ResultBean updateMesWorkCellDefect(MesWorkCellDefect workCellDefect) { - try { - String userName = AuthUtil.getSessionUser().getUserName(); - workCellDefect.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - workCellDefectService.updateMesWorkCellDefect(workCellDefect, userName); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-work-cell-defect/status-update") - @ApiOperation(value = "根据id启用或禁用工位缺陷") - public ResultBean updateMesWorkCellDefectStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - workCellDefectService.updateMesWorkCellDefectStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 北京麦格纳 基础数据-工位缺陷****end***********//* - - - */ -/*************MES 北京麦格纳 基础数据-编码规则映射****start***********//* - - - @GetMapping(value = "/mes-en-code-rule/query") - @ApiOperation(value = "按条件分页查询MES编码规则映射") - public ResultBean queryMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap, Pager pager) { - try { - ListPager listPager = encodeRuleMapService.queryMesEncodeRuleMap(encodeRuleMap, 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); - } - } - - @PostMapping(value = "/mes-en-code-rule/insert") - @ApiOperation(value = "新增mes编码规则映射") - public ResultBean insertMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap) { - try { - //条件验证 - ValidatorBean.beginValid(encodeRuleMap) - .notNull("typeCode", encodeRuleMap.getTypeCode()) - .notNull("businessCode", encodeRuleMap.getBusinessCode()) - .notNull("businessValue", encodeRuleMap.getBusinessValue()); - encodeRuleMap.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(encodeRuleMap, AuthUtil.getSessionUser()); - - encodeRuleMapService.insertMesEncodeRuleMap(encodeRuleMap); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-en-code-rule/update") - @ApiOperation(value = "更新mes编码规则映射") - public ResultBean updateMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap) { - try { - //条件验证 - ValidatorBean.beginValid(encodeRuleMap) - .notNull("typeCode", encodeRuleMap.getTypeCode()) - .notNull("businessCode", encodeRuleMap.getBusinessCode()) - .notNull("businessValue", encodeRuleMap.getBusinessValue()); - - String userName = AuthUtil.getSessionUser().getUserName(); - encodeRuleMap.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - encodeRuleMapService.updateMesEncodeRuleMap(encodeRuleMap, userName); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-en-code-rule/status-update") - @ApiOperation(value = "根据id启用或禁用编码规则映射") - public ResultBean updateMesEncodeRuleMapStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - encodeRuleMapService.updateMesEncodeRuleMapStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 北京麦格纳 基础数据-编码规则映射****end***********//* - - - - @GetMapping(value = "/spc-key-data/query") - @ApiOperation(value = "关键数据，下拉框加载。级联加载，根据产线查询【MES_SPC关键数据】。产线为空时加载所有") - public ResultBean querySpcKeyDataByWorkCenterCode(String workCenterCode) { - try { -// encodeRuleMapService.updateMesEncodeRuleMapStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - // @PutMapping(value = "/gen-serial/insert") -// @ApiOperation(value = "新增mes编码规则映射") -// public ResultBean insertMesGenSerial(Long id) { -// try { -// //条件验证 -// checkJITOrderService.insertMesQueueOrderAndDetail(id); -// -// return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } catch (ImppBusiException busExcep) { -// return ResultBean.fail(busExcep); -// } catch (Exception e) { -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - @PostMapping(value = "/tj-part-stock-schedule/insert") - @ApiOperation(value = "新增天津库存排程配置信息") - public ResultBean insertTjPartStockSchedule(MesPartStockSchedule qualityStandardCfg) { - try { - //条件验证 - ValidatorBean.beginValid(qualityStandardCfg) - .notNull("prodCfgCod", qualityStandardCfg.getProdCfgCode()) - .notNull("minCapacity", qualityStandardCfg.getMinCapacity()) - .notNull("maxCapacity", qualityStandardCfg.getMaxCapacity()); - qualityStandardCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ConvertBean.modelInitialize(qualityStandardCfg, AuthUtil.getSessionUser()); - - partStockScheduleService.insertTJPartStockSchedule(qualityStandardCfg, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/tj-part-stock-schedule/update") - @ApiOperation(value = "更新天津库存排程配置信息") - public ResultBean updateTjMesPartStockSchedule(MesPartStockSchedule qualityStandardCfg) { - try { - //条件验证 - ValidatorBean.beginValid(qualityStandardCfg) - .notNull("prodCfgCod", qualityStandardCfg.getProdCfgCode()) - .notNull("minCapacity", qualityStandardCfg.getMinCapacity()) - .notNull("maxCapacity", qualityStandardCfg.getMaxCapacity()); - - partStockScheduleService.updateTJPartStockSchedule(qualityStandardCfg, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 天津 基础数据-库位信息****start***********//* - - - @PostMapping(value = "/mes-location/insert") - @ApiOperation(value = "新增库位信息") - public ResultBean insertMesLocation(MesLocation mesLocation) { - try { - //属性验证 - ValidatorBean.beginValid(mesLocation) - .notNull("locationCode", mesLocation.getLocationCode()); - - mesLocation.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesLocationService.insertMesLocation(mesLocation); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-location/update") - @ApiOperation(value = "更新库位信息") - public ResultBean updateMesLocation(MesLocation mesLocation) { - try { - ValidatorBean.beginValid(mesLocation) - .notNull("locationCode", mesLocation.getLocationCode()); - - if (mesLocation.getId() == null || mesLocation.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - mesLocation.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesLocationService.updateMesLocation(mesLocation, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-location/query") - @ApiOperation(value = "分页查询库位信息列表", notes = "分页查询库位信息列表") - public ResultBean queryMesLocationByPager(MesLocation mesLocation, Pager pager) { - try { - mesLocation.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager( - mesLocationService.queryMesLocationByPager(mesLocation, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-location/update-status-batch") - @ApiOperation(value = "库位信息批量启用或禁用", notes = "库位信息批量启用或禁用") - public ResultBean updateMesLocationStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesLocationService.updateMesLocationStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-location/batch-delete") - @ApiOperation(value = "批量删除库位信息", notes = "批量删除库位信息") - public ResultBean deleteWeaklyMesLocationByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesLocationService.deleteWeaklyMesLocationByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 海纳川 基础数据-库位信息****end***********//* - - - */ -/*************MES 中航 基础数据-替代料****start***********//* - - - @PostMapping(value = "/mes-sub-part/insert") - @ApiOperation(value = "新增替代料信息") - public ResultBean insertMesSubPart(MesSubPart mesSubPart) { - try { - //属性验证 - ValidatorBean.beginValid(mesSubPart) - .notNull("partNo", mesSubPart.getPartNo()) - .notNull("subPartNo", mesSubPart.getSubPartNo()) - .notNull("subFlag", mesSubPart.getSubFlag()); - - mesSubPart.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesSubPartService.insertMesSubPart(mesSubPart); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-sub-part/update") - @ApiOperation(value = "更新替代料信息") - public ResultBean updateMesSubPart(MesSubPart mesSubPart) { - try { - //属性验证 - ValidatorBean.beginValid(mesSubPart) - .notNull("partNo", mesSubPart.getPartNo()) - .notNull("subPartNo", mesSubPart.getSubPartNo()) - .notNull("subFlag", mesSubPart.getSubFlag()); - - if (mesSubPart.getId() == null || mesSubPart.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesSubPartService.updateMesSubPart(mesSubPart, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-sub-part/query") - @ApiOperation(value = "分页查询替代料信息列表", notes = "分页查询替代料信息列表") - public ResultBean queryMesSubPartByPager(MesSubPart mesSubPart, Pager pager) { - try { - return ResultBean.success().setListPager(mesSubPartService.queryMesSubPartByPager(mesSubPart, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-sub-part/update-status-batch") - @ApiOperation(value = "替代料信息批量启用或禁用", notes = "替代料信息批量启用或禁用") - public ResultBean updateMesSubPartStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesSubPartService.updateMesSubPartStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-sub-part/batch-delete") - @ApiOperation(value = "批量删除替代料信息", notes = "批量删除替代料信息") - public ResultBean deleteWeaklyMesSubPartByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesSubPartService.deleteWeaklyMesSubPartByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-exception-alert-cfg/insert") - @ApiOperation(value = "添加MES_异常提醒配置信息") - public ResultBean insertMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { - try { - mesExceptionAlertCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesExceptionAlertCfgService.insertMesExceptionAlertCfg(mesExceptionAlertCfg); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-exception-alert-cfg/update") - @ApiOperation(value = "更新盲检规则信息") - public ResultBean updateMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { - try { - if (mesExceptionAlertCfg.getId() == null || mesExceptionAlertCfg.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesExceptionAlertCfgService.updateMesExceptionAlertCfg(mesExceptionAlertCfg, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-exception-alert-cfg/query") - @ApiOperation(value = "按条件分页查询MES_异常提醒配置信息", notes = "按条件分页查询MES_异常提醒配置信息") - public ResultBean queryMesExceptionAlertCfgByPager(MesExceptionAlertCfg mesExceptionAlertCfg, Pager pager) { - try { - mesExceptionAlertCfg.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesExceptionAlertCfgService.queryMesExceptionAlertCfgByPager(mesExceptionAlertCfg, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-exception-alert-cfg/update-status-batch") - @ApiOperation(value = "MES_异常提醒配置信息批量启用或禁用", notes = "MES_异常提醒配置信息批量启用或禁用") - public ResultBean updateMesExceptionAlertCfgStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesExceptionAlertCfgService.updateMesExceptionAlertCfgStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-exception-alert-cfg/batch-delete") - @ApiOperation(value = "批量删除异常提醒配置信息", notes = "批量删除异常提醒配置信息") - public ResultBean deleteWeaklyMesExceptionAlertCfgByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesExceptionAlertCfgService.deleteWeaklyMesExceptionAlertCfgByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/** - * 登陆后再次调用，传参同步userLoginSid和cookie - * - * @return - *//* - - @GetMapping(value = "/core/personnel/query-ref-department") - @ApiOperation(value = "获取帐号信息", notes = "获取 Core 的帐号信息") - public BaseResultBean findCoreSysUser(UserDetailModel model) { - BaseResultBean baseResultBean = personnelCloud.getSysOrganizeByCode(model.getOrganizeCode()); - - if (!baseResultBean.isSuccess()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.ANDON.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail("微服务调用失敗：【%s】", baseResultBean.getErrorMsg()) - .setErrorSolution("请重新操作或查看服务！") - .build(); - } - - ValidatorBean.checkNotNull(baseResultBean.getResultObject()); - List organizeIdList = new ArrayList<>(); - organizeIdList.add(String.valueOf(baseResultBean.getResultObject().getId())); - model.setUserOrganizeIdList(organizeIdList); - return personnelCloud.queryRefDepartment(model); - } - - */ -/*************MES 卡斯马 基础数据-物料上炉模式****start***********//* - - @PostMapping(value = "/mes-part-furnace/insert") - @ApiOperation(value = "添加MES_物料上炉模式") - public ResultBean insertPartFurnace(@RequestParam("file") MultipartFile file, MesPartFurnace partFurnace) { - try { - if (file.isEmpty()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("不允许上传空文件") - .build(); - } - - MesFile mesFile = fileService.uploadMesFile(file, AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName()); - ConvertBean.modelInitialize(mesFile, getSessionUser()); - - //属性验证 - ValidatorBean.beginValid(partFurnace) - .notNull("modelNo", partFurnace.getModelNo()) - .notNull("partNo", partFurnace.getPartNo()) - .notNull("orientation", partFurnace.getOrientation()); - - partFurnace.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - partFurnace.setModelImgUrl(mesFile.getFileUrl()); - ConvertBean.serviceModelInitialize(partFurnace, getSessionUser()); - partFurnaceService.insertPartFurnace(partFurnace); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-part-furnace/update") - @ApiOperation(value = "更新MES_物料上炉模式") - public ResultBean updatePartFurnace(MultipartFile file, MesPartFurnace partFurnace) { - try { - if (partFurnace.getId() == null || partFurnace.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - //属性验证 - ValidatorBean.beginValid(partFurnace) - .notNull("modelNo", partFurnace.getModelNo()) - .notNull("partNo", partFurnace.getPartNo()) - .notNull("orientation", partFurnace.getOrientation()); - - if (file != null && file.getSize() > 0) { - MesFile mesFile = fileService.uploadMesFile(file, AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName()); - ConvertBean.modelUpdate(mesFile, getSessionUser()); - partFurnace.setModelImgUrl(mesFile.getFileUrl()); - } - - partFurnace.setOrganizeCode(AuthUtil.getOrganizeCode()); - partFurnaceService.updatePartFurnace(partFurnace, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part-furnace/query") - @ApiOperation(value = "分页查询MES_物料上炉模式列表", notes = "分页查询MES_物料上炉模式列表") - public ResultBean queryPartFurnaceByPager(MesPartFurnace partFurnace, Pager pager) { - try { - partFurnace.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(partFurnaceService.queryPartFurnaceByPager(partFurnace, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-furnace/update-status-batch") - @ApiOperation(value = "物料上炉模式批量启用或禁用", notes = "物料上炉模式批量启用或禁用") - public ResultBean updatePartFurnaceStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - partFurnaceService.updatePartFurnaceStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-furnace/batch-delete") - @ApiOperation(value = "批量删除物料上炉模式", notes = "批量删除物料上炉模式") - public ResultBean deleteWeaklyPartFurnaceByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - partFurnaceService.deleteWeaklyPartFurnaceByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 卡斯马 基础数据-物料上炉模式位置****end***********//* - - - */ -/*************MES 卡斯马 基础数据-客户条码规则****start***********//* - - - @GetMapping(value = "/mes-query-customer") - @ApiOperation(value = "查询MES_客户") - public ResultBean queryCustomer() { - List resultList = customerService.queryMesCustomerAll(AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @GetMapping(value = "/mes-query-customer-part") - @ApiOperation(value = "根据客户代码查询客户零件号") - public ResultBean queryCustomerPartByCode(String customerCode) { - List resultList = customerSnRuleService.queryCustomerPartByCode(AuthUtil.getOrganizeCode(), customerCode); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @PostMapping(value = "/mes-customer-sn-rule/insert") - @ApiOperation(value = "添加MES_客户条码规则") - public ResultBean insertCustomerSnRule(MesCustomerSnRule customerSnRule) { - try { - //属性验证 - ValidatorBean.beginValid(customerSnRule) - .notNull("customerCode", customerSnRule.getCustomerCode()) - .notNull("customerPartNo", customerSnRule.getCustomerPartNo()) - .notNull("partNo", customerSnRule.getPartNo()) - .notNull("length", customerSnRule.getLength()) - .notNull("from1", customerSnRule.getFrom1()) - .notNull("to1", customerSnRule.getTo1()); - - customerSnRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - customerSnRuleService.insertCustomerSnRule(customerSnRule, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-customer-sn-rule/update") - @ApiOperation(value = "更新MES_客户条码规则") - public ResultBean updateCustomerSnRule(MesCustomerSnRule customerSnRule) { - try { - if (customerSnRule.getId() == null || customerSnRule.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - //属性验证 - ValidatorBean.beginValid(customerSnRule) - .notNull("customerCode", customerSnRule.getCustomerCode()) - .notNull("customerPartNo", customerSnRule.getCustomerPartNo()) - .notNull("partNo", customerSnRule.getPartNo()) - .notNull("length", customerSnRule.getLength()) - .notNull("from1", customerSnRule.getFrom1()) - .notNull("to1", customerSnRule.getTo1()); - - customerSnRule.setOrganizeCode(AuthUtil.getOrganizeCode()); - customerSnRuleService.updateCustomerSnRule(customerSnRule, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-customer-sn-rule/query") - @ApiOperation(value = "分页查询MES_客户条码规则", notes = "分页查询MES_客户条码规则") - public ResultBean queryCustomerSnRuleByPager(MesCustomerSnRule customerSnRule, Pager pager) { - try { - customerSnRule.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(customerSnRuleService.queryCustomerSnRuleByPager(customerSnRule, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-customer-sn-rule/update-status-batch") - @ApiOperation(value = "客户条码规则批量启用或禁用", notes = "客户条码规则批量启用或禁用") - public ResultBean updateCustomerSnRuleStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - customerSnRuleService.updateCustomerSnRuleStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-customer-sn-rule/batch-delete") - @ApiOperation(value = "批量删除客户条码规则", notes = "批量删除客户条码规则") - public ResultBean deleteWeaklyCustomerSnRuleByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - customerSnRuleService.deleteWeaklyCustomerSnRuleByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 卡斯马 基础数据-客户条码规则****end***********//* - - - */ -/*************MES 卡斯马 基础数据-产品料架容量配置****start***********//* - - - @GetMapping(value = "/mes-query-container-type") - @ApiOperation(value = "查询MES_容器类型代码") - public ResultBean queryContainerType() { - List resultList = containerService.queryContainerTypeAll(AuthUtil.getOrganizeCode()); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @GetMapping(value = "/mes-query-container-location") - @ApiOperation(value = "根据容器类型查询MES_容器位置编号") - public ResultBean queryContainerLocation(String ctCode) { - List resultList = containerService.queryContainerLocationsByCtCode(AuthUtil.getOrganizeCode(), ctCode); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @PostMapping(value = "/mes-part-container-capacity/insert") - @ApiOperation(value = "添加MES_产品容器容量配置") - public ResultBean insertPartContainerCapacity(MesPartContainerCapacity partContainerCapacity) { - try { - //属性验证 - ValidatorBean.beginValid(partContainerCapacity) - .notNull("ctCode", partContainerCapacity.getCtCode()) - .notNull("ctLocationNo", partContainerCapacity.getCtLocationNo()) - .notNull("ctQty", partContainerCapacity.getCtQty()) - .notNull("partNo", partContainerCapacity.getPartNo()); - - partContainerCapacity.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - containerService.insertPartContainerCapacity(partContainerCapacity, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-part-container-capacity/update") - @ApiOperation(value = "更新MES_产品容器容量配置") - public ResultBean updatePartContainerCapacity(MesPartContainerCapacity partContainerCapacity) { - try { - if (partContainerCapacity.getId() == null || partContainerCapacity.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - //属性验证 - ValidatorBean.beginValid(partContainerCapacity) - .notNull("ctCode", partContainerCapacity.getCtCode()) - .notNull("ctLocationNo", partContainerCapacity.getCtLocationNo()) - .notNull("ctQty", partContainerCapacity.getCtQty()) - .notNull("partNo", partContainerCapacity.getPartNo()); - - partContainerCapacity.setOrganizeCode(AuthUtil.getOrganizeCode()); - containerService.updatePartContainerCapacity(partContainerCapacity, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part-container-capacity/query") - @ApiOperation(value = "分页查询MES_产品容器容量配置", notes = "分页查询MES_产品容器容量配置") - public ResultBean queryPartContainerCapacityByPager(MesPartContainerCapacity partContainerCapacity, Pager pager) { - try { - partContainerCapacity.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(containerService.queryPartContainerCapacityByPager(partContainerCapacity, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-container-capacity/update-status-batch") - @ApiOperation(value = "产品容器容量配置批量启用或禁用", notes = "产品容器容量配置批量启用或禁用") - public ResultBean updatePartContainerCapacityStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - containerService.updatePartContainerCapacityStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-container-capacity/batch-delete") - @ApiOperation(value = "批量删除产品容器容量配置", notes = "批量删除产品容器容量配置") - public ResultBean deleteWeaklyPartContainerCapacityByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - containerService.deleteWeaklyPartContainerCapacityByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 卡斯马 基础数据-产品容器容量配置****end***********//* - - - */ -/*************MES 泰国 基础数据-电检打印数据****start***********//* - - @GetMapping(value = "/mes-electrotesting-print-data/enum-print") - @ApiOperation(value = "获取MES_电检打印数据打印状态枚举") - public ResultBean getPrintStatusEnumPrint() { - List resultList = electrotestingPrintDataService.getPrintStatusEnumPrint(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @GetMapping(value = "/mes-electrotesting-print-data/enum-location") - @ApiOperation(value = "获取MES_电检打印数据打印状态枚举") - public ResultBean getPrintStatusEnumLocation() { - List resultList = electrotestingPrintDataService.getPrintStatusEnumLocation(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList); - } - - @GetMapping(value = "/mes-electrotesting-print-data/query") - @ApiOperation(value = "查询MES_电检打印数据") - public ResultBean queryElectrotestingPrintData(MesElectrotestingPrintData model, Pager pager) { - model.setOrganizeCode(AuthUtil.getOrganizeCode()); - ListPager resultList = electrotestingPrintDataService.queryElectrotestingPrintDataByPager(model, pager); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(resultList); - } - - @PostMapping(value = "/mes-electrotesting-print-data/insert") - @ApiOperation(value = "新增MES_电检打印数据") - public ResultBean insertElectrotestingPrintData(MesElectrotestingPrintData model) { - try { - //属性验证 - ValidatorBean.beginValid(model) - .notNull("colourCode", model.getColourCode()) - .notNull("variant", model.getVariant()) - .notNull("productionNumber", model.getProductionNumber()) - .notNull("commissionNumber", model.getCommissionNumber()) - .notNull("qadNo", model.getQadNo()) - .notNull("partNo", model.getPartNo()); - - model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - electrotestingPrintDataService.insertElectrotestingPrintData(model, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-electrotesting-print-data/update") - @ApiOperation(value = "更新MES_电检打印数据") - public ResultBean updateElectrotestingPrintData(MesElectrotestingPrintData model) { - try { - if (model.getId() == null || model.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - //属性验证 - ValidatorBean.beginValid(model) - .notNull("colourCode", model.getColourCode()) - .notNull("variant", model.getVariant()) - .notNull("productionNumber", model.getProductionNumber()) - .notNull("commissionNumber", model.getCommissionNumber()) - .notNull("qadNo", model.getQadNo()) - .notNull("partNo", model.getPartNo()) - .notNull("printStatus", model.getPrintStatus()); - - electrotestingPrintDataService.updateElectrotestingPrintData(model, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-electrotesting-print-data/update-status-batch") - @ApiOperation(value = "电检打印数据批量启用或禁用", notes = "电检打印数据批量启用或禁用") - public ResultBean updateElectrotestingPrintDataStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - - electrotestingPrintDataService.updateElectrotestingPrintDataStatus(idsStr, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-electrotesting-print-data/batch-delete") - @ApiOperation(value = "批量删除电检打印数据", notes = "批量删除电检打印数据") - public ResultBean deleteWeaklyElectrotestingPrintDataByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - - electrotestingPrintDataService.deleteWeaklyElectrotestingPrintDataByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 泰国 基础数据-电检打印数据****end***********//* - - - */ -/*************MES 基础数据-枚举****start***********//* - - @PostMapping(value = "/mes-enum/insert") - @ApiOperation(value = "添加MES_枚举信息") - public ResultBean insertMesEnum(MesEnum mesEnum) { - try { - //属性验证 - ValidatorBean.beginValid(mesEnum) - .notNull("enumValue", mesEnum.getEnumValue()) - .notNull("enumCode", mesEnum.getEnumCode()) - .notNull("enumName", mesEnum.getEnumName()) - .notNull("enumValueDesc", mesEnum.getEnumValueDesc()); - - mesEnum.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesEnumService.insertMesEnum(mesEnum); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-enum/update") - @ApiOperation(value = "更新MES_枚举信息") - public ResultBean updateMesEnum(MesEnum mesEnum) { - try { - //属性验证 - ValidatorBean.beginValid(mesEnum) - .notNull("enumValue", mesEnum.getEnumValue()) - .notNull("enumCode", mesEnum.getEnumCode()) - .notNull("enumName", mesEnum.getEnumName()) - .notNull("enumValueDesc", mesEnum.getEnumValueDesc()); - - if (mesEnum.getId() == null || mesEnum.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesEnumService.updateMesEnum(mesEnum, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-enum/query") - @ApiOperation(value = "分页查询MES_枚举信息列表", notes = "分页查询MES_枚举信息列表") - public ResultBean queryMesEnumByPager(MesEnum mesEnum, Pager pager) { - try { - mesEnum.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesEnumService.queryMesEnumByPager(mesEnum, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-enum/update-status-batch") - @ApiOperation(value = "枚举信息批量启用或禁用", notes = "枚举信息批量启用或禁用") - public ResultBean updateMesEnumStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesEnumService.updateMesEnumStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-enum/batch-delete") - @ApiOperation(value = "批量删除枚举信息", notes = "批量删除枚举信息") - public ResultBean deleteWeaklyMesEnumByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesEnumService.deleteWeaklyMesEnumByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 基础数据-枚举****end***********//* - - - */ -/*************MES 基础数据-产品类型图片****start***********//* - - - @PostMapping(value = "/produce-ctgy-picture/insert") - @ApiOperation(value = "添加MES_产品类型图片") - public ResultBean insertProduceCtgyPicture(@RequestParam("file") MultipartFile file, MesProduceCtgyPicture mesProduceCtgyPicture) { - try { - - if (file.isEmpty()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("不允许上传空文件") - .build(); - } - - //通过发送DFS封装附件数据 - SysFile sysFile = imppFileService.upload(file, CommonEnumUtil.SOFT_TYPE.MES.getValue()); - ConvertBean.modelInitialize(sysFile, getSessionUser()); - - BaseResultBean result = coreSysFileCloud.insertFile(sysFile); - - if (result.isSuccess()) { - mesProduceCtgyPicture.setPictureUrl(result.getResultObject().getFilePath()); - } else { - LOGGER.error("无法调用core服务：{}", result.getErrorMsg()); - return ResultBean.fail("调用core服务出错：" + result.getErrorMsg()); - } - - //属性验证 - ValidatorBean.beginValid(mesProduceCtgyPicture) - .notNull("produceCtgyCode", mesProduceCtgyPicture.getProduceCtgyCode()) - .notNull("defectLocation", mesProduceCtgyPicture.getDefectLocation()); - - mesProduceCtgyPicture.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesProduceCtgyPictureService.insertMesProduceCtgyPicture(mesProduceCtgyPicture); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/produce-ctgy-picture/update") - @ApiOperation(value = "更新MES_产品类型图片") - public ResultBean updateProduceCtgyPicture(@RequestParam("file") MultipartFile file, MesProduceCtgyPicture mesProduceCtgyPicture) { - try { - - if (file.isEmpty()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("不允许上传空文件") - .build(); - } - - //通过发送DFS封装附件数据 - SysFile sysFile = imppFileService.upload(file, CommonEnumUtil.SOFT_TYPE.MES.getValue()); - ConvertBean.modelInitialize(sysFile, getSessionUser()); - - BaseResultBean result = coreSysFileCloud.insertFile(sysFile); - - if (result.isSuccess()) { - mesProduceCtgyPicture.setPictureUrl(result.getResultObject().getFilePath()); - } else { - LOGGER.error("无法调用core服务：{}", result.getErrorMsg()); - return ResultBean.fail("调用core服务出错：" + result.getErrorMsg()); - } - - //属性验证 - ValidatorBean.beginValid(mesProduceCtgyPicture) - .notNull("produceCtgyCode", mesProduceCtgyPicture.getProduceCtgyCode()) - .notNull("defectLocation", mesProduceCtgyPicture.getDefectLocation()); - - if (mesProduceCtgyPicture.getId() == null || mesProduceCtgyPicture.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesProduceCtgyPictureService.updateMesProduceCtgyPicture(mesProduceCtgyPicture, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/produce-ctgy-picture/query") - @ApiOperation(value = "按条件分页查询MES_产品类型图片信息", notes = "按条件分页查询MES_产品类型图片信息") - public ResultBean queryProduceCtgyPictureByPager(MesProduceCtgyPicture mesProduceCtgyPicture, Pager pager) { - try { - mesProduceCtgyPicture.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesProduceCtgyPictureService.queryMesProduceCtgyPictureByPager(mesProduceCtgyPicture, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/produce-ctgy-picture/update-status-batch") - @ApiOperation(value = "更新产品类型图片状态（启用禁用）", notes = "更新产品类型图片状态（启用禁用）") - public ResultBean updateProduceCtgyPictureStatusById(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesProduceCtgyPictureService.updateMesProduceCtgyPictureStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/produce-ctgy-picture/batch-delete") - @ApiOperation(value = "软删mesProduceCtgyPicture信息", notes = "软删mesProduceCtgyPicture信息") - public ResultBean deleteWeaklyProduceCtgyPictureByIds(String[] idsStr) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesProduceCtgyPictureService.deleteWeaklyMesProduceCtgyPictureByIds((Long[]) ConvertUtils.convert(idsStr, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 基础数据-产品类型图片****end***********//* - - - @PostMapping(value = "/mes-part-car-model/insert") - @ApiOperation(value = "添加MES_车型零件关系信息") - public ResultBean insertMesPartCarModel(MesPartCarModel mesPartCarModel) { - try { - mesPartCarModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesPartCarModelService.insertMesPartCarModel(mesPartCarModel); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-car-model/update") - @ApiOperation(value = "更新MES_车型零件关系信息") - public ResultBean updateMesPartCarModel(MesPartCarModel mesPartCarModel) { - try { - if (mesPartCarModel.getId() == null || mesPartCarModel.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesPartCarModelService.updateMesPartCarModel(mesPartCarModel, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part-car-model/query") - @ApiOperation(value = "按条件分页查询MES_车型零件关系信息", notes = "按条件分页查询MES_车型零件关系信息") - public ResultBean queryMesPartCarModelByPager(MesPartCarModel mesPartCarModel, Pager pager) { - try { - mesPartCarModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesPartCarModelService.queryMesPartCarModelByPager(mesPartCarModel, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-car-model/update-status-batch") - @ApiOperation(value = "车型零件关系信息批量启用或禁用", notes = "车型零件关系信息批量启用或禁用") - public ResultBean updateMesPartCarModelStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesPartCarModelService.updateMesPartCarModelStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-part-specific/insert") - @ApiOperation(value = "添加MES_特殊物料关系信息") - public ResultBean insertMesPartSpecific(MesPartSpecific mesPartSpecific) { - try { - mesPartSpecific.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesPartSpecificService.insertMesPartSpecific(mesPartSpecific); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-specific/update") - @ApiOperation(value = "更新MES_特殊物料关系信息") - public ResultBean updateMesPartSpecific(MesPartSpecific mesPartSpecific) { - try { - if (mesPartSpecific.getId() == null || mesPartSpecific.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesPartSpecificService.updateMesPartSpecific(mesPartSpecific, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-part-specific/query") - @ApiOperation(value = "按条件分页查询MES_特殊物料关系信息", notes = "按条件分页查询MES_特殊物料关系信息") - public ResultBean queryMesPartSpecificByPager(MesPartSpecific mesPartSpecific, Pager pager) { - try { - mesPartSpecific.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesPartSpecificService.queryMesPartSpecificByPager(mesPartSpecific, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-part-specific/update-status-batch") - @ApiOperation(value = "特殊物料关系信息批量启用或禁用", notes = "特殊物料关系信息批量启用或禁用") - public ResultBean updateMesPartSpecificStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesPartSpecificService.updateMesPartSpecificStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - - */ -/*************MES节假日****start***********//* - - - @GetMapping(value = "/holiday-vacation/query") - @ApiOperation(value = "按条件分页查询MES节假日数据") - public ResultBean queryHolidayVacationByPager(MesHolidayVacation holidayVacation, Pager pager) { - try { - holidayVacation.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = holidayVacationService.queryHolidayVacationByPager(holidayVacation, 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); - } - } - - @PostMapping(value = "/holiday-vacation/insert") - @ApiOperation(value = "新增mes节假日信息") - public ResultBean insertHolidayVacation(MesHolidayVacation holidayVacation) { - try { - //条件验证 - ValidatorBean.beginValid(holidayVacation) - .notNull("year", holidayVacation.getYear()) - .notNull("month", holidayVacation.getMonth()) - .notNull("day", holidayVacation.getDay()); - holidayVacation.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - - holidayVacationService.insertHolidayVacation(holidayVacation, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/holiday-vacations/insert") - @ApiOperation(value = "批量新增mes节假日信息") - public ResultBean insertHolidayVacations(@RequestBody List dataList) { - try { - holidayVacationService.insertHolidayVacations(AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), dataList); - - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/holiday-vacation/update") - @ApiOperation(value = "更新mes节假日信息") - public ResultBean updateHolidayVacation(MesHolidayVacation holidayVacation) { - try { - //条件验证 - ValidatorBean.beginValid(holidayVacation) - .notNull("year", holidayVacation.getYear()) - .notNull("month", holidayVacation.getMonth()) - .notNull("day", holidayVacation.getDay()); - - holidayVacationService.updateHolidayVacation(holidayVacation, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/holiday-vacation/status-update") - @ApiOperation(value = "根据id启用或禁用节假日信息") - public ResultBean updateHolidayVacationStatusById(Long id, int status) { - try { - if (null == id) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - holidayVacationService.updateHolidayVacationStatusById(id, status, AuthUtil.getSessionUser().getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - */ -/*************MES 节假日****start***********//* - - - @PostMapping(value = "/mes-db-data-check/insert") - @ApiOperation(value = "添加MES_DB数据检查配置信息") - public ResultBean insertMesDbDataCheck(MesDbDataCheck mesDbDataCheck) { - try { - mesDbDataCheck.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesDbDataCheckService.insertMesDbDataCheck(mesDbDataCheck); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-db-data-check/update") - @ApiOperation(value = "更新MES_DB数据检查配置信息") - public ResultBean updateMesDbDataCheck(MesDbDataCheck mesDbDataCheck) { - try { - if (mesDbDataCheck.getId() == null || mesDbDataCheck.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesDbDataCheckService.updateMesDbDataCheck(mesDbDataCheck, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-db-data-check/query") - @ApiOperation(value = "按条件分页查询MES_DB数据检查配置信息", notes = "按条件分页查询MES_DB数据检查配置信息") - public ResultBean queryMesDbDataCheckByPager(MesDbDataCheck mesDbDataCheck, Pager pager) { - try { - mesDbDataCheck.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesDbDataCheckService.queryMesDbDataCheckByPager(mesDbDataCheck, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-db-data-check/update-status-batch") - @ApiOperation(value = "DB数据检查配置信息批量启用或禁用", notes = "DB数据检查配置信息批量启用或禁用") - public ResultBean updateMesDbDataCheckStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesDbDataCheckService.updateMesDbDataCheckStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-pending-report-type/insert") - @ApiOperation(value = "添加MES_待处理报工类型信息") - public ResultBean insertMesPendingReportType(MesPendingReportType mesPendingReportType) { - try { - mesPendingReportType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesPendingReportTypeService.insertMesPendingReportType(mesPendingReportType); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-pending-report-type/update") - @ApiOperation(value = "更新MES_待处理报工类型信息") - public ResultBean updateMesPendingReportType(MesPendingReportType mesPendingReportType) { - try { - if (mesPendingReportType.getId() == null || mesPendingReportType.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesPendingReportTypeService.updateMesPendingReportType(mesPendingReportType, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-pending-report-type/query") - @ApiOperation(value = "按条件分页查询MES_待处理报工类型信息", notes = "按条件分页查询MES_待处理报工类型信息") - public ResultBean queryMesPendingReportTypeByPager(MesPendingReportType mesPendingReportType, Pager pager) { - try { - mesPendingReportType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesPendingReportTypeService.queryMesPendingReportTypeByPager(mesPendingReportType, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-pending-report-type/update-status-batch") - @ApiOperation(value = "待处理报工类型信息批量启用或禁用", notes = "待处理报工类型信息批量启用或禁用") - public ResultBean updateMesPendingReportTypeStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesPendingReportTypeService.updateMesPendingReportTypeStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-pending-report-type/find") - @ApiOperation(value = "按条件查询MES_待处理报工类型信息", notes = "按条件查询MES_待处理报工类型信息") - public ResultBean findMesPendingReportType(MesPendingReportType mesPendingReportType) { - try { - mesPendingReportType.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setResultList(mesPendingReportTypeService.findMesPendingReportType(mesPendingReportType)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping(value = "/mes-failure-mode-parts/insert") - @ApiOperation(value = "添加MES_失效模式零件信息") - public ResultBean insertMesFailureModeParts(MesFailureModeParts mesFailureModeParts) { - try { - mesFailureModeParts.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - mesFailureModePartsService.insertMesFailureModeParts(mesFailureModeParts); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-failure-mode-parts/update") - @ApiOperation(value = "更新MES_失效模式零件信息") - public ResultBean updateMesFailureModeParts(MesFailureModeParts mesFailureModeParts) { - try { - if (mesFailureModeParts.getId() == null || mesFailureModeParts.getId().longValue() < 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("请选择需要操作的资源。") - .build(); - } - - mesFailureModePartsService.updateMesFailureModeParts(mesFailureModeParts, AuthUtil.getSessionUser().getUserName()); - - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-failure-mode-parts/query") - @ApiOperation(value = "按条件分页查询MES_失效模式零件信息", notes = "按条件分页查询MES_失效模式零件信息") - public ResultBean queryMesFailureModePartsByPager(MesFailureModeParts mesFailureModeParts, Pager pager) { - try { - mesFailureModeParts.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setListPager(mesFailureModePartsService.queryMesFailureModePartsByPager(mesFailureModeParts, pager)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-failure-mode-parts/update-status-batch") - @ApiOperation(value = "失效模式零件信息批量启用或禁用", notes = "失效模式零件信息批量启用或禁用") - public ResultBean updateMesFailureModePartsStatus(String[] idsStr, int status) { - try { - ConvertBean.modelSafeArrayNumber(idsStr, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesFailureModePartsService.updateMesFailureModePartsStatus(idsStr, status, user.getUserName()); - return ResultBean.success("修改成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/users-by-org-group-by-dep/find") - @ApiOperation(value = "根据orgCode查询系统用户", notes = "根据orgCode查询系统用户") - public ResultBean findUsersByOrgGroupByDep() { - try { - BaseResultBean baseResultBean = personnelCloud.queryUsersByOrgGroupByDep(AuthUtil.getOrganize().getOrganizeCode()); - if (null == baseResultBean || (null != baseResultBean && CollectionUtils.isEmpty(baseResultBean.getResultList()))) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.LOGIN_EXCEPTION_USER_INFO_NULL.getCode()) - .setErrorDetail("系统中没有查询到core当中的用户信息") - .build(); - } - - List sysUserList = JSONArray.parseArray( - JSONArray.toJSONString(baseResultBean.getResultList()), SysUser.class); - Map> sysUserMap = sysUserList.stream().collect(Collectors.groupingBy(SysUser::getDepartmentNameRdd)); - return ResultBean.success().setResultMap(sysUserMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PostMapping("/mes-failure-mode-approval/insert") - @ApiOperation(value = "添加MES_失效模式审批人员信息集合") - public ResultBean insertMesFailureModeApprovalList(@RequestBody List mesFailureModeApprovalList) { - try { - if(CollectionUtils.isEmpty(mesFailureModeApprovalList)){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("请先勾选人员再添加审批人员信息") - .build(); - } - mesFailureModeApprovalService.insertMesFailureModeApprovalList(mesFailureModeApprovalList); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException imppException) { - LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); - return ResultBean.fail(imppException); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/mes-failure-mode-approval/query") - @ApiOperation(value = "按条件查询MES_失效模式审批人员信息", notes = "按条件查询MES_失效模式审批人员信息") - public ResultBean queryMesFailureModePartsByPager(MesFailureModeApproval mesFailureModeApproval) { - try { - mesFailureModeApproval.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success().setResultList(mesFailureModeApprovalService.findMesFailureModeApproval(mesFailureModeApproval)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/mes-failure-mode-approval/batch-delete") - @ApiOperation(value = "批量删除失效模式审批人员信息", notes = "批量删除失效模式审批人员信息") - public ResultBean deleteWeaklyMesFailureModeApprovalByIds(String[] ids) { - try { - ConvertBean.modelSafeArrayNumber(ids, true); - //登陆用户 - SessionUser user = AuthUtil.getSessionUser(); - - mesFailureModeApprovalService.deleteWeaklyMesFailureModeApprovalByIds((Long[]) ConvertUtils.convert(ids, Long.class), user.getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/department/query") - @ApiOperation(value = "获取部门信息") - public ResultBean getDepartmentIdMap() { - try { - return ResultBean.success("查询成功").setResultMap(baseDataService.getDepartmentIdMap()) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @GetMapping(value = "/user-by-department/query") - @ApiOperation(value = "根据部门id获取用户信息") - public ResultBean getSysUserListByDepartmentId(Long departmentId, String userEmpNo, String userName) { - try { - return ResultBean.success("查询成功").setResultList(baseDataService.getSysUserListByDepartmentId(departmentId, userEmpNo, userName)) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } -*/ }