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

推单

Browse Source
uat-temp-wj-shenshanorder
王杰 4 months ago
parent 60858c597a
commit e232ab0992
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

5
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesQueueOrderPushService.java
Unescape Escape View File

@ -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.MesQueueOrderPush;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -30,8 +31,8 @@ public interface IMesQueueOrderPushService {
void insertQueueOrderPush(String organizeCode, String userInfo, List<MesQueueOrderPushCellCfg> queueOrderPushCellCfgList, void insertQueueOrderPush(String organizeCode, String userInfo, List<MesQueueOrderPushCellCfg> queueOrderPushCellCfgList,
MesProductionPsOutContext productionPsOutContext, MesProductionPartContext productionPartContext); MesProductionPsOutContext productionPsOutContext, MesProductionPartContext productionPartContext);
// @ApiOperation(value = "写入工位工单推送信息") @ApiOperation(value = "写入工位工单推送信息")
// void insertQueueOrderPush(String organizeCode, String userInfo, MesWorkOrder workOrder, String... pushSourceCodeArr); void insertQueueOrderPush(StationRequestBean reqBean, MesWorkOrder workOrder, Map<String, String> paramMap);
@ApiOperation(value = "根据配置查询创建状态的生产队列工位推送信息") @ApiOperation(value = "根据配置查询创建状态的生产队列工位推送信息")
List<MesQueueOrderPush> getQueueOrderPushList(String organizeCode, List<MesQueueOrderPushCellCfg> queueOrderPushCellCfgList); List<MesQueueOrderPush> getQueueOrderPushList(String organizeCode, List<MesQueueOrderPushCellCfg> queueOrderPushCellCfgList);

58
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesQueueOrderPushService.java
Unescape Escape View File

@ -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.MesQueueOrderPush;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; 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.MesQueueOrderPushCellCfgRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesQueueOrderPushRepository; import cn.estsh.i3plus.pojo.mes.repository.MesQueueOrderPushRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
@ -74,18 +75,18 @@ public class MesQueueOrderPushService implements IMesQueueOrderPushService {
if (null == queueOrderPushCellCfg) continue; if (null == queueOrderPushCellCfg) continue;
MesQueueOrderPush queueOrderPush = new MesQueueOrderPush(); MesQueueOrderPush queueOrderPush = new MesQueueOrderPush();
queueOrderPush.setPushSourceCode(queueOrderPushCellCfg.getPushSourceCode()); queueOrderPush.setPushSourceCode(queueOrderPushCellCfg.getPushSourceCode());
queueOrderPush.setProcessSeq(processSeq);
queueOrderPush.setWorkOrderNo(productionPsOutContext.getWorkOrderNo()); queueOrderPush.setWorkOrderNo(productionPsOutContext.getWorkOrderNo());
queueOrderPush.setProductSn(productionPsOutContext.getProductSn()); queueOrderPush.setProductSn(productionPsOutContext.getProductSn());
queueOrderPush.setCustSn(productionPsOutContext.getCustSn()); queueOrderPush.setCustSn(productionPsOutContext.getCustSn());
queueOrderPush.setPartNo(productionPsOutContext.getPartNo()); queueOrderPush.setPartNo(productionPsOutContext.getPartNo());
queueOrderPush.setPartName(productionPsOutContext.getPartName()); queueOrderPush.setPartName(productionPsOutContext.getPartName());
queueOrderPush.setProcessSeq(processSeq);
queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
queueOrderPush.setProductSeq(productionPartContext.getProductSeq()); queueOrderPush.setProductSeq(productionPartContext.getProductSeq());
queueOrderPush.setWorkOrderSeq(productionPartContext.getWorkOrderSeq()); queueOrderPush.setWorkOrderSeq(productionPartContext.getWorkOrderSeq());
queueOrderPush.setCarModelCode(productionPartContext.getCarModelCode()); queueOrderPush.setCarModelCode(productionPartContext.getCarModelCode());
queueOrderPush.setCustOrderNo(productionPartContext.getCustOrderNo()); queueOrderPush.setCustOrderNo(productionPartContext.getCustOrderNo());
queueOrderPush.setPartProdGroupCode(productionPartContext.getPartProdGroupCode()); queueOrderPush.setPartProdGroupCode(productionPartContext.getPartProdGroupCode());
queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
queueOrderPush.setAreaCode(queueOrderPushCellCfg.getAreaCode()); queueOrderPush.setAreaCode(queueOrderPushCellCfg.getAreaCode());
queueOrderPush.setWorkCenterCode(queueOrderPushCellCfg.getWorkCenterCode()); queueOrderPush.setWorkCenterCode(queueOrderPushCellCfg.getWorkCenterCode());
queueOrderPush.setSourceWorkCellCode(queueOrderPushCellCfg.getWorkCellCode()); queueOrderPush.setSourceWorkCellCode(queueOrderPushCellCfg.getWorkCellCode());
@ -95,35 +96,30 @@ public class MesQueueOrderPushService implements IMesQueueOrderPushService {
} }
} }
// //写入工位工单推送信息 //写入工位工单推送信息
// @Override @Override
// public void insertQueueOrderPush(String organizeCode, String userInfo, MesWorkOrder workOrder, String... pushSourceCodeArr) { public void insertQueueOrderPush(StationRequestBean reqBean, MesWorkOrder workOrder, Map<String, String> paramMap) {
// if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(userInfo) || null == productionPsOutContext || CollectionUtils.isEmpty(queueOrderPushCellCfgList)) return; MesQueueOrderPush queueOrderPush = new MesQueueOrderPush();
// Integer processSeq = getQueueOrderPushMaxSeq(organizeCode, productionPsOutContext.getWorkOrderNo()); queueOrderPush.setPushSourceCode(paramMap.get(MesPcnExtConstWords.PUSH_SOURCE_CODE));
// for (MesQueueOrderPushCellCfg queueOrderPushCellCfg : queueOrderPushCellCfgList) { queueOrderPush.setProcessSeq(Integer.valueOf(paramMap.get(MesPcnExtConstWords.PROCESS_SEQ)));
// if (null == queueOrderPushCellCfg) continue; queueOrderPush.setWorkOrderNo(workOrder.getWorkOrderNo());
// MesQueueOrderPush queueOrderPush = new MesQueueOrderPush(); queueOrderPush.setProductSn(workOrder.getWorkOrderNo());
// queueOrderPush.setPushSourceCode(queueOrderPushCellCfg.getPushSourceCode()); queueOrderPush.setCustSn(workOrder.getCustSn());
// queueOrderPush.setWorkOrderNo(productionPsOutContext.getWorkOrderNo()); queueOrderPush.setPartNo(workOrder.getPartNo());
// queueOrderPush.setProductSn(productionPsOutContext.getProductSn()); queueOrderPush.setPartName(workOrder.getPartName());
// queueOrderPush.setCustSn(productionPsOutContext.getCustSn()); queueOrderPush.setProductSeq(workOrder.getProductSeq());
// queueOrderPush.setPartNo(productionPsOutContext.getPartNo()); queueOrderPush.setWorkOrderSeq(workOrder.getWorkOrderSeq());
// queueOrderPush.setPartName(productionPsOutContext.getPartName()); queueOrderPush.setCarModelCode(workOrder.getCarModelCode());
// queueOrderPush.setProcessSeq(processSeq); queueOrderPush.setCustOrderNo(workOrder.getCustOrderNo());
// queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); queueOrderPush.setPartProdGroupCode(workOrder.getPartProdGroupCode());
// queueOrderPush.setProductSeq(productionPartContext.getProductSeq()); queueOrderPush.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
// queueOrderPush.setWorkOrderSeq(productionPartContext.getWorkOrderSeq()); queueOrderPush.setAreaCode(reqBean.getAreaCode());
// queueOrderPush.setCarModelCode(productionPartContext.getCarModelCode()); queueOrderPush.setWorkCenterCode(reqBean.getWorkCenterCode());
// queueOrderPush.setCustOrderNo(productionPartContext.getCustOrderNo()); queueOrderPush.setSourceWorkCellCode(reqBean.getWorkCellCode());
// queueOrderPush.setPartProdGroupCode(productionPartContext.getPartProdGroupCode()); queueOrderPush.setOrganizeCode(reqBean.getOrganizeCode());
// queueOrderPush.setAreaCode(queueOrderPushCellCfg.getAreaCode()); ConvertBean.serviceModelInitialize(queueOrderPush, reqBean.getUserInfo());
// queueOrderPush.setWorkCenterCode(queueOrderPushCellCfg.getWorkCenterCode()); queueOrderPushRepository.insert(queueOrderPush);
// queueOrderPush.setSourceWorkCellCode(queueOrderPushCellCfg.getWorkCellCode()); }
// queueOrderPush.setOrganizeCode(organizeCode);
// ConvertBean.serviceModelInitialize(queueOrderPush, userInfo);
// queueOrderPushRepository.insert(queueOrderPush);
// }
// }
//根据配置查询创建状态的生产队列工位推送信息 //根据配置查询创建状态的生产队列工位推送信息
@Override @Override

3
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java
Unescape Escape View File

@ -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))); return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]新增:根据扫描信息[%s]未匹配到有效的加工单!", buttonDynamicModel.getButtonName(), paramMap.get(MesPcnExtConstWords.WORK_ORDER_NO)));
} }
//写入工位工单推送信息
queueOrderPushService.insertQueueOrderPush(reqBean, workOrder, paramMap);
return resultMap; return resultMap;
} }

Write Preview
Loading…
Cancel
Save