diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentLogService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentLogService.java
index 4ebf7b8..c33812c 100644
--- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentLogService.java
+++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentLogService.java
@@ -1,18 +1,11 @@
 package cn.estsh.i3plus.ext.mes.pcn.api.base;
 
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.ActorMessage;
-import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
-import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
-import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
 
 public interface IMesEquipmentLogService {
 
     void saveEquipmentLogToRedis(ActorMessage actorMessage);
 
 
-    void saveEquipmentLogDetails();
+    void saveEquipmentLogDetails(String organizeCode);
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/BaseMesScheduleJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/BaseMesScheduleJob.java
index 46ecafa..a2bf0d5 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/BaseMesScheduleJob.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/BaseMesScheduleJob.java
@@ -26,10 +26,10 @@ public abstract class BaseMesScheduleJob extends BaseImppScheduleJob {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(BaseMesScheduleJob.class);
 
-    @Resource(name = CommonConstWords.IMPP_REDIS_MES)
+    @Resource(name = CommonConstWords.IMPP_REDIS_MES_PCN)
     @Getter
     @Setter
-    private ImppRedis redisMes;
+    private ImppRedis redisMesPcn;
 
     @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java
index caee2e0..a7a4812 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java
@@ -2,17 +2,15 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob;
 
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentLogService;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
-import com.alibaba.fastjson.JSONObject;
+import cn.estsh.impp.framework.boot.init.ApplicationProperties;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;
-import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-
-import java.util.Map;
+import org.springframework.stereotype.Component;
 
 /**
  * @author wangjie
@@ -21,24 +19,39 @@ import java.util.Map;
  **/
 @Slf4j
 @DisallowConcurrentExecution
+@Component
 @ApiOperation("保存工艺参数job")
-public class MesSaveVariableJob implements Job {
+public class MesSaveVariableJob extends BaseMesScheduleJob {
 
     @Autowired
     private IMesEquipmentLogService mesEquipmentLogService;
 
+    public MesSaveVariableJob() {
+        super(MesSaveVariableJob.class, "保存工艺参数job");
+    }
+
     @Override
-    public void execute(JobExecutionContext jobExecutionContext) {
+    public void executeMesJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
 
         log.info("保存工艺参数job -- START ");
 
+        String jobParam = this.getJobParam();
+        JSONObject jsonObject= JSONUtil.parseObj(jobParam);
+        String organizeCode = jsonObject.getStr("organizeCode");
+
+        if (null == organizeCode){
+            log.error("请添加需要报工的工厂代码!");
+            return;
+        }
+
         long startTime = System.currentTimeMillis();
 
-        mesEquipmentLogService.saveEquipmentLogDetails();
+        mesEquipmentLogService.saveEquipmentLogDetails(organizeCode);
 
         long endTime = System.currentTimeMillis();
 
         log.info("保存工艺参数job --- END --- 耗时: {} ms", endTime - startTime);
 
     }
+
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java
index 8489932..7b5bec0 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java
@@ -1,23 +1,21 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentLogService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.equiplog.MesEquipmentLogExtService;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.ActorMessage;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
-import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.*;
-import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
-import cn.estsh.i3plus.pojo.mes.repository.*;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLog;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentRecord;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentLogDetailRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRecordRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -26,12 +24,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -89,8 +85,8 @@ public class MesEquipmentLogService implements IMesEquipmentLogService {
     }
 
     @Override
-    public void saveEquipmentLogDetails() {
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+    public void saveEquipmentLogDetails(String organizeCode) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.RECORD_STATUS.RECORD_STATUS_10.getValue(), "recordStatus", ddlPackBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"createDatetime"}, ddlPackBean);
         List<MesEquipmentRecord> mesEquipmentRecords = mesEquipmentRecordRepository.findByHqlWhere(ddlPackBean);