forked from I3-YF/i3plus-mes-pcn-yfai
Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev
gsz
1 year ago
commit
2438909a65
@ -0,0 +1,96 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesCustomerOriganizeRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.Month;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @Description : 广州打印主条码使用
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/6 17:03
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class AionPrintStrategy implements IPrintTemplateStrategyService {
|
||||
|
||||
@Autowired
|
||||
private MesPartRepository mesPartRao;
|
||||
@Override
|
||||
public Map<String,Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
//零件条码中获取 serialNo
|
||||
String productSn = sn.getProductSn();
|
||||
//构造标签
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String partNo = sn.getPartNo();
|
||||
String partName = sn.getPartName();
|
||||
String factoryName = AuthUtil.getOrganize().getName();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
String productDate = now.format(formatter);
|
||||
int no = 1;
|
||||
String noStr = String.format("%07d", no);
|
||||
|
||||
//构造二维码
|
||||
StringBuilder barcode = new StringBuilder();
|
||||
barcode.append("+");
|
||||
//第二位 是零件简号 零件扩展信息中的 零件条码参数 字段
|
||||
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getStringEqualPack(partNo,"partNo",partPackBean);
|
||||
List<MesPart> parts = mesPartRao.findByHqlWhere(partPackBean);
|
||||
if (!parts.isEmpty()){
|
||||
MesPart mesPart = parts.get(0);
|
||||
String partSnParam = mesPart.getPartSnParam();
|
||||
if (partSnParam!=null && !partSnParam.isEmpty()){
|
||||
barcode.append(partSnParam);
|
||||
}else {
|
||||
log.error("零件号:{},缺少配置零件扩展属性的 零件条码参数",partNo);
|
||||
}
|
||||
}
|
||||
//第三位 供应商代码 // 配置表
|
||||
String supplierCode = "VD501";
|
||||
barcode.append(supplierCode);
|
||||
//第四位 生产线代号 // 配置表
|
||||
String workCenterCode = "1";
|
||||
barcode.append(workCenterCode);
|
||||
//第五位 生产年月日
|
||||
int year = now.getYear();
|
||||
int month = now.getMonth().getValue();
|
||||
int day = now.getDayOfMonth();
|
||||
String yearStr = MesExtEnumUtil.YEAR_SHORT.valueOfDescription(year);
|
||||
String monthStr = MesExtEnumUtil.MONTH_SHORT.valueOfDescription(month);
|
||||
String dayStr = MesExtEnumUtil.NUM_SCALE_34.valueOfDescription(day);
|
||||
barcode.append(yearStr);
|
||||
barcode.append(monthStr);
|
||||
barcode.append(dayStr);
|
||||
//第六位 供应商生产流水号
|
||||
//第七位 软件版本代号
|
||||
map.put("partNo",partNo);
|
||||
map.put("partName",partName);
|
||||
map.put("factoryName",factoryName);
|
||||
map.put("productDate",productDate);
|
||||
map.put("no",noStr);
|
||||
map.put("barcode",barcode.toString());
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/17 16:10
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
|
||||
@Override
|
||||
public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
|
||||
String partNo = sn.getPartNo();
|
||||
String partName = sn.getPartName();
|
||||
String factoryName = AuthUtil.getOrganize().getName();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy/MM/dd");
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
String productDate = now.format(formatter);
|
||||
|
||||
//构造二维码
|
||||
StringBuilder barcode = new StringBuilder();
|
||||
|
||||
//第三位 供应商代码 // 配置表
|
||||
String supplierCode = "VD501";
|
||||
barcode.append(supplierCode);
|
||||
//第四位 生产线代号 // 配置表
|
||||
String workCenterCode = "1";
|
||||
barcode.append(workCenterCode);
|
||||
|
||||
int no = 1;
|
||||
String noStr = String.format("%07d", no);
|
||||
map.put("no",noStr);
|
||||
map.put("partNo", partNo);
|
||||
map.put("partName", partName);
|
||||
map.put("factoryName", factoryName);
|
||||
map.put("productDate", productDate);
|
||||
map.put("barcode", barcode.toString());
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/17 16:10
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
|
||||
@Override
|
||||
public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
|
||||
String partNo = sn.getPartNo();
|
||||
String partName = sn.getPartName();
|
||||
String factoryName = AuthUtil.getOrganize().getName();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy/MM/dd");
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
String productDate = now.format(formatter);
|
||||
|
||||
//构造二维码
|
||||
StringBuilder barcode = new StringBuilder();
|
||||
|
||||
//第三位 供应商代码 // 配置表
|
||||
String supplierCode = "VD501";
|
||||
barcode.append(supplierCode);
|
||||
//第四位 生产线代号 // 配置表
|
||||
String workCenterCode = "1";
|
||||
barcode.append(workCenterCode);
|
||||
|
||||
int no = 1;
|
||||
String noStr = String.format("%07d", no);
|
||||
map.put("no",noStr);
|
||||
map.put("partNo", partNo);
|
||||
map.put("partName", partName);
|
||||
map.put("factoryName", factoryName);
|
||||
map.put("productDate", productDate);
|
||||
map.put("barcode", barcode.toString());
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 广州打印主条码使用
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/6 17:03
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class GzPrintSnStrategy implements IPrintTemplateStrategyService {
|
||||
@Autowired
|
||||
private MesLabelTemplateRepository labelTemplateRao;
|
||||
@Override
|
||||
public List<Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
//1.根据 templateCode
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/17 16:43
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class NoSortBarCodeGzNewStrategy implements IPrintTemplateStrategyService {
|
||||
@Override
|
||||
public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
//从条码中截取流水号，流水号 后四位
|
||||
String productSn = sn.getProductSn();
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
String partNo = sn.getPartNo();
|
||||
String partName = sn.getPartName();
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
|
||||
String productDateTime = now.format(formatter);
|
||||
map.put("partNo",partNo);
|
||||
map.put("partName",partName);
|
||||
map.put("productDateTime",productDateTime);
|
||||
map.put("barcode",productSn);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : Castle
|
||||
* @CreateDate : 2024/6/17 16:31
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class NoSortBarCodeGzStrategy implements IPrintTemplateStrategyService {
|
||||
@Override
|
||||
public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
|
||||
String partNo = sn.getPartNo();
|
||||
String partName = sn.getPartName();
|
||||
String factoryName = AuthUtil.getOrganize().getName();
|
||||
String supplierCode = "VD501";
|
||||
int no = 1;
|
||||
String noStr = String.format("%04d", no);
|
||||
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
|
||||
String productDateTime = now.format(formatter);
|
||||
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
String productDate = now.format(dateFormatter);
|
||||
StringBuilder barcode = new StringBuilder(partNo);
|
||||
barcode.append(partName);
|
||||
barcode.append(productDate);
|
||||
barcode.append(noStr);
|
||||
|
||||
map.put("partNo", partNo);
|
||||
map.put("partName", partName);
|
||||
map.put("factoryName", factoryName);
|
||||
map.put("supplierCode", supplierCode);
|
||||
map.put("productDate", productDateTime);
|
||||
map.put("no", noStr);
|
||||
map.put("barcode", barcode.toString());
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesProductionAssemblyRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
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.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description : 保存装配记录工步 【非排序】
|
||||
* @Author : wangjie
|
||||
**/
|
||||
@Slf4j
|
||||
@Service("mesAssemblySaveNosortStepService")
|
||||
public class MesAssemblySaveNosortStepService extends BaseStepService {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductionAssemblyRepository productionAssemblyRepository;
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
|
||||
//获取上下文信息
|
||||
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||
|
||||
//配置错误 抛出异常
|
||||
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||
|
||||
//存储生产过程上下文对象
|
||||
productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
|
||||
|
||||
//获取上下文产品加工规则数据信息集合
|
||||
List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
|
||||
|
||||
if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
|
||||
|
||||
//获取上下文产出条码数据信息集合
|
||||
List<MesProductionPsOutContext> productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean);
|
||||
|
||||
if (CollectionUtils.isEmpty(productionPsOutContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中不存在产出零件条码信息,请重置工序解决!");
|
||||
|
||||
//从上下文中取出工位当前要使用的设备
|
||||
MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
|
||||
|
||||
Map<Integer, MesProductionPsOutContext> ppMap = CollectionUtils.isEmpty(productionPsOutContextList) ? null : productionPsOutContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsOutContext::getForeignKey, o -> o));
|
||||
|
||||
//保存装配记录
|
||||
prodRuleContextList.stream().filter(o -> null != o).forEach(o -> saveProductionAssemblyData(reqBean, resultBean, stepResult, productionProcessContext, o, ppMap, cellEquipContext));
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存装配记录成功!");
|
||||
|
||||
}
|
||||
|
||||
private void saveProductionAssemblyData(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult,
|
||||
MesProductionProcessContext productionProcessContext, MesProdRuleContext prodRuleContext, Map<Integer, MesProductionPsOutContext> ppMap, MesCellEquipContext cellEquipContext) {
|
||||
|
||||
if (StringUtils.isEmpty(prodRuleContext.getAssemblyDataJson())) return;
|
||||
|
||||
List<MesProductionAssemblyNosortContext> productionAssemblyNosortContextList = prodRuleContext.getNosortAssemblyDataContext();
|
||||
|
||||
MesProductionPsOutContext productionPsOutContext = CollectionUtils.isEmpty(ppMap) ? null : ppMap.get(prodRuleContext.getForeignKey());
|
||||
|
||||
for (MesProductionAssemblyNosortContext productionAssemblyNosortContext : productionAssemblyNosortContextList) {
|
||||
|
||||
if (null == productionAssemblyNosortContext) continue;
|
||||
|
||||
MesProductionAssembly productionAssembly = new MesProductionAssembly();
|
||||
BeanUtils.copyProperties(productionAssemblyNosortContext, productionAssembly);
|
||||
|
||||
productionAssembly.setDataSource(MesExtEnumUtil.PRODUCTION_ASSEMBLY_DATA_SOURCE.NOSORT.getValue());
|
||||
productionAssembly.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
|
||||
|
||||
productionAssembly.setAreaCode(reqBean.getWorkCenterCode());
|
||||
productionAssembly.setWorkCenterCode(reqBean.getWorkCenterCode());
|
||||
productionAssembly.setWorkCellCode(reqBean.getWorkCellCode());
|
||||
productionAssembly.setProcessCode(reqBean.getProcessCode());
|
||||
|
||||
productionAssembly.setProcessName(productionProcessContext.getProcessName());
|
||||
productionAssembly.setCraftCode(productionProcessContext.getCraftCode());
|
||||
productionAssembly.setCraftName(productionProcessContext.getCraftName());
|
||||
|
||||
productionAssembly.setEquipmentCode(cellEquipContext.getEquipmentCode());
|
||||
|
||||
productionAssembly.setProductionRecordId(prodRuleContext.getProductionRecordId());
|
||||
productionAssembly.setMouldNo(prodRuleContext.getMouldNo());
|
||||
|
||||
if (null != productionPsOutContext) {
|
||||
productionAssembly.setPartNo(productionPsOutContext.getPartNo());
|
||||
productionAssembly.setPartName(productionPsOutContext.getPartName());
|
||||
productionAssembly.setSerialNumber(productionPsOutContext.getSerialNumber());
|
||||
productionAssembly.setProductSn(productionPsOutContext.getProductSn());
|
||||
productionAssembly.setCustSn(productionPsOutContext.getCustSn());
|
||||
}
|
||||
|
||||
//TODO 赋开模记录ID
|
||||
//productionAssembly.setMouldRecordId();
|
||||
|
||||
productionAssembly.setOrganizeCode(reqBean.getOrganizeCode());
|
||||
ConvertBean.serviceModelInitialize(productionAssembly, reqBean.getUserInfo());
|
||||
|
||||
productionAssemblyRepository.insert(productionAssembly);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description : 保存装配记录工步
|
||||
* @Author : wangjie
|
||||
**/
|
||||
@Slf4j
|
||||
@Service("mesAssemblySaveStepService")
|
||||
public class MesAssemblySaveStepService extends BaseStepService {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
|
||||
//获取上下文信息
|
||||
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||
|
||||
//配置错误 抛出异常
|
||||
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||
|
||||
//存储生产过程上下文对象
|
||||
productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
|
||||
|
||||
//从上下文中取出生产线对象
|
||||
MesWorkCenter workCenter = productionProcessContext.getWorkCenter();
|
||||
|
||||
//排序线 保存装配记录工步
|
||||
if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workCenter.getCenterType()) return ((IStepService) SpringContextsUtil.getBean("mesAssemblySaveSortStepService")).execute(reqBean);
|
||||
|
||||
//非排序线 保存装配记录工步
|
||||
return ((IStepService) SpringContextsUtil.getBean("mesAssemblySaveNosortStepService")).execute(reqBean);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @Description : 保存加工结果工步
|
||||
* @Author : wangjie
|
||||
**/
|
||||
@Slf4j
|
||||
@Service("mesProductionDataSaveStepService")
|
||||
public class MesProductionDataSaveStepService extends BaseStepService {
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
|
||||
//保存开模记录工步
|
||||
//((IStepService) SpringContextsUtil.getBean("")).execute(reqBean);
|
||||
|
||||
//保存零件条码信息工步
|
||||
((IStepService) SpringContextsUtil.getBean("mesProductSnSaveStepService")).execute(reqBean);
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(5000L);
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
|
||||
//加工异常处理工步【此工步未整改】
|
||||
//((IStepService) SpringContextsUtil.getBean("mesProductResultErrorHandleStepService")).execute(reqBean);
|
||||
|
||||
//生成加工记录工步
|
||||
((IStepService) SpringContextsUtil.getBean("mesProductionRecordGenerateStepService")).execute(reqBean);
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(5000L);
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
|
||||
//保存装配记录工步
|
||||
((IStepService) SpringContextsUtil.getBean("mesAssemblySaveStepService")).execute(reqBean);
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(5000L);
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
|
||||
//生产汇报工步 【此工步未整改】
|
||||
//((IStepService) SpringContextsUtil.getBean("mesReportGenerateStepService")).execute(reqBean);
|
||||
|
||||
//保存工单信息工步
|
||||
//((IStepService) SpringContextsUtil.getBean("")).execute(reqBean);
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存加工结果成功!");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,132 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
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.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description : 生成加工记录工步
|
||||
* @Author : wangjie
|
||||
**/
|
||||
@Slf4j
|
||||
@Service("mesProductionRecordGenerateStepService")
|
||||
public class MesProductionRecordGenerateStepService extends BaseStepService {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductionRecordRepository productionRecordRepository;
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
|
||||
//获取上下文信息
|
||||
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||
|
||||
//配置错误 抛出异常
|
||||
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||
|
||||
//存储生产过程上下文对象
|
||||
productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
|
||||
|
||||
//获取上下文产品加工规则数据信息集合
|
||||
List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
|
||||
|
||||
if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
|
||||
|
||||
//获取上下文产出条码数据信息集合
|
||||
List<MesProductionPsOutContext> productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean);
|
||||
|
||||
if (CollectionUtils.isEmpty(productionPsOutContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中不存在产出零件条码信息,请重置工序解决!");
|
||||
|
||||
//获取上下文(头道)模具号
|
||||
MesEquipVariableCollectContext equipVariableCollectContext = productionDispatchContextStepService.getFirstMouldNoContext(reqBean);
|
||||
if (null == equipVariableCollectContext) equipVariableCollectContext = productionDispatchContextStepService.getMouldNoContext(reqBean);
|
||||
|
||||
//从上下文中取出工位当前要使用的设备
|
||||
MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
|
||||
|
||||
Map<Integer, MesProdRuleContext> prMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o));
|
||||
|
||||
//生成加工记录
|
||||
String mouldNo = null != equipVariableCollectContext ? equipVariableCollectContext.getEquipVariableValue() : null;
|
||||
productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> saveProductionRecordData(reqBean, mouldNo, prodRuleContextList, productionProcessContext, o, prMap, cellEquipContext));
|
||||
|
||||
//保存上下文产品加工规则信息集合
|
||||
productionDispatchContextStepService.saveProdRuleDataContext(reqBean, prodRuleContextList);
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "生成加工记录成功!");
|
||||
|
||||
}
|
||||
|
||||
private void saveProductionRecordData(StationRequestBean reqBean, String mouldNo, List<MesProdRuleContext> prodRuleContextList,
|
||||
MesProductionProcessContext productionProcessContext, MesProductionPsOutContext productionPsOutContext, Map<Integer, MesProdRuleContext> prMap, MesCellEquipContext cellEquipContext) {
|
||||
|
||||
MesProdRuleContext prodRuleContext = CollectionUtils.isEmpty(prMap) ? null : prMap.get(productionPsOutContext.getForeignKey());
|
||||
|
||||
MesProductionRecord productionRecord = new MesProductionRecord();
|
||||
BeanUtils.copyProperties(productionPsOutContext, productionRecord);
|
||||
|
||||
productionRecord.setMouldNo(mouldNo);
|
||||
productionRecord.setEquipmentCode(cellEquipContext.getEquipmentCode());
|
||||
productionRecord.setEquipmentName(cellEquipContext.getEquipmentName());
|
||||
|
||||
productionRecord.setReportType((null != prodRuleContext && !StringUtils.isEmpty(prodRuleContext.getReportType())) ? prodRuleContext.getReportType() : MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue());
|
||||
if (MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue() != productionRecord.getReportType()) productionRecord.setReportPartNo(productionPsOutContext.getPartNo());
|
||||
productionRecord.setReportStatus(MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue() != productionRecord.getReportType() ? MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue() : MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());
|
||||
|
||||
productionRecord.setModuleStatisticsStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
|
||||
|
||||
productionRecord.setAreaCode(reqBean.getWorkCenterCode());
|
||||
productionRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
|
||||
productionRecord.setWorkCellCode(reqBean.getWorkCellCode());
|
||||
productionRecord.setProcessCode(reqBean.getProcessCode());
|
||||
productionRecord.setCraftCode(productionProcessContext.getCraftCode());
|
||||
|
||||
//TODO 赋开模记录ID
|
||||
//productionRecord.setMouldRecordId();
|
||||
//TODO 工序开始时间
|
||||
//productionRecord.setStartDateTime();
|
||||
|
||||
productionRecord.setIsComplete(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
|
||||
|
||||
productionRecord.setOrganizeCode(reqBean.getOrganizeCode());
|
||||
ConvertBean.serviceModelInitialize(productionRecord, reqBean.getUserInfo());
|
||||
productionRecord.setCompleteDateTime(productionRecord.getModifyDatetime());
|
||||
|
||||
productionRecord = productionRecordRepository.insert(productionRecord);
|
||||
|
||||
if (null != prodRuleContext) prodRuleContextList.stream().filter(o -> (null != o &&
|
||||
!StringUtils.isEmpty(o.getForeignKey()) && o.getForeignKey().compareTo(productionPsOutContext.getForeignKey()) == 0)).findFirst().get().productionRecordId(productionRecord.getId()).mouldNo(mouldNo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
25
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepServiceBak.java
25
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepServiceBak.java
@ -1,105 +0,0 @@
|
||||
/*
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.ActorSystem;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import com.google.common.base.Objects;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
*/
|
||||
/**
|
||||
* @Description : 保存装配件
|
||||
* @Author : zxw
|
||||
**//*
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesSaveAssemblyStepService extends BaseStepService {
|
||||
@Autowired
|
||||
private SnowflakeIdMaker snowflakeIdMaker;
|
||||
|
||||
@Autowired
|
||||
private ActorSystem actorSystem;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesVariableWhenFinishedReadStepService mesVariableWhenFinishedReadStepService;
|
||||
|
||||
@Autowired
|
||||
private MesMouldRecordGenerateStepService mesMouldRecordGenerateStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductSnSaveStepService MesProductSnSaveStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductionReocrdGenerateStepService mesProductionReocrdGenerateStepService;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductResultErrorHandleStepService mesProductResultErrorHandleStepService;
|
||||
|
||||
@Autowired
|
||||
private MesReportGenerateStepService mesReportGenerateStepService;
|
||||
|
||||
public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT";
|
||||
|
||||
private static final Map<String, ActorRef> refMap = new ConcurrentHashMap<>(200);
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
*/
|
||||
/**
|
||||
* 获取上下文
|
||||
*//*
|
||||
|
||||
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue());
|
||||
MesWorkCell mesWorkCell = productionProcessContext.getWorkCell();
|
||||
|
||||
List<MesProductionPsOutContext> mesProduceSnContexts = mesProductionDispatchContextStepService.getProductionPsOutContext(reqBean);
|
||||
|
||||
List<MesProductionRecord> mesProductionRecords = new ArrayList<>();
|
||||
mesProduceSnContexts.forEach(mesProductionPsOutContext -> {
|
||||
|
||||
MesProductionRecord mesProductionRecord = getMesProductionRecord(productionProcessContext, mesProductionPsOutContext, reqBean);
|
||||
ConvertBean.serviceModelInitialize(mesProductionRecord, reqBean.getUserInfo());
|
||||
mesProductionRecords.add(mesProductionRecord);
|
||||
});
|
||||
|
||||
mesProductionRecordRepository.saveAll(mesProductionRecords);
|
||||
if (Objects.equal(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),mesWorkCell.getIsCountFinish())) {
|
||||
// 保存班次加工数量上下文
|
||||
productionCustomContextStepService.addProductionStatisticsContext(reqBean,mesProduceSnContexts.size());
|
||||
}
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "生成加工记录成功");
|
||||
}
|
||||
}
|
||||
*/
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
public class MesOrderModel implements Serializable {
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String productSn;
|
||||
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue