|
|
|
@ -254,7 +254,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
|
|
|
|
|
|
|
|
|
|
MesCustomerPart customerPart = customerPartService.getMesCustomerPartByPartNo(mesCutSchemeFg.getPartNo(), mesPackingDefine.getCustCode(), reqBean.getOrganizeCode());
|
|
|
|
|
|
|
|
|
|
MesLabelTemplate labelTemplate = mesTemplateService.getLabelTemplate(mesPackingDefine.getPakcageTemplate(), reqBean.getOrganizeCode());
|
|
|
|
|
MesLabelTemplate labelTemplate = mesTemplateService.getLabelTemplate(mesPackingDefine.getPackageTemplate(), reqBean.getOrganizeCode());
|
|
|
|
|
|
|
|
|
|
if (labelTemplate == null)
|
|
|
|
|
return stepResult.isCompleted(false).msg(String.format("请检查包装定义信息,零件号[%s]对应模板代码[%s]无效!", mesCutSchemeFg.getPartNo(), cutScheme.getCutCode()));
|
|
|
|
@ -263,7 +263,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
|
|
|
|
|
mesPartContext.setCopies(mesPackingDefine.getPrintCopies() == null ? 1 : mesPackingDefine.getPrintCopies());
|
|
|
|
|
mesPartContext.setPackageSnRule(mesPackingDefine.getPackageBarcodeRule());
|
|
|
|
|
mesPartContext.setPrinter(StringUtils.isEmpty(cutScheme.getPackageSnPrinter()) ? mesPackingDefine.getPrinter() : cutScheme.getPackageSnPrinter());
|
|
|
|
|
mesPartContext.setLabelTemplate(StringUtils.isEmpty(cutScheme.getPackageLabelTemplateCode()) ? mesPackingDefine.getPakcageTemplate() : cutScheme.getPackageLabelTemplateCode());
|
|
|
|
|
mesPartContext.setLabelTemplate(StringUtils.isEmpty(cutScheme.getPackageLabelTemplateCode()) ? mesPackingDefine.getPackageTemplate() : cutScheme.getPackageLabelTemplateCode());
|
|
|
|
|
mesPartContext.setCustPartNo(customerPart == null ? "" : customerPart.getCustPartNo());
|
|
|
|
|
|
|
|
|
|
partDataExtContext.put(mesCutSchemeFg.getPartNo(), mesPartContext);
|
|
|
|
|