diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderToSapService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderToSapService.java index 9b9860a..fcf463e 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderToSapService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderToSapService.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderToSap; import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderModel; diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IProdExtOrgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IProdExtOrgService.java index bb6324f..b3dea35 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IProdExtOrgService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IProdExtOrgService.java @@ -258,46 +258,4 @@ public interface IProdExtOrgService { /*************MES工位参数配置服务*****end***********/ - /*************MES工位队列服务*****start***********/ - - /** - * 按条件分页查询工位队列信息 - * - * @param workCellPoint 工位队列信息查询条件 - * @param pager 分页条件 - * @return 分页数据 - */ - @ApiOperation(value = "按条件分页查询工位队列信息") - ListPager queryMesWorkCellPointByPager(MesWorkCellPoint workCellPoint, Pager pager); - - /** - * 新增工位参数配置信息 - * - * @param workCellPoint 工位队列信息 - * @return 新增后的工位队列信息 - */ - @ApiOperation(value = "新增工位队列信息", notes = "新增工位队列信息") - MesWorkCellPoint insertMesWorkCellPoint(MesWorkCellPoint workCellPoint); - - /** - * 更新工位队列信息 - * - * @param workCellPoint 工位队列信息 - * @return 更新后的工位队列信息 - */ - @ApiOperation(value = "更新工位队列信息", notes = "更新工位队列信息") - MesWorkCellPoint updateMesWorkCellPoint(MesWorkCellPoint workCellPoint); - - /** - * 更新工位队列状态(启用、禁用) - * - * @param id 工位队列信息id - * @param status 更新状态 - * @param userName 操作人 - * @return 操作行数 - */ - @ApiOperation(value = "更新工位队列状态(启用、禁用)") - int updateMesWorkCellPointStatusById(Long id, int status, String userName); - - /*************MES工位队列服务*****end***********/ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 4a45735..c4279cb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -5,42 +5,31 @@ import cn.estsh.i3plus.ext.mes.apiservice.config.HuaWeiCloudObsConfig; import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.base.util.StringUtil; -import cn.estsh.i3plus.pojo.mes.bean.MesFile; import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace; import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysFile; -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.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.aliyun.oss.model.PutObjectRequest; import com.obs.services.ObsClient; import com.obs.services.exception.ObsException; import com.obs.services.model.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang.StringUtils; -import org.jolokia.util.IoUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.commons.CommonsMultipartFile; -import org.testng.annotations.Optional; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.OutputStream; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java index 608f666..7179345 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi; import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService; import cn.estsh.i3plus.ext.mes.apiservice.dao.IEquipmentExtDao; import cn.estsh.i3plus.mes.api.iservice.base.IEnumService; -import cn.estsh.i3plus.mes.apiservice.dao.IEquipmentDao; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -16,22 +15,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; -import cn.estsh.i3plus.pojo.mes.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParam; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParamCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPoint; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.model.MesEquipmentModel; import cn.estsh.i3plus.pojo.mes.model.ProdOrgModel; import cn.estsh.i3plus.pojo.mes.model.SysOrganizeModel; -import cn.estsh.i3plus.pojo.mes.repository.MesAreaRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellParamCfgRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellParamRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellPointRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository; +import cn.estsh.i3plus.pojo.mes.repository.*; import cn.estsh.i3plus.pojo.mes.sqlpack.MesHqlPack; import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -73,8 +61,6 @@ public class ProdExtOrgService implements IProdExtOrgService { @Autowired private MesWorkCellParamRepository workCellParamRepository; @Autowired - private MesWorkCellPointRepository workCellPointRepository; - @Autowired private IEnumService enumService; @Override @@ -612,64 +598,4 @@ public class ProdExtOrgService implements IProdExtOrgService { new Object[]{status, userName, TimeTool.getNowTime(true)}); } - @Override - public ListPager queryMesWorkCellPointByPager(MesWorkCellPoint workCellPoint, Pager pager) { - - if (workCellPoint == null) { - pager = PagerHelper.getPager(pager, workCellPointRepository.listCount()); - return new ListPager(workCellPointRepository.listPager(pager), pager); - } else { - DdlPackBean hqlPack = MesHqlPack.getMesWorkCellPoint(workCellPoint, AuthUtil.getOrganize().getOrganizeCode()); - pager = PagerHelper.getPager(pager, workCellPointRepository.findByHqlWhereCount(hqlPack)); - hqlPack.setOrderByStr(workCellPoint.orderBy()); - return new ListPager(workCellPointRepository.findByHqlWherePage(hqlPack, pager), pager); - } - } - - @Override - public MesWorkCellPoint insertMesWorkCellPoint(MesWorkCellPoint workCellPoint) { - - //唯一性校验 - MesWorkCellPoint workCellPointDb = workCellPointRepository.getByProperty(new String[]{MesConstWords.ORGANIZE_CODE, "workCenterCode", "workCellCode", MesConstWords.IS_DELETED}, - new Object[]{workCellPoint.getOrganizeCode(), workCellPoint.getWorkCenterCode(), workCellPoint.getWorkCellCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()}); - - if (null != workCellPointDb) { - - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("产线代码为【%s】，工位代码为【%s】的记录已存在", workCellPoint.getWorkCenterCode(), workCellPoint.getWorkCellCode()) - .build(); - } - - return workCellPointRepository.insert(workCellPoint); - } - - @Override - public MesWorkCellPoint updateMesWorkCellPoint(MesWorkCellPoint workCellPoint) { - - //对id做有效性校验 - MesWorkCellPoint workCellPointDb = workCellPointRepository.getById(workCellPoint.getId()); - if (workCellPointDb == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("产线代码为【%s】，工位代码为【%s】的记录不存在", workCellPoint.getWorkCenterCode(), workCellPoint.getWorkCellCode()) - .build(); - } - - workCellPointDb.setQueueSeq(workCellPoint.getQueueSeq()); - workCellPointDb.setQueueDetailSeq(workCellPoint.getQueueDetailSeq()); - ConvertBean.serviceModelUpdate(workCellPointDb, AuthUtil.getSessionUser().getUserName()); - - return workCellPointRepository.save(workCellPointDb); - } - - @Override - public int updateMesWorkCellPointStatusById(Long id, int status, String userName) { - - return workCellPointRepository.updateByProperties(new String[]{"id"}, new Object[]{id}, - new String[]{MesConstWords.IS_VALID, "modifyUser", "modifyDatetime"}, - new Object[]{status, userName, TimeTool.getNowTime(true)}); - } }