diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEmergencyLocationService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEmergencyLocationService.java index 9828c77..84f1087 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEmergencyLocationService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEmergencyLocationService.java @@ -20,4 +20,7 @@ public interface IMesEmergencyLocationService { @ApiOperation("操作") void doAction(MesEmergencyLocationModel mesEmergencyLocationModel); + + @ApiOperation("发运出库") + void doShippingStockOutOnline(String organizeCode, String workOrderNo, String userName, boolean isShipping); } diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNumberRuleMatchDispatchService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNumberRuleMatchDispatchService.java index 5a4d7a5..36ca59b 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNumberRuleMatchDispatchService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNumberRuleMatchDispatchService.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionAssemblyContext; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -16,4 +19,13 @@ public interface IMesNumberRuleMatchDispatchService { @ApiOperation(value = "编码规则匹配") default Map matchNumberRule(String organizeCode, String sn, Object... params) { return null; } + @ApiOperation(value = "验证装配件条码在当前开模中的唯一性") + default Boolean checkAssemblySnUnique(MesWorkCenter workCenter, List prodRuleContextList, List productionAssemblyContextList, String assemblySn) { return true; } + + @ApiOperation(value = "验证装配件条码在当前开模中的唯一性") + default Boolean checkAssemblySnUnique(MesWorkCenter workCenter, List prodRuleContextList, String assemblySn) { return true; } + + @ApiOperation(value = "验证装配件条码在当前开模中的唯一性") + default Boolean checkAssemblySnUnique(List productionAssemblyContextList, String assemblySn) { return true; } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEmergencyLocationServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEmergencyLocationServiceImpl.java index dfd77de..fc33121 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEmergencyLocationServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesEmergencyLocationServiceImpl.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEmergencyLocationLogService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEmergencyLocationService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService; @@ -7,14 +8,17 @@ import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.StringUtilExt; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesEmergencyLocationModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +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.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesConfig; import cn.estsh.i3plus.pojo.mes.bean.MesEmergencyLocation; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.repository.MesConfigRepository; import cn.estsh.i3plus.pojo.mes.repository.MesEmergencyLocationRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -23,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -47,12 +52,29 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer @Autowired private IMesWorkOrderExtService mesWorkOrderExtService; + @Autowired + private IMesConfigService mesConfigService; + + @Autowired + private MesConfigRepository mesConfigRepository; + @Override public List findMesEmergencyLocationList(String organizeCode, String workCenterCode) { if (StringUtil.isEmptyAndNull(organizeCode) || StringUtil.isEmptyAndNull(workCenterCode)) { return null; } - return findMesEmergencyLocationList(organizeCode, CommonEnumUtil.VALID, workCenterCode); + List emergencyLocationList = findMesEmergencyLocationList(organizeCode, CommonEnumUtil.VALID, workCenterCode); + if(CollectionUtils.isEmpty(emergencyLocationList)){ + return emergencyLocationList; + } + int remindDay = Integer.parseInt(mesConfigService.getCfgValue(organizeCode, MesPcnExtConstWords.REMIND_DAY)); + //超过提醒天数标记黄色 + emergencyLocationList.forEach(location -> { + if (!StringUtil.isEmpty(location.getInDate()) && new Date().compareTo(DateUtil.addDays(location.getInDate(), remindDay)) > MesPcnExtConstWords.ZERO) { + location.setColor(MesExtEnumUtil.COLOR.YELLOW.getValue()); + } + }); + return emergencyLocationList; } @Override @@ -70,6 +92,30 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer } } + @Override + public void doShippingStockOutOnline(String organizeCode, String workOrderNo, String userName, boolean isShipping) { + if (StringUtil.isEmpty(organizeCode) || StringUtil.isEmpty(workOrderNo)) return; + //校验加工单信息 + MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(organizeCode, workOrderNo, null, isShipping); + if (Objects.isNull(locationWorkOrder)) return; + + locationWorkOrder.setOutDate(TimeTool.getNowTime(true)); + locationWorkOrder.setStockType(MesExtEnumUtil.EMERGENCY_LOCATION_STOCK_TYPE.EMERGENCY_LOCATION_STOCK_TYPE_20.getValue()); + ConvertBean.serviceModelUpdate(locationWorkOrder, userName); + //记录日志 + mesEmergencyLocationLogService.insertMesEmergencyLocationLog(locationWorkOrder); + //数据解绑 + locationWorkOrder.setWorkOrderNo(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setOfflineDate(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setCustPartNo(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setPartName(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setInDate(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setOutDate(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setVehicleNo(MesPcnExtConstWords.EMPTY); + locationWorkOrder.setSystemSyncStatus(CommonEnumUtil.FALSE); + mesEmergencyLocationRepository.update(locationWorkOrder); + } + private List findMesEmergencyLocationList(String organizeCode, Integer status, String workCenterCode) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean); @@ -105,23 +151,7 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer private void doStockOutOnline(MesEmergencyLocationModel model) { ValidatorBean.checkNotNull(model.getWorkOrderNo(), "加工单号不能为空"); - //校验加工单信息 - MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(model); - locationWorkOrder.setOutDate(TimeTool.getNowTime(true)); - locationWorkOrder.setStockType(MesExtEnumUtil.EMERGENCY_LOCATION_STOCK_TYPE.EMERGENCY_LOCATION_STOCK_TYPE_20.getValue()); - ConvertBean.serviceModelUpdate(locationWorkOrder, model.getUserName()); - //记录日志 - mesEmergencyLocationLogService.insertMesEmergencyLocationLog(locationWorkOrder); - //数据解绑 - locationWorkOrder.setWorkOrderNo(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setOfflineDate(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setCustPartNo(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setPartName(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setInDate(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setOutDate(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setVehicleNo(MesPcnExtConstWords.EMPTY); - locationWorkOrder.setSystemSyncStatus(CommonEnumUtil.FALSE); - mesEmergencyLocationRepository.update(locationWorkOrder); + doShippingStockOutOnline(model.getOrganizeCode(), model.getWorkOrderNo(), model.getUserName(), false); } private void doGpInspectionOnline(MesEmergencyLocationModel model) { @@ -131,7 +161,7 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer if (Objects.isNull(workOrder)) { MesPcnException.throwMesBusiException("加工单【%s】信息不存在", model.getWorkOrderNo()); } - MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(model); + MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(model.getOrganizeCode(), model.getWorkOrderNo(), model.getWorkCenterCode(), false); if (MesExtEnumUtil.EMERGENCY_LOCATION_STOCK_TYPE.EMERGENCY_LOCATION_STOCK_TYPE_30.getValue() == locationWorkOrder.getStockType()) { locationWorkOrder.setStockType(MesExtEnumUtil.EMERGENCY_LOCATION_STOCK_TYPE.EMERGENCY_LOCATION_STOCK_TYPE_40.getValue()); } else { @@ -149,6 +179,9 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer ValidatorBean.checkNotNull(model.getLocationNumber(), "库位数不能为空"); ValidatorBean.checkNotNull(model.getRemindDay(), "提醒天数不能为空"); List locationList = findMesEmergencyLocationList(model.getOrganizeCode(), null, model.getWorkCenterCode()); + //更新系统参数 + updateMesConfig(model); + int lastNumber = 0; if (!CollectionUtils.isEmpty(locationList)) { lastNumber = locationList.get(locationList.size() - MesPcnExtConstWords.ONE).getLocationNumber(); @@ -183,13 +216,24 @@ public class MesEmergencyLocationServiceImpl implements IMesEmergencyLocationSer } } - private MesEmergencyLocation getMesEmergencyLocation(MesEmergencyLocationModel model) { - MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(model.getOrganizeCode(), null, null, model.getWorkOrderNo()); - if (Objects.isNull(locationWorkOrder)) { - MesPcnException.throwMesBusiException("加工单【%s】应急件库位管理信息不存在", model.getWorkOrderNo()); + private void updateMesConfig(MesEmergencyLocationModel model) { + MesConfig remindDayCfg = mesConfigService.getMesConfig(model.getOrganizeCode(), MesPcnExtConstWords.REMIND_DAY); + if(model.getRemindDay() != Integer.parseInt(remindDayCfg.getCfgValue())){ + remindDayCfg.setCfgValue(model.getRemindDay().toString()); + ConvertBean.serviceModelUpdate(remindDayCfg, model.getUserName()); + mesConfigRepository.update(remindDayCfg); } - if (!model.getWorkCenterCode().equals(locationWorkOrder.getWorkCenterCode())) { - MesPcnException.throwMesBusiException("加工单【%s】所在产线【%s】与当前产线【%s】不匹配", model.getWorkOrderNo(), locationWorkOrder.getWorkCenterCode(), model.getWorkCenterCode()); + } + + private MesEmergencyLocation getMesEmergencyLocation(String organizeCode,String workOrderNo,String workCenterCode,boolean isShipping) { + MesEmergencyLocation locationWorkOrder = getMesEmergencyLocation(organizeCode, null, null, workOrderNo); + if (!isShipping){ + if (Objects.isNull(locationWorkOrder)) { + MesPcnException.throwMesBusiException("加工单【%s】应急件库位管理信息不存在", workOrderNo); + } + if (!workCenterCode.equals(locationWorkOrder.getWorkCenterCode())) { + MesPcnException.throwMesBusiException("加工单【%s】所在产线【%s】与当前产线【%s】不匹配", workOrderNo, locationWorkOrder.getWorkCenterCode(), workCenterCode); + } } return locationWorkOrder; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index 6caad26..7fa29bf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -90,6 +91,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService @Autowired private IMesEquipVariableRwExtService equipVariableRwExtService; + @Autowired + private IMesEmergencyLocationService mesEmergencyLocationService; + @Override public MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement) { //校验发运单 @@ -454,9 +458,12 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService workOrder.setShippingTime(TimeTool.getNowTime(true)); workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.SHIPPING.getValue()); produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE); - ConvertBean.serviceModelUpdate(workOrder, userInfo); + produceSn.setModifyUser(userInfo); + produceSn.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date())); mesWorkOrderList.add(workOrder); } + //更新应急件库位管理库存出库 + mesEmergencyLocationService.doShippingStockOutOnline(organizeCode, detail.getVisualOrderNo(), userInfo, true); } } //条码格式(扫描目视单,扫描条码) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesNumberRuleMatchDispatchService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesNumberRuleMatchDispatchService.java index b3843a2..b4355b7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesNumberRuleMatchDispatchService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesNumberRuleMatchDispatchService.java @@ -2,10 +2,12 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.rulematch; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesNumberRuleMatchDispatchService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionAssemblyContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionAssemblyNosortContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionAssemblySortContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleNosortCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import lombok.extern.slf4j.Slf4j; @@ -93,5 +95,44 @@ public class MesNumberRuleMatchDispatchService implements IMesNumberRuleMatchDis } + @Override + public Boolean checkAssemblySnUnique(MesWorkCenter workCenter, List prodRuleContextList, List productionAssemblyContextList, String assemblySn) { + if (!checkAssemblySnUnique(workCenter, prodRuleContextList, assemblySn)) return false; + if (!checkAssemblySnUnique(productionAssemblyContextList, assemblySn)) return false; + return true; + } + + @Override + public Boolean checkAssemblySnUnique(MesWorkCenter workCenter, List prodRuleContextList, String assemblySn) { + + if (CollectionUtils.isEmpty(prodRuleContextList)) return true; + + for (MesProdRuleContext prodRuleContext : prodRuleContextList) { + + if (null == prodRuleContext || StringUtils.isEmpty(prodRuleContext.getAssemblyDataJson())) continue; + + if (!checkAssemblySnUnique(prodRuleContext.getProductionAssemblyContextList(workCenter), assemblySn)) return false; + + } + + return true; + } + + @Override + public Boolean checkAssemblySnUnique(List productionAssemblyContextList, String assemblySn) { + + if (CollectionUtils.isEmpty(productionAssemblyContextList)) return true; + + for (MesProductionAssemblyContext productionAssemblyContext : productionAssemblyContextList) { + + if (null == productionAssemblyContext) continue; + + if (!StringUtils.isEmpty(productionAssemblyContext.getAssemblySn()) && productionAssemblyContext.getAssemblySn().equals(assemblySn)) return false; + + } + + return true; + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java index 09597cc..1d700f8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +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; @@ -143,6 +144,8 @@ public class MesAssemblyGeneratePartNoStepService extends BaseStepService { //获取设备下所有的装配件规则清单, 根据非排序加工规则ID分组 Map> assemblyNosortCfgMap = doHandleAssemblyNosortCfg(reqBean, resultBean, stepResult, cellEquipContext); + //无主条码则无加工规则, 有主条码可能无加工规则 + prodRuleContextList = CollectionUtils.isEmpty(prodRuleContextList) ? new ArrayList<>() : prodRuleContextList; //生成零件号业务处理 prodRuleContextList = doHandleAssemblyGeneratePartNo(reqBean, resultBean, stepResult, cellEquipContext, cavityUnknownCfg, productionProcessContext, productionPsInContextList, prodRuleContextList, assemblyNosortCfgMap, equipVariableCollectContextList); @@ -222,8 +225,9 @@ public class MesAssemblyGeneratePartNoStepService extends BaseStepService { private List doHandleAssemblyGeneratePartNo(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesCellEquipContext cellEquipContext, String cavityUnknownCfg, MesProductionProcessContext productionProcessContext, List productionPsInContextList, List prodRuleContextList, Map> assemblyNosortCfgMap, List equipVariableCollectContextList) { - //无主条码则无加工规则, 有主条码可能无加工规则 - prodRuleContextList = CollectionUtils.isEmpty(prodRuleContextList) ? new ArrayList<>() : prodRuleContextList; + //从上下文中取出生产线对象 + MesWorkCenter workCenter = productionProcessContext.getWorkCenter(); + //拿到当前最大的foreignKey Optional maxForeignKeyOptional = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).max(Comparator.comparing(MesProdRuleContext::getForeignKey)); Integer foreignKey = (null != maxForeignKeyOptional && maxForeignKeyOptional.isPresent()) ? maxForeignKeyOptional.get().getForeignKey() : MesPcnExtConstWords.ZERO; @@ -288,8 +292,17 @@ public class MesAssemblyGeneratePartNoStepService extends BaseStepService { } } - //装配件清单该数据标记已装配 - productionAssemblyNosortContext.assemblyStatus(equipVariableCollectContext.getEquipVariableValue()).productSnId(filter.getProductSnId()); + //验证返回result里面是否存在assemblySn,存在特殊的规则会转换成新的条码 + String assemblySn = !result.containsKey(MesPcnExtConstWords.ASSEMBLY_SN) ? equipVariableCollectContext.getEquipVariableValue() : (String) result.get(MesPcnExtConstWords.ASSEMBLY_SN); + + //验证规则且唯一/自制件 在当前开模内是否存在重复 + if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkUniqueRule(productionAssemblyNosortContext.getMatchType()) && !numberRuleMatchDispatchService.checkAssemblySnUnique(workCenter, prodRuleContextList, productionAssemblyNosortContextList, assemblySn)) { + stepResult.msg(String.format("%s[%s]不能重复装配!", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), assemblySn)); + continue; + } + + //装配件清单该数据标记已装配 (如果是自制件赋值productSnId) + productionAssemblyNosortContext.assemblyStatus(assemblySn).productSnId(filter.getProductSnId()); //临时数据标记已消费 equipVariableCollectContext.isConsume(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepServiceBak.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepServiceBak.java deleted file mode 100644 index 84f888d..0000000 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepServiceBak.java +++ /dev/null @@ -1,291 +0,0 @@ -package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; - -import cn.estsh.i3plus.ext.mes.pcn.api.busi.*; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*; -import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; -import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.IFsmCommonService; -import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -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 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 java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * @Description : 生成零件号工步 【非排序】 - * @Author : wangjie - **/ -@Slf4j -@Service("mesAssemblyGeneratePartNoStepServiceBak") -public class MesAssemblyGeneratePartNoStepServiceBak extends BaseStepService { - - @Autowired - private IFsmCommonService fsmCommonService; - - @Autowired - private IMesProductionProcessContextStepService productionProcessContextStepService; - - @Autowired - private IMesProductionDispatchContextStepService productionDispatchContextStepService; - - @Autowired - private IMesProductionCustomContextStepService productionCustomContextStepService; - - @Autowired - private IMesNumberRuleMatchDispatchService numberRuleMatchDispatchService; - - @Autowired - private MesAssemblyShowNosortStepService assemblyShowNosortStepService; - - @Autowired - private IMesAssemblyExtService assemblyExtService; - - @Autowired - private IMesProdRuleCfgExtService prodRuleCfgExtService; - - @Autowired - private IMesProductionRecordService productionRecordService; - - @Autowired - private IMesTimeEfficientCfgMatchService timeEfficientCfgMatchService; - - @Override - public StepResult execute(StationRequestBean reqBean) { - - StationResultBean resultBean = new StationResultBean(); - - StepResult stepResult = StepResult.getSuccessComplete().nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY); - - //获取上下文信息 - MesProductionProcessContext productionProcessContext = productionProcessContextStepService.dispatchCurCellEquipment(reqBean); - - //配置错误 抛出异常 - if (!productionProcessContext.getSuccess()) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage()); - - //存储生产过程上下文对象 - productionProcessContextStepService.dispatchProductionProcessContext(reqBean, productionProcessContext); - - if (productionDispatchContextStepService.checkProdRuleDataIsExistContext(reqBean)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前存在非排序加工规则数据,不支持执行当前工步,请重置工序!"); - if (productionDispatchContextStepService.checkProductionPartIsExistContext(reqBean)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前存在产出零件数据,不支持执行当前工步,请重置工序!"); - if (productionDispatchContextStepService.checkProductionPsInIsExistContext(reqBean)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前存在进料主条码数据,不支持执行当前工步,请重置工序!"); - - //获取上下文生产扫/读信息:装配件条码 - List equipVariableCollectContextList = productionDispatchContextStepService.getScanAssemblySnContext(reqBean); - if (CollectionUtils.isEmpty(equipVariableCollectContextList)) return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前不存在装配件条码!"); - - //删除上下文扫/读信息:装配件条码 - productionDispatchContextStepService.removeScanAssemblySnContext(reqBean); - - //从上下文中取出工位当前要使用的设备 - MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip(); - - //未知腔数配置【工位参数】, 不验证装配件条码的个数 - String cavityUnknownCfg = getCavityUnknownCfg(reqBean); - - //非未知腔数,验证装配件条码个数是否匹配 腔数*每腔个数 - if (StringUtils.isEmpty(cavityUnknownCfg) && equipVariableCollectContextList.size() != cellEquipContext.getCavity() * cellEquipContext.getBindQty()) - return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), - stepResult, String.format("当前装配件条码个数[%s]不满足腔数[%s]每腔个数[%s]配置!", equipVariableCollectContextList.size(), cellEquipContext.getCavity(), cellEquipContext.getBindQty())); - - //获取设备下所有的装配件规则清单, 根据非排序加工规则ID分组 - Map> assemblyNosortCfgMap = doHandleAssemblyNosortCfg(reqBean, resultBean, stepResult, cellEquipContext); - - //删除上下文扫/读信息:装配件条码 - productionDispatchContextStepService.removeScanAssemblySnContext(reqBean); - - //生成零件号业务处理 - List prodRuleContextList = doHandleAssemblyGeneratePartNo(reqBean, resultBean, stepResult, productionProcessContext, cellEquipContext, cavityUnknownCfg, assemblyNosortCfgMap, equipVariableCollectContextList); - - //搜集装配件条码 - String assemblySn = equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList()).toString(); - - //判断是否存在未消费的装配件条码 - Optional optional = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).findFirst(); - if (CollectionUtils.isEmpty(prodRuleContextList) || (null != optional && optional.isPresent())) { - - stepResult.msg(String.format("装配件条码%s匹配失败!%s", assemblySn, StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg())); - - this.sendMessage(reqBean, new StationResultBean().writeDbLog().scanInfo(assemblySn), - String.format("%s%s", stepResult.getMsg(), StringUtils.isEmpty(stepResult.getObj()) ? MesPcnExtConstWords.EMPTY : stepResult.getObj()), MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT); - - return stepNonCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, stepResult.getMsg()); - } - - //保存上下文产品加工规则信息集合 - productionDispatchContextStepService.dispatchProdRuleDataContext(reqBean, prodRuleContextList); - - //显示装配件信息 - assemblyShowNosortStepService.showProductionAssembly(reqBean, resultBean, productionProcessContext.getWorkCenter(), prodRuleContextList); - - return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(assemblySn), stepResult.nextTriggerEvent(null), String.format("装配件条码%s匹配成功!", assemblySn)); - - } - - //未知腔数配置【工位参数】 - private String getCavityUnknownCfg(StationRequestBean reqBean) { - String cavityUnknownCfg = fsmCommonService.handleFsmWcpcMapDataForDoScan(reqBean).get(MesPcnExtConstWords.CAVITY_UNKNOWN_CFG); - return (!StringUtils.isEmpty(cavityUnknownCfg) && cavityUnknownCfg.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) ? cavityUnknownCfg : null; - } - - //获取设备下所有的装配件规则清单, 根据非排序加工规则ID分组 - private Map> doHandleAssemblyNosortCfg(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesCellEquipContext cellEquipContext) { - - //查询工位设备装配件规则信息 - List assemblyNosortCfgList = productionProcessContextStepService.findAssemblyNosortCfgList(reqBean); - - //获取设备的装配件规则清单 - if (CollectionUtils.isEmpty(assemblyNosortCfgList) || !assemblyNosortCfgList.get(0).getEquipmentCode().equals(cellEquipContext.getEquipmentCode())) { - assemblyNosortCfgList = assemblyExtService.getProductionAssemblyNosortContextList(reqBean.getOrganizeCode(), cellEquipContext.getEquipmentCode()); - - if (CollectionUtils.isEmpty(assemblyNosortCfgList)) - stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), - String.format("生产线[%s]工位[%s]设备[%s]未维护含有装配件规则信息的非排序加工规则信息", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), cellEquipContext.getEquipmentName())); - - //存储设备的装配件清单 - productionProcessContextStepService.dispatchAssemblyNosortCfgContext(reqBean, assemblyNosortCfgList); - - } - - //根据非排序加工规则ID分组 - return assemblyNosortCfgList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPid()))).collect(Collectors.groupingBy(MesProductionAssemblyNosortContext::getPid)); - - } - - //生成零件号业务处理 - private List doHandleAssemblyGeneratePartNo(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, - MesCellEquipContext cellEquipContext, String cavityUnknownCfg, Map> assemblyNosortCfgMap, List equipVariableCollectContextList) { - - Integer foreignKey = 0; - List prodRuleContextList = null; - - //遍历非排序加工规则ID - for (Map.Entry> entry : assemblyNosortCfgMap.entrySet()) { - - if (null == entry) continue; - - //判断是否存在未消费的装配件条码 - Optional optional = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).findFirst(); - if (null == optional || !optional.isPresent()) break; - - //剔除不扫描/不显示且不扫描/仅目视的数据 - List productionAssemblyNosortContextList = entry.getValue().stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getMatchType()) && MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedScan(o.getMatchType()))).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(productionAssemblyNosortContextList)) continue; - - //没有未知腔数配置, 剔除装配件规则个数不等于每腔个数的数据 - if (StringUtils.isEmpty(cavityUnknownCfg) && cellEquipContext.getBindQty().compareTo(productionAssemblyNosortContextList.size()) != 0) continue; - - //遍历非排序加工规则ID对应的装配件规则清单 - for (MesProductionAssemblyNosortContext productionAssemblyNosortContext : productionAssemblyNosortContextList) { - - if (null == productionAssemblyNosortContext) continue; - - //非扫描模式 或者 扫描模式情况下非可复用件 - if (equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue()) != 0 || - StringUtils.isEmpty(productionAssemblyNosortContext.getIsRepeat()) || productionAssemblyNosortContext.getIsRepeat().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) { - - for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextList) { - - //已被消费 - if (null == equipVariableCollectContext || equipVariableCollectContext.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0) continue; - - //匹配规则 - Map result = numberRuleMatchDispatchService.matchNumberRule(reqBean.getOrganizeCode(), equipVariableCollectContext.getEquipVariableValue(), productionAssemblyNosortContext); - - //匹配失败 - if (!(Boolean) result.get(MesPcnExtConstWords.RESULT)) { - String msg = (String) result.get(MesPcnExtConstWords.MESSAGE); - stepResult.obj(String.format("%s%s", StringUtils.isEmpty(stepResult.getObj()) ? MesPcnExtConstWords.EMPTY : stepResult.getObj(), StringUtils.isEmpty(msg) ? MesPcnExtConstWords.EMPTY : msg)); - continue; - } - - MesProductionAssemblyNosortContext filter = (MesProductionAssemblyNosortContext) result.get(MesPcnExtConstWords.DATA); - - //前道防错 - if (!StringUtils.isEmpty(filter.getProductSnId()) && !StringUtils.isEmpty(productionAssemblyNosortContext.getPreCraftCode())) { - if (CollectionUtils.isEmpty(productionRecordService.findProductionRecordList(reqBean.getOrganizeCode(), equipVariableCollectContext.getEquipVariableValue(), productionAssemblyNosortContext.getPartNo(), productionAssemblyNosortContext.getPreCraftCode()))) { - stepResult.msg(String.format("%s%s", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), - String.format("零件条码[%s]前道防错零件号[%s]工艺[%s]验证失败,未查询到加工记录信息!", equipVariableCollectContext.getEquipVariableValue(), productionAssemblyNosortContext.getPartNo(), productionAssemblyNosortContext.getPreCraftCode()))); - continue; - } - } - - //时效性验证 - if (!StringUtils.isEmpty(filter.getProductSnId())) { - result = timeEfficientCfgMatchService.checkSnTimeliness(reqBean.getOrganizeCode(), equipVariableCollectContext.getEquipVariableValue(), filter.getSourceId(), MesExtEnumUtil.TIME_DATA_SOURCE.DATA_SOURCE30.getValue()); - if (!(Boolean)result.get(MesPcnExtConstWords.RESULT)) { - stepResult.msg(String.format("%s%s", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), result.get(MesPcnExtConstWords.MESSAGE))); - continue; - } - } - - //装配件清单该数据标记已装配 - productionAssemblyNosortContext.assemblyStatus(equipVariableCollectContext.getEquipVariableValue()).productSnId(filter.getProductSnId()); - - break; - - } - - } - - String getRepeatAssemblySn = getRepeatAssemblySn(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), productionAssemblyNosortContext); - if (!StringUtils.isEmpty(getRepeatAssemblySn)) productionAssemblyNosortContext.assemblyStatus(getRepeatAssemblySn); - - //判断当前装配件规则是否被成功匹配条码 - if (productionAssemblyNosortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) == 0) break; - - } - - //判断当前装配件规则清单是否完全匹配剩余未消费的条码 - Optional optionalRule = productionAssemblyNosortContextList.stream().filter(o -> (null != o && o.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) == 0)).findFirst(); - if (null != optionalRule && optionalRule.isPresent()) continue; - - //验证加工规则是否有效 - MesProdRuleContext prodRuleContext = prodRuleCfgExtService.getProdRuleNosortContextByPid(new MesProdRuleContext( - reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), reqBean.getProcessCode(), productionProcessContext.getCraftCode()).pid(productionAssemblyNosortContextList.get(0).getPid())); - - //根据PID获取非排序加工规则 数据无效 - if (null == prodRuleContext) continue; - - //装配件条码标记被消费状态 - productionAssemblyNosortContextList.forEach(o -> { - Optional evccOp = equipVariableCollectContextList.stream().filter(v -> (null != v && v.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0 && v.getEquipVariableValue().equals(o.getAssemblySn()))).findFirst(); - if (null != evccOp && evccOp.isPresent()) evccOp.get().isConsume(); - }); - - //加工规则赋值装配件数据 - prodRuleContext.assemblyDataJson(productionAssemblyNosortContextList).foreignKey(foreignKey += 1); - - if (CollectionUtils.isEmpty(prodRuleContextList)) prodRuleContextList = new ArrayList<>(); - prodRuleContextList.add(prodRuleContext); - - } - - return prodRuleContextList; - - } - - //验证装配件规则对应的ID是否存在可复用装配件条码 - private String getRepeatAssemblySn(String organizeCode, String workCenterCode, String workCellCode, MesProductionAssemblyNosortContext productionAssemblyNosortContext) { - - if (productionAssemblyNosortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) != 0) return null; - - if (null == productionAssemblyNosortContext || StringUtils.isEmpty(productionAssemblyNosortContext.getIsRepeat()) || productionAssemblyNosortContext.getIsRepeat().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0) return null; - - return productionCustomContextStepService.getRepeatAssemblySn(organizeCode, workCenterCode, workCellCode, productionAssemblyNosortContext.getSourceId().toString()); - - } - - -} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortRetrodictStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortRetrodictStepService.java index ff79ac1..814ed2c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortRetrodictStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortRetrodictStepService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +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; @@ -143,6 +144,8 @@ public class MesAssemblyMatchNosortRetrodictStepService extends BaseStepService //获取设备下所有的装配件规则清单, 根据非排序加工规则ID分组 Map> assemblyNosortCfgMap = doHandleAssemblyNosortCfg(reqBean, resultBean, stepResult, cellEquipContext); + //无主条码则无加工规则, 有主条码可能无加工规则 + prodRuleContextList = CollectionUtils.isEmpty(prodRuleContextList) ? new ArrayList<>() : prodRuleContextList; //生成零件号业务处理 prodRuleContextList = doHandleAssemblyGeneratePartNo(reqBean, resultBean, stepResult, cellEquipContext, cavityUnknownCfg, productionProcessContext, productionPsInContextList, prodRuleContextList, assemblyNosortCfgMap, equipVariableCollectContextList); @@ -222,8 +225,10 @@ public class MesAssemblyMatchNosortRetrodictStepService extends BaseStepService private List doHandleAssemblyGeneratePartNo(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesCellEquipContext cellEquipContext, String cavityUnknownCfg, MesProductionProcessContext productionProcessContext, List productionPsInContextList, List prodRuleContextList, Map> assemblyNosortCfgMap, List equipVariableCollectContextList) { - //无主条码则无加工规则, 有主条码可能无加工规则 - prodRuleContextList = CollectionUtils.isEmpty(prodRuleContextList) ? new ArrayList<>() : prodRuleContextList; + + //从上下文中取出生产线对象 + MesWorkCenter workCenter = productionProcessContext.getWorkCenter(); + //拿到当前最大的foreignKey Optional maxForeignKeyOptional = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).max(Comparator.comparing(MesProdRuleContext::getForeignKey)); Integer foreignKey = (null != maxForeignKeyOptional && maxForeignKeyOptional.isPresent()) ? maxForeignKeyOptional.get().getForeignKey() : MesPcnExtConstWords.ZERO; @@ -288,8 +293,17 @@ public class MesAssemblyMatchNosortRetrodictStepService extends BaseStepService } } - //装配件清单该数据标记已装配 - productionAssemblyNosortContext.assemblyStatus(equipVariableCollectContext.getEquipVariableValue()).productSnId(filter.getProductSnId()); + //验证返回result里面是否存在assemblySn,存在特殊的规则会转换成新的条码 + String assemblySn = !result.containsKey(MesPcnExtConstWords.ASSEMBLY_SN) ? equipVariableCollectContext.getEquipVariableValue() : (String) result.get(MesPcnExtConstWords.ASSEMBLY_SN); + + //验证规则且唯一/自制件 在当前开模内是否存在重复 + if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkUniqueRule(productionAssemblyNosortContext.getMatchType()) && !numberRuleMatchDispatchService.checkAssemblySnUnique(workCenter, prodRuleContextList, productionAssemblyNosortContextList, assemblySn)) { + stepResult.msg(String.format("%s[%s]不能重复装配!", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), assemblySn)); + continue; + } + + //装配件清单该数据标记已装配 (如果是自制件赋值productSnId) + productionAssemblyNosortContext.assemblyStatus(assemblySn).productSnId(filter.getProductSnId()); //临时数据标记已消费 equipVariableCollectContext.isConsume(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortStepService.java index dbe861d..88585c3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortStepService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; 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.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; @@ -113,7 +114,7 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService { Boolean isSkip = checkIsSkip(productionProcessContext, equipVariableCollectContextList); //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成] - Boolean result = doHandleMatchAssembly(reqBean, stepResult, prodRuleContextList, equipVariableCollectContextList, isSkip); + Boolean result = doHandleMatchAssembly(reqBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip); //验证是否存在待绑定数据 hasUnBindAssembly = hasUnBindAssembly(prodRuleContextList); @@ -223,7 +224,7 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService { } //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成] - private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, List prodRuleContextList, List equipVariableCollectContextList, Boolean isSkip) { + private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, MesWorkCenter workCenter, List prodRuleContextList, List equipVariableCollectContextList, Boolean isSkip) { //遍历产品加工规则 for (MesProdRuleContext prodRuleContext : prodRuleContextList) { @@ -296,13 +297,22 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService { } } + //验证返回result里面是否存在assemblySn,存在特殊的规则会转换成新的条码 + String assemblySn = !result.containsKey(MesPcnExtConstWords.ASSEMBLY_SN) ? equipVariableCollectContext.getEquipVariableValue() : (String) result.get(MesPcnExtConstWords.ASSEMBLY_SN); + + //验证规则且唯一/自制件 在当前开模内是否存在重复 + if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkUniqueRule(productionAssemblyNosortContext.getMatchType()) && !numberRuleMatchDispatchService.checkAssemblySnUnique(workCenter, prodRuleContextList, assemblySn)) { + stepResult.msg(String.format("%s[%s]不能重复装配!", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), assemblySn)); + continue; + } + //匹配成功 equipVariableCollectContext.isConsume(); flag = true; //装配件清单该数据标记已装配 (如果是自制件赋值productSnId) - productionAssemblyNosortContext.assemblyStatus(equipVariableCollectContext.getEquipVariableValue()).productSnId(filter.getProductSnId()); + productionAssemblyNosortContext.assemblyStatus(assemblySn).productSnId(filter.getProductSnId()); break; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java index 425b789..7ada9ea 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.IFsmCommonService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +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; @@ -89,7 +90,7 @@ public class MesAssemblyMatchSortStepService extends BaseStepService { Boolean isCavitySkip = checkIsCavitySkip(productionProcessContext, equipVariableCollectContextList); //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成] - Boolean result = doHandleMatchAssembly(reqBean, stepResult, prodRuleContextList, equipVariableCollectContextList, isSkip, isCavitySkip); + Boolean result = doHandleMatchAssembly(reqBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip, isCavitySkip); //验证是否存在待绑定数据 hasUnBindAssembly = hasUnBindAssembly(prodRuleContextList); @@ -167,7 +168,7 @@ public class MesAssemblyMatchSortStepService extends BaseStepService { } //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成] - private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, List prodRuleContextList, List equipVariableCollectContextList, Boolean isSkip, Boolean isCavitySkip) { + private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, MesWorkCenter workCenter, List prodRuleContextList, List equipVariableCollectContextList, Boolean isSkip, Boolean isCavitySkip) { //遍历产品加工规则 for (MesProdRuleContext prodRuleContext : prodRuleContextList) { @@ -264,13 +265,22 @@ public class MesAssemblyMatchSortStepService extends BaseStepService { } } + //验证返回result里面是否存在assemblySn,存在特殊的规则会转换成新的条码 + String assemblySn = !result.containsKey(MesPcnExtConstWords.ASSEMBLY_SN) ? equipVariableCollectContext.getEquipVariableValue() : (String) result.get(MesPcnExtConstWords.ASSEMBLY_SN); + + //验证规则且唯一/自制件 在当前开模内是否存在重复 + if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkUniqueRule(productionAssemblySortContext.getMatchType()) && !numberRuleMatchDispatchService.checkAssemblySnUnique(workCenter, prodRuleContextList, assemblySn)) { + stepResult.msg(String.format("%s[%s]不能重复装配!", StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg(), assemblySn)); + continue; + } + //匹配成功 equipVariableCollectContext.isConsume(); flag = true; - //装配件清单该数据标记已装配(验证返回result里面是否存在assemblySn,存在特殊的规则会转换成新的条码) (如果是自制件赋值productSnId) - productionAssemblySortContext.assemblyStatus(!result.containsKey(MesPcnExtConstWords.ASSEMBLY_SN) ? equipVariableCollectContext.getEquipVariableValue() : (String) result.get(MesPcnExtConstWords.ASSEMBLY_SN)).productSnId(filter.getProductSnId()); + //装配件清单该数据标记已装配 (如果是自制件赋值productSnId) + productionAssemblySortContext.assemblyStatus(assemblySn).productSnId(filter.getProductSnId()); break; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSeqCheckCustOrderNoStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSeqCheckCustOrderNoStepService.java index d480a62..bab75b4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSeqCheckCustOrderNoStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSeqCheckCustOrderNoStepService.java @@ -155,7 +155,7 @@ public class MesProductSeqCheckCustOrderNoStepService extends MesProductSeqCheck Map> custOrderNoMap = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getCustOrderNo()) && o.getCustOrderNo().length() > 3)).collect(Collectors.groupingBy(o -> o.getCustOrderNo().substring(0, 3))); workOrderList = CollectionUtils.isEmpty(custOrderNoMap) ? null : custOrderNoMap.get(productionPartContext.getCustOrderNo().substring(0, 3)); workOrderList = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesWorkOrder::getCustOrderNo).reversed()).collect(Collectors.toList()); - Optional workOrderOp = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> (null != o && o.getCustOrderNo().compareTo(productionPartContext.getCustOrderNo()) <= 0)).findFirst(); + Optional workOrderOp = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> (null != o && o.getCustOrderNo().compareTo(productionPartContext.getCustOrderNo()) < 0)).findFirst(); if (null == workOrderOp || !workOrderOp.isPresent()) return true; MesWorkOrder workOrder = workOrderOp.get(); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProdRuleContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProdRuleContext.java index 912f767..94abe1f 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProdRuleContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProdRuleContext.java @@ -231,6 +231,12 @@ public class MesProdRuleContext implements Serializable { return this; } + //根据生产线类型返回装配件数据集合 + public List getProductionAssemblyContextList(MesWorkCenter workCenter) { + if (StringUtils.isEmpty(this.assemblyDataJson)) return null; + return workCenter.getCenterType().compareTo(MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue()) == 0 ? getNosortAssemblyDataContext() : getSortAssemblyDataContext(); + } + //根据生产线类型返回装配件数据集合【向上转型】 public List getAssemblyDataContext(MesWorkCenter workCenter) { if (StringUtils.isEmpty(this.assemblyDataJson)) return null; 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 ae6f921..7c51cd1 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 @@ -257,6 +257,8 @@ public class MesPcnExtConstWords { public static final String LOCATION = "location"; //库位序号 public static final String LOCATION_NUMBER = "locationNumber"; + //提醒天数 + public static final String REMIND_DAY = "REMIND_DAY"; //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties)