修复上料问题

mes-uat-changshu0609^2
jason 3 weeks ago
parent 963c87f432
commit ca33e99050

@ -164,7 +164,8 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
.craftJumpCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.CRAFT_JUMP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.CRAFT_JUMP_CODE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.CRAFT_JUMP_CODE)
.assemblySkipCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.ASSEMBLY_SKIP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.ASSEMBLY_SKIP_CODE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.ASSEMBLY_SKIP_CODE)
.assemblyCavitySkipCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE)
.sortSuspiciousCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.SORT_SUSPICIOUS_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.SORT_SUSPICIOUS_CODE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.SORT_SUSPICIOUS_CODE);
.sortSuspiciousCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.SORT_SUSPICIOUS_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.SORT_SUSPICIOUS_CODE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.SORT_SUSPICIOUS_CODE)
.containerBindClosePackage((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.MATCH_STEP_CONTAINER_BIND_CLOSE_PACKAGE)) ? cfgKeyMap.get(MesPcnExtConstWords.MATCH_STEP_CONTAINER_BIND_CLOSE_PACKAGE).get(0).getCfgValue().toUpperCase() : MesPcnExtConstWords.MATCH_STEP_CONTAINER_BIND_CLOSE_PACKAGE);
}
//验证组织模型有效性

@ -57,6 +57,9 @@ public class MesProductionProcessContext implements Serializable {
@ApiParam("排序线可疑码")
private String sortSuspiciousCode;
@ApiParam("工步上料关箱码")
private String containerBindClosePackage;
@ApiParam("生产线信息([Json]MesWorkCenter)")
private String workCenterJson;
@ -162,6 +165,12 @@ public class MesProductionProcessContext implements Serializable {
return this.isNeedCache();
}
//工步上料关箱码
public MesProductionProcessContext containerBindClosePackage(String containerBindClosePackage) {
this.containerBindClosePackage = containerBindClosePackage;
return this.isNeedCache();
}
//---------------------- 生产线对象 ---------------------------------------

@ -463,6 +463,8 @@ public class MesPcnExtConstWords {
public static final String ASSEMBLY_CAVITY_SKIP_CODE = "ASSEMBLY_CAVITY_SKIP_CODE";
// 排序线可疑码
public static final String SORT_SUSPICIOUS_CODE = "SORT_SUSPICIOUS_CODE";
// 工步上料关箱码
public static final String MATCH_STEP_CONTAINER_BIND_CLOSE_PACKAGE = "MATCH_STEP_CONTAINER_BIND_CLOSE_PACKAGE";
// 设备代码[工步参数]
public static final String EQUIPMENT_CODE_UC = "EQUIPMENT_CODE";
// 模具号读一模多腔配置[工步参数]
@ -751,8 +753,6 @@ public class MesPcnExtConstWords {
public static final String MATCH_STATION_FEED_SCAN_SN_CONTEXT = "MATCH_STATION_FEED_SCAN_SN_CONTEXT";
// 用于缺料时进行上料扫描上料绑定的容器条码
public static final String MATCH_STATION_FEED_CONTAINER_SN_CONTEXT = "MATCH_STATION_FEED_CONTAINER_SN_CONTEXT";
// 工步上料关箱码
public static final String MATCH_STATION_FEED_CLOSE_PACKAGE = "MATCH_STATION_FEED_CLOSE_PACKAGE";
//OPC_API_PARAM

Loading…
Cancel
Save