jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

工位按钮

Browse Source
master
王杰 6 months ago
parent 7dd491c468
commit 84a8175ed7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ButtonDynamicExtService.java
Unescape Escape View File

@ -51,8 +51,7 @@ public class ButtonDynamicExtService extends ButtonDynamicService {
if (CollectionUtils.isEmpty(buttonDynamicModelList)) { if (CollectionUtils.isEmpty(buttonDynamicModelList)) {
MesWorkCell workCell = prodOrgExtService.getWorkCellDb(organizeCode, workCenterCode, workCellCode); MesWorkCell workCell = prodOrgExtService.getWorkCellDb(organizeCode, workCenterCode, workCellCode);
if (null != workCell && !StringUtils.isEmpty(workCell.getGrade()) && workCell.getGrade().compareTo(MesExtEnumUtil.WORK_CELL_GRADE.SCAN.getValue()) == 0) { if (null != workCell && !StringUtils.isEmpty(workCell.getGrade()) && workCell.getGrade().compareTo(MesExtEnumUtil.WORK_CELL_GRADE.SCAN.getValue()) == 0) {
buttonDynamicModelList = findWorkModuleList(organizeCode, windowNo); if (doAutoInitWorkCellModuleData(organizeCode, workCenterCode, workCellCode, workCell.getId())) buttonDynamicModelList = findWorkModuleList(organizeCode, windowNo);
if (!CollectionUtils.isEmpty(buttonDynamicModelList)) doAutoInitWorkCellModuleData(organizeCode, workCell.getId());
} }
} }
return super.filterButtonDynamicModelList(organizeCode, workCenterCode, workCellCode, windowNo, buttonDynamicModelList); return super.filterButtonDynamicModelList(organizeCode, workCenterCode, workCellCode, windowNo, buttonDynamicModelList);
@ -72,15 +71,18 @@ public class ButtonDynamicExtService extends ButtonDynamicService {
new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), MesEnumUtil.WORK_MODULE_TYPE.BUTTON_MODULE.getValue()}); new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), MesEnumUtil.WORK_MODULE_TYPE.BUTTON_MODULE.getValue()});
} }
private void doAutoInitWorkCellModuleData(String organizeCode, Long id) { private Boolean doAutoInitWorkCellModuleData(String organizeCode, String workCenterCode, String workCellCode, Long id) {
MesConfig configGateWay = configService.getMesConfigByCfgCode(MesPcnEnumUtil.CONFIG_TYPE.GATEWAY_IP.getCode(), organizeCode); MesConfig configGateWay = configService.getMesConfigByCfgCode(MesPcnEnumUtil.CONFIG_TYPE.GATEWAY_IP.getCode(), organizeCode);
MesConfig apiCfg = configService.getMesConfigByCfgCode(MesPcnExtConstWords.AUTO_INIT_WORK_CELL_MODULE_URL, organizeCode); MesConfig apiCfg = configService.getMesConfigByCfgCode(MesPcnExtConstWords.AUTO_INIT_WORK_CELL_MODULE_URL, organizeCode);
if (null == configGateWay || StringUtils.isEmpty(configGateWay.getCfgValue())) return; if (null == configGateWay || StringUtils.isEmpty(configGateWay.getCfgValue())) return false;
if (null == apiCfg || StringUtils.isEmpty(apiCfg.getCfgValue())) return; if (null == apiCfg || StringUtils.isEmpty(apiCfg.getCfgValue())) return false;
log.info("工厂{}生产线{}工位{}: --- 初始化工位按钮 --- START --- 执行结果:{}", organizeCode, workCenterCode, workCellCode);
Map<String, String> paramsMap = new HashMap<>(); Map<String, String> paramsMap = new HashMap<>();
paramsMap.put(MesPcnExtConstWords.ORGANIZE_CODE, organizeCode); paramsMap.put(MesPcnExtConstWords.ORGANIZE_CODE, organizeCode);
paramsMap.put(MesPcnExtConstWords.ID, id.toString()); paramsMap.put(MesPcnExtConstWords.ID, id.toString());
PcnHttpUtil.doPost(configGateWay.getCfgValue() + apiCfg.getCfgValue(), paramsMap); String data = PcnHttpUtil.doPost(configGateWay.getCfgValue() + apiCfg.getCfgValue(), paramsMap);
log.info("工厂{}生产线{}工位{}: --- 初始化工位按钮 --- END --- 执行结果:{}", organizeCode, workCenterCode, workCellCode, data);
return true;
} }
} }

Write Preview
Loading…
Cancel
Save