吸塑打包适配

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java

@@ -153,6 +153,8 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
             } else {
                 //获取包装规则信息
                 packageRuleContext = getPackageRuleContext(reqBean, stepResult, entry.getKey(), false);
+                Optional<MesProdRuleContext> optional = prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getIsPrintPackage()) && o.getIsPrintPackage().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).findFirst();
+                if (null == optional || !optional.isPresent()) packageRuleContext.setIsPrintPackage(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
             }
 
             //无生产过程打包规则时, 忽略当前零件
@@ -532,6 +534,11 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
     @Override
     public MesProduceSnPrintModel doPrintPackageNo(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesPackageRuleContext packageRuleContext,
                           MesLabelTemplate labelTemplate, IPrintTemplateStrategyService strategyService, List<MesPackage> packageList, Boolean isAsyn) {
+
+        MesProduceSnPrintModel printModel = null;
+
+        if (packageRuleContext.getIsPrintPackage().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0) return printModel;
+
         if (null == strategyService) {
             //查询模版信息
             labelTemplate = templateService.getLabelTemplate(packageRuleContext.getPackageTemplate(), reqBean.getOrganizeCode());
@@ -551,8 +558,6 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
         mesProduceSnPrintModel.setPartName(packageRuleContext.getPartName());
         mesProduceSnPrintModel.getPackageList().addAll(packageList);
 
-        MesProduceSnPrintModel printModel = null;
-
         try {
             printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, !StringUtils.isEmpty(reqBean.getWorkCellCode()));
         } catch (ImppBusiException e) {
@@ -712,6 +717,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
         return virtualPsList;
     }
 
+    //生成一样的虚拟条码, 适配弹框输入工单数量
     @Override
     public LinkedList<String> generateVirtualPs(Double qty, String productSn) {
         LinkedList<String> virtualPsList = new LinkedList<>();

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.pcn.pojo.context;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -59,9 +60,12 @@ public class MesPackageRuleContext implements Serializable {
     public String printer;
 
     @ApiParam(name = "同步状态WMS")
-    public Integer systemSyncStatusWms = 2;
+    public Integer systemSyncStatusWms = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @ApiParam("零件打包加工单号")
     public String partPackWorkOrderNo;
 
+    @ApiParam("是否打印包装条码")
+    private Integer isPrintPackage = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
 }