diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 2bf7f1b..d00f1dd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderService; import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud; +import cn.estsh.i3plus.mes.api.iservice.base.IStateMachineRouteDesignService; import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.mes.apiservice.util.DateUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -16,6 +17,8 @@ import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.WmsConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +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.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -68,6 +71,8 @@ public class MesSpotCheckOrderService extends BaseMesService private ICoreUtilCloud sysOrderNoRuleCloud; @Autowired + private IStateMachineRouteDesignService stateMachineRouteDesignService; + @Autowired private IMesConfigService mesConfigService; @Override public MesSpotCheckOrder insert(MesSpotCheckOrder bean) { @@ -563,8 +568,26 @@ public class MesSpotCheckOrderService extends BaseMesService DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesSpotCheckOrder.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(mesSpotCheckOrder.getId(), "pid", packBean); List detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean); + for (MesSpotCheckOrderResult mesSpotCheckOrderResult : detailList) { + if (mesSpotCheckOrderResult.getIsTolerance()==1){ + mesSpotCheckOrderResult.setIsTolerance(Integer.parseInt(mesSpotCheckOrderResult.getSpotCheckSetValue())-Integer.parseInt(mesSpotCheckOrderResult.getSpotCheckRealValue()) ); + }else { + mesSpotCheckOrderResult.setIsTolerance(0); + } + } mesSpotCheckOrder.setCheckOrderResults(detailList); - + MesRouteProcessCell routeProcessCell=new MesRouteProcessCell(); + routeProcessCell.setOrganizeCode(mesSpotCheckOrder.getOrganizeCode()); + routeProcessCell.setWorkCenterCode(mesSpotCheckOrder.getWorkCenterCode()); + routeProcessCell.setWorkCellCode(mesSpotCheckOrder.getWorkCellCode()); + Pager pager = new Pager(); + pager.setCurrentPage(0); + pager.setPageSize(50); + ListPager listPager = stateMachineRouteDesignService.queryStateMachineRouteProcessCellByPager(routeProcessCell, pager); + List routeProcessCellList = listPager.getObjectList(); + if (!CollectionUtils.isEmpty(routeProcessCellList)){ + mesSpotCheckOrder.setProcessName(routeProcessCellList.get(0).getProcessCodeName()); + } mesSpotCheckOrder.setTemplateNo(mesConfigService.getCfgValue(mesSpotCheckOrder.getOrganizeCode(), MesCommonConstant.QC_ORDER_PRINT_TEMPLATE) ); return mesSpotCheckOrder; }