forked from I3-YF/i3plus-mes-pcn-yfai
Merge branch 'dev-wuhan' into dev-wuhan-temp
commit
9b685988ed
@ -0,0 +1,120 @@
|
|||||||
|
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.api.busi.IMesWorkOrderExtService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.util.StringUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
|
||||||
|
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.repository.MesWorkOrderRepository;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
|
import javax.persistence.EntityManager;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 保存加工单信息工步 【排序】
|
||||||
|
* @Reference :
|
||||||
|
* @Author : wangjie
|
||||||
|
* @CreateDate : 2024/6/11 18:50
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Slf4j
|
||||||
|
@Service("mesWorkOrderSaveSortStepService")
|
||||||
|
public class MesWorkOrderSaveSortStepService extends BaseStepService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesWorkOrderExtService workOrderExtService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private MesWorkOrderRepository workOrderRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private EntityManager entityManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StepResult execute(StationRequestBean reqBean) {
|
||||||
|
|
||||||
|
StationResultBean resultBean = new StationResultBean();
|
||||||
|
|
||||||
|
StepResult stepResult = StepResult.getSuccessComplete();
|
||||||
|
|
||||||
|
//获取上下文信息
|
||||||
|
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.dispatchCurCellEquipment(reqBean);
|
||||||
|
|
||||||
|
//配置错误 抛出异常
|
||||||
|
if (!productionProcessContext.getSuccess()) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||||
|
|
||||||
|
//存储生产过程上下文对象
|
||||||
|
productionProcessContextStepService.dispatchProductionProcessContext(reqBean, productionProcessContext);
|
||||||
|
|
||||||
|
//获取上下文产出零件数据信息集合
|
||||||
|
List<MesProductionPartContext> productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
|
||||||
|
|
||||||
|
//没有产出零件或者没有工单
|
||||||
|
if (CollectionUtils.isEmpty(productionPartContextList) || StringUtils.isEmpty(
|
||||||
|
productionPartContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).findFirst().get().getWorkOrderNo())) return stepResult;
|
||||||
|
|
||||||
|
//从上下文中取出工位对象
|
||||||
|
MesWorkCell workCell = productionProcessContext.getWorkCell();
|
||||||
|
|
||||||
|
//保存生产工单数据
|
||||||
|
doHandleWorkOrderData(reqBean, resultBean, productionPartContextList, workCell);
|
||||||
|
|
||||||
|
return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()), stepResult, "保存加工单信息成功!");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void doHandleWorkOrderData(StationRequestBean reqBean, StationResultBean resultBean, List<MesProductionPartContext> productionPartContextList, MesWorkCell workCell) {
|
||||||
|
|
||||||
|
for (MesProductionPartContext productionPartContext : productionPartContextList) {
|
||||||
|
|
||||||
|
if (null == productionPartContext || StringUtils.isEmpty(productionPartContext.getForeignKey())) continue;
|
||||||
|
|
||||||
|
Boolean isEndWorkCell = (StringUtils.isEmpty(workCell.getIsEndWorkCell()) || workCell.getIsEndWorkCell().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0) ? false : true;
|
||||||
|
|
||||||
|
if (!isEndWorkCell && productionPartContext.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) == 0) continue;
|
||||||
|
|
||||||
|
if (!isEndWorkCell) {
|
||||||
|
workOrderRepository.updateByProperties(
|
||||||
|
new String[]{MesPcnExtConstWords.ID},
|
||||||
|
new Object[]{productionPartContext.getId()},
|
||||||
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, MesPcnExtConstWords.WORK_ORDER_STATUS},
|
||||||
|
new Object[]{reqBean.getUserInfo(), (new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SSS)).format(new Date()), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()});
|
||||||
|
} else {
|
||||||
|
workOrderRepository.updateByProperties(
|
||||||
|
new String[]{MesPcnExtConstWords.ID},
|
||||||
|
new Object[]{productionPartContext.getId()},
|
||||||
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, MesPcnExtConstWords.WORK_ORDER_STATUS, MesPcnExtConstWords.COMPLATED_QTY, MesPcnExtConstWords.UN_COMPLATED_QTY},
|
||||||
|
new Object[]{reqBean.getUserInfo(), (new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SSS)).format(new Date()), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue(), new Double(1), new Double(0)});
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("工厂{}生产线{}工位{}:FSM STATE DISPATCHER --- DO STEP --- {} EXEC --- ORDER:{} --- UPDATE:[{}:{}]",
|
||||||
|
reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(),
|
||||||
|
StringUtil.toLowerCaseFirst(this.getClass().getSimpleName()), productionPartContext.getWorkOrderNo(), MesPcnExtConstWords.WORK_ORDER_STATUS, !isEndWorkCell ? MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue() : MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,74 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiParam;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.persistence.Column;
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class MesQueueOrderModel implements Serializable {
|
||||||
|
|
||||||
|
@ApiParam("区域代码")
|
||||||
|
private String areaCode;
|
||||||
|
|
||||||
|
@Column(name = "WORK_CENTER_CODE")
|
||||||
|
@ApiParam("工作中心")
|
||||||
|
private String workCenterCode;
|
||||||
|
|
||||||
|
@Column(name = "WORK_CELL_CODE")
|
||||||
|
@ApiParam("工位代码")
|
||||||
|
private String workCellCode;
|
||||||
|
|
||||||
|
@ApiParam("生产工单号")
|
||||||
|
private String workOrderNo;
|
||||||
|
|
||||||
|
@ApiParam("过程条码")
|
||||||
|
private String serialNumber;
|
||||||
|
|
||||||
|
@ApiParam("产品条码")
|
||||||
|
private String productSn;
|
||||||
|
|
||||||
|
@ApiParam("客户条码")
|
||||||
|
private String custSn;
|
||||||
|
|
||||||
|
@ApiParam("物料号")
|
||||||
|
private String partNo;
|
||||||
|
|
||||||
|
@ApiParam("物料名称")
|
||||||
|
private String partName;
|
||||||
|
|
||||||
|
@ApiParam("状态")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@ApiParam("零件生产组代码")
|
||||||
|
private String partProdGroupCode;
|
||||||
|
|
||||||
|
@ApiParam("零件生产组名称")
|
||||||
|
private String partProdGroupName;
|
||||||
|
|
||||||
|
@ApiParam("生产序号")
|
||||||
|
private Long produceSeq;
|
||||||
|
|
||||||
|
@ApiParam("工单序号")
|
||||||
|
private String workOrderSeq;
|
||||||
|
|
||||||
|
@ApiParam("车型大类")
|
||||||
|
private String carModelCode;
|
||||||
|
|
||||||
|
@ApiParam("客户订单号")
|
||||||
|
private String custOrderNo;
|
||||||
|
|
||||||
|
@ApiParam("客户物料号")
|
||||||
|
private String custPartNo;
|
||||||
|
|
||||||
|
@ApiParam(value = "工艺顺序号")
|
||||||
|
private Integer processSeq;
|
||||||
|
|
||||||
|
@ApiParam(value = "颜色")
|
||||||
|
private String color;
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue