diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java index c0967f4..16caf68 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,4 +21,7 @@ public interface IMesProduceSnPrintService { @ApiOperation(value = "装配件查询") List findMesProductionAssembly(MesProductionAssembly mesProductionAssembly); + + @ApiOperation(value = "裁片工单查询") + List findMesWorkOrderCut(MesWorkOrderCut workOrderCut); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java index ed0ac1f..0bdcd58 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -16,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -114,4 +116,22 @@ public class MesProduceSnPrintController { } } + @PostMapping("/mes-work-order-cut/find") + @ApiOperation(value = "裁片工单查询") + public ResultBean findMesWorkOrderCut(MesWorkOrderCut workOrderCut) { + try { + ValidatorBean.checkNotNull(workOrderCut.getWorkCenterCode(), "产线代码不能为空"); + ValidatorBean.checkNotNull(workOrderCut.getOrganizeCode(), "工厂代码不能为空"); + ValidatorBean.checkNotNull(workOrderCut.getModifyUser(), "操作人不能为空"); + + return ResultBean.success("查询成功") + .setMsg("裁片工单查询成功!!!") + .setResultList(mesProduceSnPrintService.findMesWorkOrderCut(workOrderCut)); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java index bbf41be..4670342 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesTemplateService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnPrintService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintDataModel; @@ -16,8 +17,8 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; @@ -26,15 +27,14 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import cn.hutool.core.bean.BeanUtil; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.UUID; +import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -86,6 +86,23 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService { @Autowired private MesLabelTemplateRepository templateRao; + @Autowired + private MesWorkOrderCutRepository workOrderCutRepository; + + @Autowired + private IMesWorkOrderCutService workOrderCutService; + + @Autowired + private MesLabelTemplateRepository labelTemplateRepository; + + @Autowired + private MesLabelTemplateParamRepository labelTemplateParamRepository; + + // 仅查询 + public static final Integer CUT_QUERY_MODE_BY_QUERY = 1; + // 打印 + public static final Integer CUT_QUERY_MODE_BY_PRINT = 2; + @Override public MesProduceSnPrintModel findMesPackingDefine(MesProduceSnPrintModel mesProduceSnPrintModel) { //查询SAP下发物料信息 @@ -235,4 +252,100 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService { } return mesProductionAssemblies; } + + @Override + public List findMesWorkOrderCut(MesWorkOrderCut workOrderCut) { + + Pager pager = new Pager(); + pager.setStartRow(1); + pager.setCurrentPage(1); + pager.setPageSize(10); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrderCut.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(workOrderCut.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean); + DdlPreparedPack.getIsNull(MesPcnExtConstWords.REMARK, packBean); + DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue(), MesPcnExtConstWords.PRINT_STATUS, packBean); + List workOrderCutList = workOrderCutRepository.findByHqlWherePage(packBean, pager); + + // model 不为空 并= 1 时 仅仅查询裁片工单数据 + // model 不为空时则 查询裁片工单数据并封装打印模板和打印数据，封装完后修改打印状态为已打印 + // model 为空时,该情况为异常情况,mode由前端返回,不会为空,该情况下返回数据为空 + if (workOrderCut.getMode() != null && workOrderCut.getMode().equals(CUT_QUERY_MODE_BY_QUERY)) { + + return workOrderCutList; + + } else if (workOrderCut.getMode() != null) { + + List cutCodeList = workOrderCutList.stream().map(MesWorkOrderCut::getCutCode).distinct().collect(Collectors.toList()); + + List mesCutSchemeList = workOrderCutService.queryCutSchemeList(cutCodeList, workOrderCut.getOrganizeCode()); + + Map cutSchemeMapByCutCode = mesCutSchemeList.stream().collect(Collectors.toMap(MesCutScheme::getCutCode, Function.identity(), (x, y) -> y)); + + for (MesWorkOrderCut workOrderCutDb : workOrderCutList) { + + MesCutScheme cutScheme = cutSchemeMapByCutCode.get(workOrderCutDb.getCutCode()); + + MesLabelTemplate labelTemplate = getLabelTemplate(cutScheme.getTemplateCode(), workOrderCut.getOrganizeCode()); + + //模板信息丢失抛出异常 + if (labelTemplate == null) { + workOrderCutDb.setRemark(String.format("请检查裁片方案,裁片方案[%s]模板代码[%s]无效!", cutScheme.getCutCode(), cutScheme.getTemplateCode())); + ConvertBean.serviceModelUpdate(workOrderCutDb, workOrderCut.getModifyUser()); + workOrderCutDb.setSystemSyncStatus(CommonEnumUtil.FALSE); + continue; + } + + //根据反射获取策略类--封装打印数据 + String methodCode = labelTemplate.getMethodCode(); + + //模板信息丢失抛出异常 + if (methodCode == null) { + workOrderCutDb.setRemark(String.format("裁片方案[%s]模板代码[%s]方法类为空,请配置!", cutScheme.getCutCode(), labelTemplate.getTemplateCode())); + ConvertBean.serviceModelUpdate(workOrderCutDb, workOrderCut.getModifyUser()); + workOrderCutDb.setSystemSyncStatus(CommonEnumUtil.FALSE); + continue; + } + + MesProduceSnPrintModel mesProduceSnPrintModel = new MesProduceSnPrintModel(); + mesProduceSnPrintModel.setMesLabelTemplate(labelTemplate); + mesProduceSnPrintModel.setSourceData(workOrderCutList); + mesProduceSnPrintModel.setPrinter(cutScheme.getPrinter()); + + MesProduceSnPrintModel printModel = null; + try { + IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode); + printModel = strategyService.execute(null, mesProduceSnPrintModel, null, null, null ,false); + } catch (BeansException e) { + workOrderCutDb.setRemark(String.format("裁片方案[%s]模板代码[%s]方法类[%s]执行异常,请配置!", cutScheme.getCutCode(), labelTemplate.getTemplateCode(), labelTemplate.getMethodCode())); + ConvertBean.serviceModelUpdate(workOrderCutDb, workOrderCut.getModifyUser()); + workOrderCutDb.setSystemSyncStatus(CommonEnumUtil.FALSE); + continue; + } + + workOrderCutDb.setPrintContent(printModel.getPrintContextList()); + workOrderCutDb.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); + ConvertBean.serviceModelUpdate(workOrderCutDb, workOrderCut.getModifyUser()); + workOrderCutRepository.save(workOrderCutDb); + + } + + return workOrderCutList; + } + + return workOrderCutList; + } + + private MesLabelTemplate getLabelTemplate(String templateCode, String organizeCode) { + DdlPackBean templatePackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(templateCode, MesPcnExtConstWords.TEMPLATE_CODE, templatePackBean); + MesLabelTemplate mesLabelTemplate = labelTemplateRepository.getByProperty(templatePackBean); + if (mesLabelTemplate != null) { + //级联获取labelTemplateParam + DdlPackBean templateParamPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(mesLabelTemplate.getId(), "templateId", templateParamPackBean); + List params = labelTemplateParamRepository.findByHqlWhere(templateParamPackBean); + mesLabelTemplate.setLabelTemplateParamList(params); + } + return mesLabelTemplate; + } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java index f1ab01b..86467bd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java @@ -2,7 +2,9 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.repository.*; import java.util.Collections; @@ -58,6 +60,13 @@ public class MesWorkOrderCutService implements IMesWorkOrderCutService { } @Override + public List queryCutSchemeList(List cutCodeList, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean); + return cutSchemeRepository.findByHqlWhere(packBean); + } + + @Override public List queryCutSchemeFgList(String cutCode, String organizeCode) { if (StringUtils.isEmpty(organizeCode)) return Collections.emptyList(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java index 6056590..5675583 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java @@ -1,34 +1,28 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy; -import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; -import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; -import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintDataModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; -import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService; -import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; -import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesNumberRuleRepository; -import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; -import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.hutool.core.bean.BeanUtil; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeEquipmentDetailRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeEquipmentRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeFgRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeMaterialRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; +import org.springframework.util.CollectionUtils; -import java.util.Date; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * @Description : 裁片工单标签打印 @@ -40,159 +34,180 @@ import java.util.Date; @Component @Slf4j public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyService { - @Autowired - private MesCustomerPartRepository mesCustomerPartRDao; @Autowired - private ISyncFuncService syncFuncService; + private MesCutSchemeFgRepository cutSchemeFgRepository; @Autowired - private SnowflakeIdMaker snowflakeIdMaker; + private MesCutSchemeMaterialRepository cutSchemeMaterialRepository; @Autowired - private IMesPartService mesPartService; + private MesCutSchemeEquipmentRepository cutSchemeEquipmentRepository; @Autowired - private IConfigService configService; + private MesCutSchemeEquipmentDetailRepository cutSchemeEquipmentDetailRepository; - @Autowired - private MesNumberRuleRepository numberRuleRepository; + public static final int EQUIP_NUM = 1; + public static final int EQUIP_PARAM_TITLE_NUM = 4; @Override - public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { - Date date = new Date(); - String organizeCode = mesProduceSnPrintModel.getOrganizeCode(); - //gz-xiaopeng - //客户条码-小鹏汽车 gz-xiaopeng - //{custPartNo}{year}{month}{day}{serialNo} - //客户零件号 - MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel); - String custPartNo = mesCustomerPart == null ? "" : mesCustomerPart.getCustPartNo(); - MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode); - numberRule = null != numberRule ? numberRule : getNumberRule(organizeCode, mesPart); - MesConfig mesConfig = configService.getMesConfigByCfgCode(MesPcnExtConstWords.ORGANIZE_NAME, organizeCode); - String organizeName = mesConfig.getCfgValue(); - if (!isStep){ - //年月日缩写 - genSerialNoModel.setYear(getYearShort(date)); - genSerialNoModel.setMonth(getMonthShort(date)); - genSerialNoModel.setDay(getDayShort(date)); - genSerialNoModel.setRuleCode(numberRule.getRuleCode()); - genSerialNoModel.setCustPartNo(custPartNo); - - //流水号 5位 每天从1开始 - for (int i = 0; i < mesProduceSnPrintModel.getPrintQty(); i++) { - ResultBean resultBean = syncFuncService.syncSerialNo(genSerialNoModel, mesProduceSnPrintModel.getUserName(), organizeCode, 1); - String sn = resultBean.getResultList().get(0).toString(); - Integer serialNoLength = numberRule.getSerialnoLength(); - String serialNo = sn.substring(sn.length() - serialNoLength); - //保存条码信息 - MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty()); - produceSn.setCustPartNo(custPartNo); - //封装打印信息 - MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName); - mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); - mesProduceSnPrintModel.getMesProduceSnList().add(produceSn); - //保存打印记录 - MesPrintedSnLog snLog = new MesPrintedSnLog(); - BeanUtil.copyProperties(printDataModel,snLog); - snLog.setOrganizeCode(organizeCode); - ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName()); - mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); - } - }else { - String sn = mesProduceSnPrintModel.getProductSn(); - MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0); - Integer serialNoLength = numberRule.getSerialnoLength(); - String serialNo = sn.substring(sn.length() - serialNoLength); - //封装打印信息 - MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo, custPartNo, organizeName); - mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); - //保存打印记录 - MesPrintedSnLog snLog = new MesPrintedSnLog(); - BeanUtil.copyProperties(printDataModel,snLog); - snLog.setOrganizeCode(organizeCode); - ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName()); - mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); - } - - return mesProduceSnPrintModel; + public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel model, MesNumberRule numberRule , StepResult stepResult, StationRequestBean reqBean, Boolean isStep) { + + List workOrderCutList = (List)model.getSourceData(); + List> printDataMapList = new ArrayList<>(); + + // 裁片方案代码集合 + List cutCodeList = workOrderCutList.stream().map(MesWorkOrderCut::getCutCode).distinct().collect(Collectors.toList()); + + + + Map> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList); + + List cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList); + //根据裁片方案代码对裁片方案原材料分组 + Map> cutSchemeMaterialMapByCutCode = cutSchemeMaterialList.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode)); + + List cutSchemeEquipmentList = getMesCutSchemeEquipments(model, cutCodeList); + + cutSchemeEquipmentList = cutSchemeEquipmentList.stream().filter(o -> o.getIsPrint() != null && o.getIsPrint() == CommonEnumUtil.VALID).collect(Collectors.toList()); + + // 根据裁片方案代码对裁片设备信息分组 + Map> cutSchemeEquipmentMapByCutCode = CollectionUtils.isEmpty(cutSchemeEquipmentList) ? null : cutSchemeEquipmentList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipment::getCutCode)); + + List cutSchemeEquipmentDetailList = getMesCutSchemeEquipmentDetails(model, cutSchemeEquipmentList); + + Map> cutSchemeEquipmentDetailMapByPid = CollectionUtils.isEmpty(cutSchemeEquipmentDetailList) ? null : cutSchemeEquipmentDetailList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipmentDetail::getPid)); + + for (MesWorkOrderCut workOrderCut : workOrderCutList) { + + List mesCutSchemeFgList = cutSchemeFgMapByCutCode.get(workOrderCut.getCutCode()); + + List mesCutSchemeMaterialList = cutSchemeMaterialMapByCutCode.get(workOrderCut.getCutCode()); + + MesCutSchemeMaterial cutSchemeMaterial = mesCutSchemeMaterialList.get(0); + + List cutSchemeEquipmentListByCutCode = CollectionUtils.isEmpty(cutSchemeEquipmentMapByCutCode) ? null : cutSchemeEquipmentMapByCutCode.get(workOrderCut.getCutCode()); + + if (!CollectionUtils.isEmpty(cutSchemeEquipmentListByCutCode)) cutSchemeEquipmentListByCutCode.sort(Comparator.comparing(MesCutSchemeEquipment::getSeq)); + + Map resultMap = new HashMap<>(); + + resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, workOrderCut.getCutWorkOrderNo()); + resultMap.put(MesPcnExtConstWords.CUT_NAME, workOrderCut.getCutName()); + // 原材料零件号 + resultMap.put(MesPcnExtConstWords.RAW_PART_NO, cutSchemeMaterial.getPartNo()); + + // 拉料信息 START + resultMap.put(MesPcnExtConstWords.PULLING_MATERIAL_LENGTH, getValByDouble(cutSchemeMaterial.getPullingMaterialLength())); + resultMap.put(MesPcnExtConstWords.PULLING_MATERIAL_LAYER_NUMBER, getValByDouble(cutSchemeMaterial.getPullingMaterialLayerNumber())); + resultMap.put(MesPcnExtConstWords.PER_LAYER_NUMBER, getValByDouble(cutSchemeMaterial.getPerLayerNumber())); + resultMap.put(MesPcnExtConstWords.MATERIAL_DOSAGE, getValByDouble(cutSchemeMaterial.getMaterialDosage())); + resultMap.put(MesPcnExtConstWords.USING_LENGTH, getValByDouble(cutSchemeMaterial.getUsingLength())); + resultMap.put(MesPcnExtConstWords.LAYER_NUMBER, getValByDouble(cutSchemeMaterial.getLayerNumber())); + resultMap.put(MesPcnExtConstWords.TENSION_PARAM, getValByDouble(cutSchemeMaterial.getTensionParam())); + resultMap.put(MesPcnExtConstWords.PRINT_TIME, TimeTool.getNowTime("yyyy-M-d H:mm:ss")); + // 拉料信息 END + + MesCutSchemeEquipment mesCutSchemeEquipment = CollectionUtils.isEmpty(cutSchemeEquipmentListByCutCode) ? null : cutSchemeEquipmentListByCutCode.get(0); + + List cutSchemeEquipmentDetails = mesCutSchemeEquipment == null || CollectionUtils.isEmpty(cutSchemeEquipmentDetailMapByPid) ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId()); + + for (int i = 0; i < EQUIP_NUM; i++) { + //设备参数值标题 + resultMap.put(MesPcnExtConstWords.EQUIPMENT_NAME+(i+1), mesCutSchemeEquipment == null ? "" : mesCutSchemeEquipment.getEquipmentName()); + for (int l = 0; l < EQUIP_PARAM_TITLE_NUM; l++) { + if (cutSchemeEquipmentDetails.size() > l) { + //设备参数值标题1 + resultMap.put(MesPcnExtConstWords.EQUIP_PARAM_NAME+(l+1), cutSchemeEquipmentDetails.get(l).getName()); + //设备参数值1 + resultMap.put(MesPcnExtConstWords.EQUIP_PARAM_VALUE+(l+1), cutSchemeEquipmentDetails.get(l).getValue()); + } else { + //设备参数值标题1 + resultMap.put(MesPcnExtConstWords.EQUIP_PARAM_NAME+(l+1), ""); + //设备参数值1 + resultMap.put(MesPcnExtConstWords.EQUIP_PARAM_VALUE+(l+1), ""); + } + } + } + + String partValue = ""; + if (!CollectionUtils.isEmpty(mesCutSchemeFgList)) { + BigDecimal[] bigDecimals = divideAndRemainder(mesCutSchemeFgList.get(0).getQty(), mesCutSchemeFgList.get(0).getPackageQty()); + BigDecimal remainder = bigDecimals[1]; + Double boxQty = remainder.doubleValue() > 0 ? bigDecimals[0].add(new BigDecimal("1")).doubleValue() : bigDecimals[0].doubleValue(); + partValue = mesCutSchemeFgList.get(0).getPartNo() + " " + boxQty.intValue() +"箱"; + } + + //产品信息 + resultMap.put(MesPcnExtConstWords.FG_PART_NO, partValue); + + printDataMapList.add(resultMap); + + } + + model.setPrintContextList(packResultMapList(model, printDataMapList)); + + return model; } - private MesNumberRule getNumberRule(String organizeCode, MesPart part) { - if (StringUtils.isEmpty(part.getProductMatchRule())) MesPcnException.throwMesBusiException("物料[%s]未维护零件条码匹配规则", part.getPartNo()); - MesNumberRule numberRule = numberRuleRepository.getByProperty( - new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.RULE_CODE}, - new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), part.getProcessMatchRule()}); - if (null == numberRule) MesPcnException.throwMesBusiException("物料[%s]维护的零件条码匹配规则[%s]信息不存在", part.getPartNo(), part.getProcessMatchRule()); - return numberRule; + private String getValByDouble(Double val) { + return val == null ? "" : val.toString(); } - private MesCustomerPart getMesCustomerPart(MesProduceSnPrintModel mesProduceSnPrintModel) { - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesProduceSnPrintModel.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesProduceSnPrintModel.getPartNo(), "erpPartNo", ddlPackBean); - MesCustomerPart mesCustomerPart = mesCustomerPartRDao.getByProperty(ddlPackBean); - /** - * 2024/07/25 打印模板不校验 客户零件号，校验客户零件号移动到条码规则中 numberRule的策略中 - */ -// if (Objects.isNull(mesCustomerPart)) { -// MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo()); -// } - return mesCustomerPart; + private Map> getCutSchemeFgMapByCutCode(List cutCodeList) { + List cutSchemeFgList = getMesCutSchemeFgs(cutCodeList); + + //根据裁片方案代码对裁片方案成品明细分组 + Map> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode)); + return cutSchemeFgMapByCutCode; } - private String getYearShort(Date date) { - String yearStr = MesExtEnumUtil.YEAR_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getYear(date))); - if (StringUtils.isEmpty(yearStr)) { - MesPcnException.throwMesBusiException("【%s】年月简号不存在", TimeTool.getYear(date)); - } - return yearStr; + private BigDecimal[] divideAndRemainder(Double qty, Double packageQty) { + BigDecimal dividend = new BigDecimal(qty.toString()); + BigDecimal divisor = new BigDecimal(packageQty.toString()); + return dividend.divideAndRemainder(divisor); } - private String getMonthShort(Date date) { - String monthStr = MesExtEnumUtil.MONTH_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date))); - if (StringUtils.isEmpty(monthStr)) { - MesPcnException.throwMesBusiException("【%s】月简号不存在", TimeTool.getMonth(date)); + private List getMesCutSchemeEquipmentDetails(MesProduceSnPrintModel model, List cutSchemeEquipmentList) { + if (!CollectionUtils.isEmpty(cutSchemeEquipmentList)) { + List idList = cutSchemeEquipmentList.stream().map(MesCutSchemeEquipment::getId).collect(Collectors.toList()); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode()); + DdlPreparedPack.getInPackList(idList, MesPcnExtConstWords.PID, packBean); + return cutSchemeEquipmentDetailRepository.findByHqlWhere(packBean); } - return monthStr; + return null; + } + + private List getMesCutSchemeEquipments(MesProduceSnPrintModel model, List cutCodeList) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode()); + DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean); + List cutSchemeEquipmentList = cutSchemeEquipmentRepository.findByHqlWhere(packBean); + return cutSchemeEquipmentList; } - private String getDayShort(Date date) { - String day = TimeTool.getDay(date); - return day; + private List getMesCutSchemeMaterials(List cutCodeList) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean); + List cutSchemeMaterialList = cutSchemeMaterialRepository.findByHqlWhere(packBean); + return cutSchemeMaterialList; } - private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn, String userName, Double qty) { - MesProduceSn mesProduceSn = new MesProduceSn(); - mesProduceSn.setSerialNumber(snowflakeIdMaker.nextId() + ""); - mesProduceSn.setProductSn(sn); - mesProduceSn.setCustSn(sn); - mesProduceSn.setPartNo(mesPart.getPartNo()); - mesProduceSn.setPartName(mesPart.getPartName()); - mesProduceSn.setProcessLabelTemplate(mesPart.getProcessLabelTemplate()); - mesProduceSn.setCustLabelTemplate(mesPart.getCustLabelTemplate()); - mesProduceSn.setProdLabelTemplate(mesPart.getProductLabelTemplate()); - mesProduceSn.setQty(qty); - mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); - mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - mesProduceSn.setLotNo(TimeTool.getToday()); - mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE); - mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()); - mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode()); - ConvertBean.serviceModelInitialize(mesProduceSn, userName); - return mesProduceSn; + private List getMesCutSchemeFgs(List cutCodeList) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean); + List cutSchemeFgList = cutSchemeFgRepository.findByHqlWhere(packBean); + return cutSchemeFgList; } - private MesProduceSnPrintDataModel getModel(MesProduceSn produceSn, String no, String custPartNo, String factoryName) { - MesProduceSnPrintDataModel mesProduceSnPrintDataModel = new MesProduceSnPrintDataModel(); - mesProduceSnPrintDataModel.setFactoryName(factoryName); - mesProduceSnPrintDataModel.setPartNo(produceSn.getPartNo()); - mesProduceSnPrintDataModel.setPartName(produceSn.getPartName()); - mesProduceSnPrintDataModel.setNo(no); - mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn()); - mesProduceSnPrintDataModel.setCustPartNo(custPartNo); - mesProduceSnPrintDataModel.setPrintDate(TimeTool.getNowTime(true)); - mesProduceSnPrintDataModel.setProductDate(produceSn.getCreateDatetime()); - return mesProduceSnPrintDataModel; + + private List> packResultMapList(MesProduceSnPrintModel printModel, List> printTemplateDateList) { + List> resultMapList = new ArrayList<>(); + Map resultMap = new HashMap<>(); + resultMap.put(MesPcnExtConstWords.LABEL_TEMPLATE, printModel.getMesLabelTemplate()); + resultMap.put(MesPcnExtConstWords.TEMPLATE_DATA, printTemplateDateList); + resultMap.put(MesPcnExtConstWords.TEMPLATE_CODE, printModel.getMesLabelTemplate().getTemplateCode()); + resultMap.put(MesPcnExtConstWords.PRINTER, printModel.getPrinter()); + resultMapList.add(resultMap); + return resultMapList; } } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 924900a..61ae7e2 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -73,6 +73,8 @@ public class MesPcnExtConstWords { public static final String PART_NAME = "partName"; // 设备代码 public static final String EQUIPMENT_CODE = "equipmentCode"; + // 设备名称 + public static final String EQUIPMENT_NAME = "equipmentName"; // 设备数据变量ID public static final String EQUIP_VARIABLE_ID = "equipVariableId"; // 设备ID @@ -500,7 +502,36 @@ public class MesPcnExtConstWords { //条形码 public static final String BAR_CODE = "barCode"; //竖杠 - public static final String VERTIVAL_BAR = "|"; + public static final String VERTICAL_BAR = "|"; + // 时间 public static final String TIME = "time"; + //原材料 + public static final String RAW_PART_NO = "rawPartNo"; + //拉料长度 + public static final String PULLING_MATERIAL_LENGTH = "pullingMaterialLength"; + //拉料层数 + public static final String PULLING_MATERIAL_LAYER_NUMBER = "pullingMaterialLayerNumber"; + //每层套数 + public static final String PER_LAYER_NUMBER = "perLayerNumber"; + //调取长度 + public static final String USING_LENGTH = "usingLength"; + //材料用量 + public static final String MATERIAL_DOSAGE = "materialDosage"; + //层数 + public static final String LAYER_NUMBER = "layerNumber"; + //张力参数 + public static final String TENSION_PARAM = "tensionParam"; + //设备参数名称 + public static final String EQUIP_PARAM_NAME = "equipParamName"; + //设备参数值 + public static final String EQUIP_PARAM_VALUE = "equipParamValue"; + //参数 + public static final String PARAM = "param"; + //成品零件号 + public static final String FG_PART_NO = "fgPartNo"; + // 打印时间 + public static final String PRINT_TIME = "printTime"; + // 裁片名称 + public static final String CUT_NAME = "cutName"; }