零件打包 缺少工单号字段值

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackagePartService.java

@@ -129,6 +129,7 @@ public class MesFunctionPackagePartService extends BaseSwsService implements IFs
         stepResult = StepResult.getSuccessComplete();
         //零件打包不写包装明细数据, 默认赋值[仅统计包装], 生成虚拟条码
         packageDataContext.setGenerateType(MesExtEnumUtil.PACKING_RULE_GENERATE_TYPE.PACKAGE.getValue());
+        packageDataContext.setPartPackWorkOrderNo(packageDataContext.getWorkOrderNo());
         try {
             //零件打包业务处理
             stepResult.setDataCollection(new ArrayList());

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

@@ -392,6 +392,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
         if (!CollectionUtils.isEmpty(serialNoModel.getDataMap()) && serialNoModel.getDataMap().containsKey(packageNo)) {
             packageDb.setPackageOneCode(serialNoModel.getDataMap().get(packageNo).toString());
         }
+        if (!StringUtils.isEmpty(packageRuleContext.getPartPackWorkOrderNo())) packageDb.setWorkOrderNo(packageRuleContext.getPartPackWorkOrderNo());
         return packageDb;
     }
 

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

@@ -61,4 +61,7 @@ public class MesPackageRuleContext implements Serializable {
     @ApiParam(name = "同步状态WMS")
     public Integer systemSyncStatusWms = 2;
 
+    @ApiParam("零件打包加工单号")
+    public String partPackWorkOrderNo;
+
 }