diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesQueueOrderPushService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesQueueOrderPushService.java index 5acee72..2511971 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesQueueOrderPushService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesQueueOrderPushService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPush; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -30,8 +31,8 @@ public interface IMesQueueOrderPushService { void insertQueueOrderPush(String organizeCode, String userInfo, List queueOrderPushCellCfgList, MesProductionPsOutContext productionPsOutContext, MesProductionPartContext productionPartContext); -// @ApiOperation(value = "写入工位工单推送信息") -// void insertQueueOrderPush(String organizeCode, String userInfo, MesWorkOrder workOrder, String... pushSourceCodeArr); + @ApiOperation(value = "写入工位工单推送信息") + void insertQueueOrderPush(StationRequestBean reqBean, MesWorkOrder workOrder, Map paramMap); @ApiOperation(value = "根据配置查询创建状态的生产队列工位推送信息") List getQueueOrderPushList(String organizeCode, List queueOrderPushCellCfgList); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesQueueOrderPushService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesQueueOrderPushService.java index dc42c25..45dbdc0 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesQueueOrderPushService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesQueueOrderPushService.java @@ -15,6 +15,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPush; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.repository.MesQueueOrderPushCellCfgRepository; import cn.estsh.i3plus.pojo.mes.repository.MesQueueOrderPushRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; @@ -74,18 +75,18 @@ public class MesQueueOrderPushService implements IMesQueueOrderPushService { if (null == queueOrderPushCellCfg) continue; MesQueueOrderPush queueOrderPush = new MesQueueOrderPush(); queueOrderPush.setPushSourceCode(queueOrderPushCellCfg.getPushSourceCode()); + queueOrderPush.setProcessSeq(processSeq); queueOrderPush.setWorkOrderNo(productionPsOutContext.getWorkOrderNo()); queueOrderPush.setProductSn(productionPsOutContext.getProductSn()); queueOrderPush.setCustSn(productionPsOutContext.getCustSn()); queueOrderPush.setPartNo(productionPsOutContext.getPartNo()); queueOrderPush.setPartName(productionPsOutContext.getPartName()); - queueOrderPush.setProcessSeq(processSeq); - queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); queueOrderPush.setProductSeq(productionPartContext.getProductSeq()); queueOrderPush.setWorkOrderSeq(productionPartContext.getWorkOrderSeq()); queueOrderPush.setCarModelCode(productionPartContext.getCarModelCode()); queueOrderPush.setCustOrderNo(productionPartContext.getCustOrderNo()); queueOrderPush.setPartProdGroupCode(productionPartContext.getPartProdGroupCode()); + queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); queueOrderPush.setAreaCode(queueOrderPushCellCfg.getAreaCode()); queueOrderPush.setWorkCenterCode(queueOrderPushCellCfg.getWorkCenterCode()); queueOrderPush.setSourceWorkCellCode(queueOrderPushCellCfg.getWorkCellCode()); @@ -95,35 +96,30 @@ public class MesQueueOrderPushService implements IMesQueueOrderPushService { } } -// //写入工位工单推送信息 -// @Override -// public void insertQueueOrderPush(String organizeCode, String userInfo, MesWorkOrder workOrder, String... pushSourceCodeArr) { -// if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(userInfo) || null == productionPsOutContext || CollectionUtils.isEmpty(queueOrderPushCellCfgList)) return; -// Integer processSeq = getQueueOrderPushMaxSeq(organizeCode, productionPsOutContext.getWorkOrderNo()); -// for (MesQueueOrderPushCellCfg queueOrderPushCellCfg : queueOrderPushCellCfgList) { -// if (null == queueOrderPushCellCfg) continue; -// MesQueueOrderPush queueOrderPush = new MesQueueOrderPush(); -// queueOrderPush.setPushSourceCode(queueOrderPushCellCfg.getPushSourceCode()); -// queueOrderPush.setWorkOrderNo(productionPsOutContext.getWorkOrderNo()); -// queueOrderPush.setProductSn(productionPsOutContext.getProductSn()); -// queueOrderPush.setCustSn(productionPsOutContext.getCustSn()); -// queueOrderPush.setPartNo(productionPsOutContext.getPartNo()); -// queueOrderPush.setPartName(productionPsOutContext.getPartName()); -// queueOrderPush.setProcessSeq(processSeq); -// queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); -// queueOrderPush.setProductSeq(productionPartContext.getProductSeq()); -// queueOrderPush.setWorkOrderSeq(productionPartContext.getWorkOrderSeq()); -// queueOrderPush.setCarModelCode(productionPartContext.getCarModelCode()); -// queueOrderPush.setCustOrderNo(productionPartContext.getCustOrderNo()); -// queueOrderPush.setPartProdGroupCode(productionPartContext.getPartProdGroupCode()); -// queueOrderPush.setAreaCode(queueOrderPushCellCfg.getAreaCode()); -// queueOrderPush.setWorkCenterCode(queueOrderPushCellCfg.getWorkCenterCode()); -// queueOrderPush.setSourceWorkCellCode(queueOrderPushCellCfg.getWorkCellCode()); -// queueOrderPush.setOrganizeCode(organizeCode); -// ConvertBean.serviceModelInitialize(queueOrderPush, userInfo); -// queueOrderPushRepository.insert(queueOrderPush); -// } -// } + //写入工位工单推送信息 + @Override + public void insertQueueOrderPush(StationRequestBean reqBean, MesWorkOrder workOrder, Map paramMap) { + MesQueueOrderPush queueOrderPush = new MesQueueOrderPush(); + queueOrderPush.setPushSourceCode(paramMap.get(MesPcnExtConstWords.PUSH_SOURCE_CODE)); + queueOrderPush.setProcessSeq(Integer.valueOf(paramMap.get(MesPcnExtConstWords.PROCESS_SEQ))); + queueOrderPush.setWorkOrderNo(workOrder.getWorkOrderNo()); + queueOrderPush.setProductSn(workOrder.getWorkOrderNo()); + queueOrderPush.setCustSn(workOrder.getCustSn()); + queueOrderPush.setPartNo(workOrder.getPartNo()); + queueOrderPush.setPartName(workOrder.getPartName()); + queueOrderPush.setProductSeq(workOrder.getProductSeq()); + queueOrderPush.setWorkOrderSeq(workOrder.getWorkOrderSeq()); + queueOrderPush.setCarModelCode(workOrder.getCarModelCode()); + queueOrderPush.setCustOrderNo(workOrder.getCustOrderNo()); + queueOrderPush.setPartProdGroupCode(workOrder.getPartProdGroupCode()); + queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); + queueOrderPush.setAreaCode(reqBean.getAreaCode()); + queueOrderPush.setWorkCenterCode(reqBean.getWorkCenterCode()); + queueOrderPush.setSourceWorkCellCode(reqBean.getWorkCellCode()); + queueOrderPush.setOrganizeCode(reqBean.getOrganizeCode()); + ConvertBean.serviceModelInitialize(queueOrderPush, reqBean.getUserInfo()); + queueOrderPushRepository.insert(queueOrderPush); + } //根据配置查询创建状态的生产队列工位推送信息 @Override diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java index 1be9c3a..0b48043 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java @@ -142,6 +142,9 @@ public class MesFunctionQueueOrderPushService extends BaseSwsService implements return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]新增:根据扫描信息[%s]未匹配到有效的加工单!", buttonDynamicModel.getButtonName(), paramMap.get(MesPcnExtConstWords.WORK_ORDER_NO))); } + //写入工位工单推送信息 + queueOrderPushService.insertQueueOrderPush(reqBean, workOrder, paramMap); + return resultMap; }