|
|
|
|
@ -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);
|
|
|
|
|
public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel model, MesNumberRule numberRule , StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
|
|
|
|
|
|
|
|
|
|
List<MesWorkOrderCut> workOrderCutList = (List<MesWorkOrderCut>)model.getSourceData();
|
|
|
|
|
List<Map<String, Object>> printDataMapList = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
// 裁片方案代码集合
|
|
|
|
|
List<String> cutCodeList = workOrderCutList.stream().map(MesWorkOrderCut::getCutCode).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList);
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList);
|
|
|
|
|
//根据裁片方案代码对裁片方案原材料分组
|
|
|
|
|
Map<String, List<MesCutSchemeMaterial>> cutSchemeMaterialMapByCutCode = cutSchemeMaterialList.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeEquipment> cutSchemeEquipmentList = getMesCutSchemeEquipments(model, cutCodeList);
|
|
|
|
|
|
|
|
|
|
cutSchemeEquipmentList = cutSchemeEquipmentList.stream().filter(o -> o.getIsPrint() != null && o.getIsPrint() == CommonEnumUtil.VALID).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
// 根据裁片方案代码对裁片设备信息分组
|
|
|
|
|
Map<String, List<MesCutSchemeEquipment>> cutSchemeEquipmentMapByCutCode = CollectionUtils.isEmpty(cutSchemeEquipmentList) ? null : cutSchemeEquipmentList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipment::getCutCode));
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetailList = getMesCutSchemeEquipmentDetails(model, cutSchemeEquipmentList);
|
|
|
|
|
|
|
|
|
|
Map<Long, List<MesCutSchemeEquipmentDetail>> cutSchemeEquipmentDetailMapByPid = CollectionUtils.isEmpty(cutSchemeEquipmentDetailList) ? null : cutSchemeEquipmentDetailList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipmentDetail::getPid));
|
|
|
|
|
|
|
|
|
|
for (MesWorkOrderCut workOrderCut : workOrderCutList) {
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeFg> mesCutSchemeFgList = cutSchemeFgMapByCutCode.get(workOrderCut.getCutCode());
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeMaterial> mesCutSchemeMaterialList = cutSchemeMaterialMapByCutCode.get(workOrderCut.getCutCode());
|
|
|
|
|
|
|
|
|
|
MesCutSchemeMaterial cutSchemeMaterial = mesCutSchemeMaterialList.get(0);
|
|
|
|
|
|
|
|
|
|
List<MesCutSchemeEquipment> cutSchemeEquipmentListByCutCode = CollectionUtils.isEmpty(cutSchemeEquipmentMapByCutCode) ? null : cutSchemeEquipmentMapByCutCode.get(workOrderCut.getCutCode());
|
|
|
|
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(cutSchemeEquipmentListByCutCode)) cutSchemeEquipmentListByCutCode.sort(Comparator.comparing(MesCutSchemeEquipment::getSeq));
|
|
|
|
|
|
|
|
|
|
Map<String, Object> 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<MesCutSchemeEquipmentDetail> 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), "");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}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);
|
|
|
|
|
|
|
|
|
|
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() +"箱";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return mesProduceSnPrintModel;
|
|
|
|
|
//产品信息
|
|
|
|
|
resultMap.put(MesPcnExtConstWords.FG_PART_NO, partValue);
|
|
|
|
|
|
|
|
|
|
printDataMapList.add(resultMap);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
model.setPrintContextList(packResultMapList(model, printDataMapList));
|
|
|
|
|
|
|
|
|
|
return model;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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 String getValByDouble(Double val) {
|
|
|
|
|
return val == null ? "" : val.toString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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));
|
|
|
|
|
private Map<String, List<MesCutSchemeFg>> getCutSchemeFgMapByCutCode(List<String> cutCodeList) {
|
|
|
|
|
List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCodeList);
|
|
|
|
|
|
|
|
|
|
//根据裁片方案代码对裁片方案成品明细分组
|
|
|
|
|
Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode));
|
|
|
|
|
return cutSchemeFgMapByCutCode;
|
|
|
|
|
}
|
|
|
|
|
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<MesCutSchemeEquipmentDetail> getMesCutSchemeEquipmentDetails(MesProduceSnPrintModel model, List<MesCutSchemeEquipment> cutSchemeEquipmentList) {
|
|
|
|
|
if (!CollectionUtils.isEmpty(cutSchemeEquipmentList)) {
|
|
|
|
|
List<Long> 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 null;
|
|
|
|
|
}
|
|
|
|
|
return monthStr;
|
|
|
|
|
|
|
|
|
|
private List<MesCutSchemeEquipment> getMesCutSchemeEquipments(MesProduceSnPrintModel model, List<String> cutCodeList) {
|
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
|
|
|
|
|
DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean);
|
|
|
|
|
List<MesCutSchemeEquipment> cutSchemeEquipmentList = cutSchemeEquipmentRepository.findByHqlWhere(packBean);
|
|
|
|
|
return cutSchemeEquipmentList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String getDayShort(Date date) {
|
|
|
|
|
String day = TimeTool.getDay(date);
|
|
|
|
|
return day;
|
|
|
|
|
private List<MesCutSchemeMaterial> getMesCutSchemeMaterials(List<String> cutCodeList) {
|
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
|
|
|
|
|
DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean);
|
|
|
|
|
List<MesCutSchemeMaterial> 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<MesCutSchemeFg> getMesCutSchemeFgs(List<String> cutCodeList) {
|
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
|
|
|
|
|
DdlPreparedPack.getInPackList(cutCodeList, MesPcnExtConstWords.CUT_CODE, packBean);
|
|
|
|
|
List<MesCutSchemeFg> 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<Map<String, Object>> packResultMapList(MesProduceSnPrintModel printModel, List<Map<String, Object>> printTemplateDateList) {
|
|
|
|
|
List<Map<String, Object>> resultMapList = new ArrayList<>();
|
|
|
|
|
Map<String, Object> 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
yxw
8 months ago