|
|
|
@ -1,5 +1,7 @@
|
|
|
|
|
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
|
|
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService;
|
|
|
|
|
import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService;
|
|
|
|
|
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
|
|
|
|
import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService;
|
|
|
|
|
import cn.estsh.i3plus.mes.api.iservice.busi.IEquipmentService;
|
|
|
|
@ -54,6 +56,12 @@ public class ExtProdOrgController extends MesBaseController {
|
|
|
|
|
@Autowired
|
|
|
|
|
private IEquipmentService mesEquipmentService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IMesWorkCenterService mesWorkCenterService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IMesWorkCellService mesWorkCellService;
|
|
|
|
|
|
|
|
|
|
@GetMapping(value = "/mes-data-tree/query")
|
|
|
|
|
@ApiOperation(value = "查询MES组织模型数据返回树结构")
|
|
|
|
|
public ResultBean queryMesDataTree() {
|
|
|
|
@ -227,7 +235,7 @@ public class ExtProdOrgController extends MesBaseController {
|
|
|
|
|
.notNull(MesCommConstWords.WORK_CENTER_NAME, workCenter.getWorkCenterName())
|
|
|
|
|
.notNull(MesCommConstWords.AREA_CODE, workCenter.getAreaCode());
|
|
|
|
|
|
|
|
|
|
prodOrgService.updateMesWorkCenter(workCenter, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode());
|
|
|
|
|
mesWorkCenterService.update(workCenter);
|
|
|
|
|
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
} catch (ImppBusiException busExcep) {
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
@ -319,7 +327,7 @@ public class ExtProdOrgController extends MesBaseController {
|
|
|
|
|
.notNull("workCellType", workCell.getWorkCellType())
|
|
|
|
|
.notNull(MesCommConstWords.AREA_CODE, workCell.getAreaCode());
|
|
|
|
|
|
|
|
|
|
prodOrgService.updateMesWorkCell(workCell, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode());
|
|
|
|
|
mesWorkCellService.update(workCell);
|
|
|
|
|
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
} catch (ImppBusiException busExcep) {
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
|