jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev-wuhan

Browse Source
tags/yfai-pcn-ext-v2.3
yxw 8 months ago
parent a2c80f138d f06716eec8
commit d5d51e0585
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyNosortContext.java
Unescape Escape View File

@ -97,6 +97,7 @@ public class MesProductionAssemblyNosortContext extends MesProductionAssemblyCon
public MesProductionAssemblyNosortContext copy(MesAssemblyNosortCfg assemblyNosortCfg) {
BeanUtils.copyProperties(assemblyNosortCfg, this);
this.sourceId = assemblyNosortCfg.getId();
if (StringUtils.isEmpty(this.routeSeq)) this.routeSeq = MesPcnExtConstWords.ZERO;
this.assemblyStatus = MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue();
if (!MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedScan(this.matchType)) this.assemblyStatus = MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue();
@ -115,8 +116,9 @@ public class MesProductionAssemblyNosortContext extends MesProductionAssemblyCon
return this;
}
public MesProductionAssemblyNosortContext copy(MesProductionAssembly mesProductionAssembly) {
BeanUtils.copyProperties(mesProductionAssembly, this);
public MesProductionAssemblyNosortContext copy(MesProductionAssembly productionAssembly) {
BeanUtils.copyProperties(productionAssembly, this);
this.sourceId = productionAssembly.getSourceId();
if (StringUtils.isEmpty(this.routeSeq)) this.routeSeq = MesPcnExtConstWords.ZERO;
this.assemblyStatus = MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue();
if (!MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedScan(this.matchType)) this.assemblyStatus = MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue();

Write Preview
Loading…
Cancel
Save