diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/ISxOrganizeExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/ISxOrganizeExtService.java new file mode 100644 index 0000000..b59b804 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/ISxOrganizeExtService.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.ext.mes.pcn.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @author yumingxing + * @version 1.0 + * @date 2021/1/29 13:24 + **/ +public interface ISxOrganizeExtService { + + /** + * 根据生产线代码查询工位集合 + * @param organizeCode 组织代码 + * @param workCenterCode 生产线代码 + * @return 工位集合 + */ + @ApiOperation(value = "根据生产线代码查询工位集合", notes = "根据生产线代码查询工位集合") + List findWorkCell(String organizeCode, String workCenterCode); + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/pom.xml b/modules/i3plus-ext-mes-pcn-apiservice/pom.xml index 499e7bb..e9ad082 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/pom.xml +++ b/modules/i3plus-ext-mes-pcn-apiservice/pom.xml @@ -26,28 +26,18 @@ - i3plus.mes.pcn - i3plus-mes-pcn-apiservice - - - - i3plus.mes.pcn - i3plus-mes-pcn-api - - - i3plus.ext.mes.pcn i3plus-ext-mes-pcn-pojo - i3plus.icloud - i3plus-icloud-core + i3plus.mes.pcn + i3plus-mes-pcn-apiservice - i3plus.icloud - i3plus-icloud-andon + i3plus.mes.pcn + i3plus-mes-pcn-api @@ -69,10 +59,7 @@ i3plus.platform i3plus-platform-plugin - - i3plus.ext.mes.pcn - i3plus-ext-mes-pcn-icloud - + diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/SxOrganizeExtController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/SxOrganizeExtController.java new file mode 100644 index 0000000..6b3c217 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/SxOrganizeExtController.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.ISxOrganizeExtService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.impp.framework.base.controller.MesPcnBaseController; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2021/01/19 15:37 + * @Description: + **/ +@RestController +@RequestMapping(CommonConstWords.BASE_URL_MES_PCN + "/ext") +@Api(tags = "SX_组织") +public class SxOrganizeExtController extends MesPcnBaseController { + + @Autowired + private ISxOrganizeExtService organizeService; + + @GetMapping({"/query-work-cell-by-center"}) + @ApiOperation( + value = "查询工作单元", + notes = "查询工作单元" + ) + public ResultBean queryWorkCell(String workCenterCode) { + try { + List areaList = this.organizeService.findWorkCell(AuthUtil.getOrganize().getOrganizeCode(), workCenterCode); + return ResultBean.success("操作成功").setResultList(areaList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException var3) { + return ResultBean.fail(var3); + } catch (Exception var4) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(var4); + } + } + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestBusiController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestBusiController.java deleted file mode 100644 index 75572c2..0000000 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestBusiController.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; - -public class TestBusiController { -} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxOrganizeExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxOrganizeExtService.java new file mode 100644 index 0000000..98e31ae --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxOrganizeExtService.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.ISxOrganizeExtService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/13 9:28 + **/ +@Slf4j +@Service +public class SxOrganizeExtService implements ISxOrganizeExtService { + + @Autowired + private MesWorkCellRepository workCellRepository; + + @Override + public List findWorkCell(String organizeCode, String workCenterCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean); + DdlPreparedPack.getNumNOEqualPack(MesPcnEnumUtil.MES_WORK_CELL_TYPE.REWORK.getValue(), "workCellType", packBean); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, packBean); + return this.workCellRepository.findByHqlWhere(packBean); + } + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java index 13fe614..9267db7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java @@ -71,7 +71,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrder.getOrganizeCode()); DdlPreparedPack.getStringLikerPack(workOrder.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(workOrder.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringLikerPack(workOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(workOrder.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getInPackList(workOrder.getStatusList(), "status", packBean); return packBean; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/YfManyCellMonitorModuleService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/YfManyCellMonitorModuleService.java new file mode 100644 index 0000000..7b96a9c --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/YfManyCellMonitorModuleService.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station; + +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseModuleService; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; +import cn.estsh.i3plus.pojo.mes.model.StationResultBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 展示组件：多工位监控加工 + * @Reference : + * @Author :wangjie + * @CreateDate : 2020-06-26 11:18 上午 + * @Modify: + **/ +@Slf4j +@Service("yfManyCellMonitorModuleService") +public class YfManyCellMonitorModuleService extends BaseModuleService { + + private static final String YF_MANY_CELL_MONITOR_MODULE = "YF_MANY_CELL_MONITOR_MODULE"; + private static final String CELL_LOCATION = "CELL_LOCATION"; + + @Override + public void init(StationRequestBean reqBean) { + StationResultBean resultBean = new StationResultBean(); + resultBean.setBusiType(MesPcnEnumUtil.STATION_BUSI_TYPE.MODULE_CONTENT.getValue()); + resultBean.setDataType(MesPcnEnumUtil.STATION_DATA_TYPE.CUSTOM.getValue()); + resultBean.setCustomPageName(YF_MANY_CELL_MONITOR_MODULE); + resultBean.setSpecialDisplayData(getStepColIndent(reqBean)); + this.sendMessage(reqBean, resultBean); + } + + + + @Override + public boolean execStateModule(StationRequestBean reqBean, List states, Map wcpcMap) { + init(reqBean); + return true; + } + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkResultReadStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkResultReadStepService.java new file mode 100644 index 0000000..6109ba1 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkResultReadStepService.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; + +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; +import cn.estsh.i3plus.pojo.mes.model.StationResultBean; +import cn.estsh.i3plus.pojo.mes.model.StepResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** + * @Description : 读取加工结果工步 + * @Author : wangjie + **/ +@Slf4j +@Service("mesWorkResultReadStepService") +public class MesWorkResultReadStepService extends BaseStepService { + + @Override + public StepResult init(StationRequestBean reqBean) { + + + + StationResultBean resultBean = new StationResultBean(); + + if (StringUtils.isEmpty(reqBean.getScanInfo())) execSendGuideAndThrowEx(reqBean, resultBean, "请扫描产品条码!"); + + + StepResult stepResult = StepResult.getSuccessComplete(); + + + return stepResult; + } + + @Override + public StepResult execute(StationRequestBean reqBean) { + + StationResultBean resultBean = new StationResultBean(); + + if (StringUtils.isEmpty(reqBean.getScanInfo())) execSendGuideAndThrowEx(reqBean, resultBean, "请扫描产品条码!"); + + + StepResult stepResult = StepResult.getSuccessComplete(); + + + return stepResult; + } + +} diff --git a/modules/i3plus-ext-mes-pcn-pojo/pom.xml b/modules/i3plus-ext-mes-pcn-pojo/pom.xml index fbc68ea..1ffc286 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/pom.xml +++ b/modules/i3plus-ext-mes-pcn-pojo/pom.xml @@ -23,11 +23,6 @@ i3plus-pojo-mes - - i3plus.pojo - i3plus-pojo-andon - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 03699d9..421466c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,12 +30,10 @@ true UTF-8 - 1.0.0.3 + 1.0.0.4-patch 1.0.0-yfai 1.0.0.1-patch - 1.0.0.1-patch 1.0.0-yfai - 1.0.0-yfai 2.17.1 @@ -56,14 +54,6 @@ - i3plus.icloud - i3plus-icloud - ${i3plus.icloud.version} - pom - import - - - i3plus.pojo i3plus-pojo ${i3plus.pojo.version} @@ -118,6 +108,27 @@ + i3plus.pojo + i3plus-pojo-mes + ${i3plus.pojo.version} + + + i3plus.pojo + i3plus-pojo-base + ${i3plus.pojo.version} + + + i3plus.platform + i3plus-platform-common + ${i3plus.platform.version} + + + i3plus.platform + i3plus-platform-plugin + ${i3plus.platform.version} + + + impp.framework impp-framework-boot ${impp.framework.version}