forked from I3-YF/i3plus-mes-pcn-yfai
Merge branch 'dev-wuhan' into dev-wuhan-temp
commit
b3cdc996ed
@ -0,0 +1,26 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
|
||||||
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : BYD-BF-WH.btw
|
||||||
|
* @Reference :
|
||||||
|
* @Author : junsheng.li
|
||||||
|
* @CreateDate 2024/9/26 19:24
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Component
|
||||||
|
public class BydBfWhNumberRuleStrategyService implements INumberRulePackAttributeStrategyService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
|
||||||
|
genSerialNoModel.setYear(TimeTool.pareDateToString(MesPcnExtConstWords.DATE_FORMAT_YY, new Date()));
|
||||||
|
return genSerialNoModel;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
|
||||||
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.StringJoiner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 内部条码
|
||||||
|
* @Reference :
|
||||||
|
* @Author : junsheng.li
|
||||||
|
* @CreateDate 2024/9/27 13:23
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Component
|
||||||
|
public class InternalBarcodeNumberRuleStrategyService implements INumberRulePackAttributeStrategyService {
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
|
||||||
|
if (StringUtils.isEmpty(genSerialNoModel.getShiftCode()) || StringUtils.isEmpty(genSerialNoModel.getPartNo())) {
|
||||||
|
MesPcnException.throwMesBusiException("班次代码或零件号未维护");
|
||||||
|
}
|
||||||
|
genSerialNoModel.setDynamicRule(new StringJoiner(MesPcnExtConstWords.COMMA).add(genSerialNoModel.getPartNo().substring(genSerialNoModel.getPartNo().length() - 4)).add(genSerialNoModel.getShiftCode()).toString());
|
||||||
|
Date date = new Date();
|
||||||
|
//年月日缩写
|
||||||
|
genSerialNoModel.setYear(getYearShort(date));
|
||||||
|
genSerialNoModel.setMonth(getMonthShort(date));
|
||||||
|
genSerialNoModel.setDay(getDayShort(date));
|
||||||
|
return genSerialNoModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getYearShort(Date date) {
|
||||||
|
return MesExtEnumUtil.YEAR_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getYear(date)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getMonthShort(Date date) {
|
||||||
|
return MesExtEnumUtil.MONTH_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getDayShort(Date date) {
|
||||||
|
return TimeTool.getDay(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
|
||||||
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||||
|
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.StringJoiner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 门板及cnsl总成条码
|
||||||
|
* @Reference :
|
||||||
|
* @Author : junsheng.li
|
||||||
|
* @CreateDate 2024/9/27 13:23
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Component
|
||||||
|
public class MesDPBarcodeWhNumberRuleStrategyService implements INumberRulePackAttributeStrategyService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private MesCustomerPartRepository customerPartRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
|
||||||
|
//获取客户零件号
|
||||||
|
Map<String, Object> dataMap = genSerialNoModel.getDataMap();
|
||||||
|
MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ?
|
||||||
|
(MesCustomerPart) dataMap.get(MesCustomerPart.class.getSimpleName()) : getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo());
|
||||||
|
if (StringUtils.isEmpty(genSerialNoModel.getShiftCode()) || Objects.isNull(customerPart)) {
|
||||||
|
MesPcnException.throwMesBusiException("班次代码或客户零件号未维护");
|
||||||
|
}
|
||||||
|
genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
|
||||||
|
genSerialNoModel.setDynamicRule(new StringJoiner(MesPcnExtConstWords.COMMA).add(customerPart.getCustPartNo().substring(customerPart.getCustPartNo().length() - 4)).add(genSerialNoModel.getShiftCode()).toString());
|
||||||
|
Date date = new Date();
|
||||||
|
//年月日缩写
|
||||||
|
genSerialNoModel.setYear(getYearShort(date));
|
||||||
|
genSerialNoModel.setMonth(getMonthShort(date));
|
||||||
|
genSerialNoModel.setDay(getDayShort(date));
|
||||||
|
return genSerialNoModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getYearShort(Date date) {
|
||||||
|
return MesExtEnumUtil.YEAR_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getYear(date)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getMonthShort(Date date) {
|
||||||
|
return MesExtEnumUtil.MONTH_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getDayShort(Date date) {
|
||||||
|
return TimeTool.getDay(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
private MesCustomerPart getMesCustomerPart(String orgaizeCode, String partNo) {
|
||||||
|
if (StringUtils.isEmpty(orgaizeCode) || StringUtils.isEmpty(partNo)) return null;
|
||||||
|
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(orgaizeCode);
|
||||||
|
DdlPreparedPack.getStringEqualPack(partNo, MesPcnExtConstWords.ERP_PART_NO, ddlPackBean);
|
||||||
|
MesCustomerPart customerPart = customerPartRepository.getByProperty(ddlPackBean);
|
||||||
|
if (Objects.isNull(customerPart)) {
|
||||||
|
MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", partNo);
|
||||||
|
}
|
||||||
|
return customerPart;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,120 @@
|
|||||||
|
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.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.busi.ISyncFuncService;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.util.DateUtil;
|
||||||
|
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||||
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||||
|
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
|
||||||
|
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.util.MesExtEnumUtil;
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description :通用打印方式
|
||||||
|
* @Reference :
|
||||||
|
* @Author : junsheng.li
|
||||||
|
* @CreateDate 2024/9/26 18:20
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Component
|
||||||
|
@Slf4j
|
||||||
|
public class MesCommonPrintStrategy implements IPrintTemplateStrategyService {
|
||||||
|
@Autowired
|
||||||
|
private ISyncFuncService syncFuncService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SnowflakeIdMaker snowflakeIdMaker;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesPartService mesPartService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
|
||||||
|
String organizeCode = mesProduceSnPrintModel.getOrganizeCode();
|
||||||
|
//物料信息
|
||||||
|
MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
|
||||||
|
Map<String, Object> dataMap = genSerialNoModel.getDataMap();
|
||||||
|
MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) dataMap.get(MesCustomerPart.class.getSimpleName()) : null;
|
||||||
|
if (!Objects.isNull(customerPart)) {
|
||||||
|
genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
|
||||||
|
}
|
||||||
|
if (!isStep){
|
||||||
|
for (int i = 0; i < mesProduceSnPrintModel.getPrintQty(); i++) {
|
||||||
|
//保存条码信息
|
||||||
|
MesProduceSn produceSn = generateMesProduceSn(mesPart, syncFuncService.syncSerialNo(genSerialNoModel, mesProduceSnPrintModel.getUserName(), organizeCode, 1).getResultList().get(0).toString(), mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty());
|
||||||
|
//封装打印信息
|
||||||
|
MesProduceSnPrintDataModel printDataModel = getModel(produceSn, customerPart);
|
||||||
|
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{
|
||||||
|
MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
|
||||||
|
//封装打印信息
|
||||||
|
MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, customerPart);
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 MesProduceSnPrintDataModel getModel(MesProduceSn produceSn, MesCustomerPart customerPart) {
|
||||||
|
MesProduceSnPrintDataModel mesProduceSnPrintDataModel = new MesProduceSnPrintDataModel();
|
||||||
|
mesProduceSnPrintDataModel.setPartNo(produceSn.getPartNo());
|
||||||
|
mesProduceSnPrintDataModel.setPartName(produceSn.getPartName());
|
||||||
|
if (!Objects.isNull(customerPart)) {
|
||||||
|
mesProduceSnPrintDataModel.setCustPartNo(customerPart.getCustPartNo());
|
||||||
|
}
|
||||||
|
mesProduceSnPrintDataModel.setBarcode(produceSn.getProductSn());
|
||||||
|
mesProduceSnPrintDataModel.setPrintDate(TimeTool.getNowTime(true));
|
||||||
|
mesProduceSnPrintDataModel.setUserName(produceSn.getCreateUser());
|
||||||
|
mesProduceSnPrintDataModel.setProductDate(TimeTool.parseStringFormat(produceSn.getLotNo(), DateUtil.SHORT_FORMAT, "yyyy/MM/dd"));
|
||||||
|
return mesProduceSnPrintDataModel;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue