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

Merge branch 'test-temp-wj-250117-pack' into dev

Browse Source
dev-temp-nht-202502180000-customprint
王杰 9 months ago
parent 941b979c49 32b9447a35
commit ba025d2f01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java
Unescape Escape View File

@ -193,7 +193,7 @@ public class MesFunctionPackagePartService extends BaseSwsService implements IFs
MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(productionPartContext.getPartNo()); MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(productionPartContext.getPartNo());
if (null == packageRuleContext) { if (null == packageRuleContext) {
packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, productionPartContext.getPartNo(), false); packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, productionPartContext.getPartNo(), true);
if (null != packageRuleContext) packageRuleContextMap.put(productionPartContext.getPartNo(), packageRuleContext); if (null != packageRuleContext) packageRuleContextMap.put(productionPartContext.getPartNo(), packageRuleContext);
} }
if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext); if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext);
@ -216,7 +216,7 @@ public class MesFunctionPackagePartService extends BaseSwsService implements IFs
MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(prodRuleContext.getOutPartNo()); MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(prodRuleContext.getOutPartNo());
if (null == packageRuleContext) { if (null == packageRuleContext) {
packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, prodRuleContext.getOutPartNo(), false); packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, prodRuleContext.getOutPartNo(), true);
if (null != packageRuleContext) packageRuleContextMap.put(prodRuleContext.getOutPartNo(), packageRuleContext); if (null != packageRuleContext) packageRuleContextMap.put(prodRuleContext.getOutPartNo(), packageRuleContext);
} }
if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext); if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext);
@ -233,7 +233,7 @@ public class MesFunctionPackagePartService extends BaseSwsService implements IFs
MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(partNo); MesPackageRuleContext packageRuleContext = packageRuleContextMap.get(partNo);
if (null == packageRuleContext) { if (null == packageRuleContext) {
packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, partNo, false); packageRuleContext = packageNoGenerateStepService.getPackageRuleContext(reqBean, stepResult, partNo, true);
if (null != packageRuleContext) packageRuleContextMap.put(partNo, packageRuleContext); if (null != packageRuleContext) packageRuleContextMap.put(partNo, packageRuleContext);
} }
if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext); if (null != packageRuleContext) BeanUtils.copyProperties(packageRuleContext, packageDataContext);

Write Preview
Loading…
Cancel
Save