diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java
index 1aabb54..d5147dd 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java
@@ -1,9 +1,8 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
-import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
-import cn.estsh.i3plus.pojo.mes.bean.MesShift;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderModel;
 import cn.estsh.i3plus.pojo.model.wms.WmsProductModel;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +15,8 @@ import java.util.List;
  * @Author mingliang.li
  */
 public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
+    @ApiOperation("查询生产版本")
+    ListPager<MesProductVersion> queryMesProductVersionByPager(MesProductVersion mesProductVersion, Pager pager);
 
     @ApiOperation("工单导入")
     void saveMesWorkOrderExcel(List<MesWorkOrder> mesWorkOrderList);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java
index 0199738..32884e9 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java
@@ -7,7 +7,10 @@ import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.MesExcelTool;
 import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductVersion;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderModel;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
@@ -43,6 +46,22 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
     @Autowired
     private IMesWorkOrderToSapService mesWorkOrderToSapService;
 
+    @ApiOperation(value = "查询生产版本", notes = "查询生产版本")
+    @GetMapping("/mesProductVersion/query")
+    public ResultBean queryMesProdRuleByPager(MesProductVersion mesProductVersion, Pager pager){
+        try {
+            String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+            mesProductVersion.setOrganizeCode(organizeCode);
+            ListPager<MesProductVersion> productVersionListPager = mesWorkOrderService.queryMesProductVersionByPager(mesProductVersion, pager);
+            return ResultBean.success("生产版本查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
+                    setListPager(productVersionListPager);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     @PostMapping(value = "/import-mes-work-order")
     @ApiOperation(value = "导入数据")
     public ResultBean importMesWorkOrderExcel(@RequestParam("file") MultipartFile file, @RequestParam("status") Integer type) {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
index d24b258..eddaf8a 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@@ -11,6 +11,9 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.MathOperation;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
@@ -476,6 +479,16 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     }
 
     @Override
+    public ListPager<MesProductVersion> queryMesProductVersionByPager(MesProductVersion mesProductVersion, Pager pager) {
+        DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean(mesProductVersion.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesProductVersion.getPartNo(), "partNo", productVersionQueryPackBean);
+        DdlPreparedPack.getStringEqualPack(mesProductVersion.getWorkCenterCode(), "workCenterCode", productVersionQueryPackBean);
+        pager = PagerHelper.getPager(pager, mesProductVersionRDao.findByHqlWhereCount(productVersionQueryPackBean));
+        List<MesProductVersion> mesProductVersions = mesProductVersionRDao.findByHqlWherePage(productVersionQueryPackBean, pager);
+        return new ListPager<>(mesProductVersions, pager);
+    }
+
+    @Override
     public void saveMesWorkOrderExcel(List<MesWorkOrder> mesWorkOrderList) {
         MesWorkOrder next = mesWorkOrderList.iterator().next();
         //属性校验&字段填充
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesTraceabilityTemp.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesTraceabilityTemp.java
index 1aac4ed..17213dc 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesTraceabilityTemp.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesTraceabilityTemp.java
@@ -13,6 +13,7 @@ import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
 import com.obs.services.model.PutObjectResult;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
@@ -561,43 +562,53 @@ public class MesTraceabilityTemp {
             equCell61.setPaddingTop(1);
             equtable.addCell(equCell61);
             int index = 0;
-            for (MesWorkCellScanMonitorLog log : dataModel.getMesWorkCellScanMonitorLogs()) {
-                // 构建每一列
-                PdfPCell equcontentCell00 = new PdfPCell(new Paragraph("", valueFont));
-                equcontentCell00.setHorizontalAlignment(Element.ALIGN_LEFT);
-                equcontentCell00.setBorder(Rectangle.NO_BORDER);
-                equcontentCell00.setColspan(1);
-                equtable.addCell(equcontentCell00);
-
-                PdfPCell equcontentCell11 = new PdfPCell(new Paragraph(log.getMessage(), valueFont));
+            // 构建每一列
+            PdfPCell equcontentCell00 = new PdfPCell(new Paragraph("", valueFont));
+            equcontentCell00.setHorizontalAlignment(Element.ALIGN_LEFT);
+            equcontentCell00.setBorder(Rectangle.NO_BORDER);
+            equcontentCell00.setColspan(1);
+            equtable.addCell(equcontentCell00);
+            if(!CollectionUtils.isEmpty(dataModel.getMesWorkCellScanMonitorLogs())){
+                for (MesWorkCellScanMonitorLog log : dataModel.getMesWorkCellScanMonitorLogs()) {
+                    PdfPCell equcontentCell11 = new PdfPCell(new Paragraph(log.getMessage(), valueFont));
+                    equcontentCell11.setHorizontalAlignment(Element.ALIGN_CENTER);
+                    equcontentCell11.setVerticalAlignment(Element.ALIGN_MIDDLE);
+                    equcontentCell11.setPaddingBottom(3);
+                    equcontentCell11.setPaddingTop(1);
+
+                    if (index % 2 == 0) {
+                        equcontentCell11.setBackgroundColor(new BaseColor(253, 239, 192));//黄色
+                    } else {
+                        equcontentCell11.setBackgroundColor(BaseColor.WHITE);//白色
+                    }
+
+                    equcontentCell11.setColspan(4);
+                    equtable.addCell(equcontentCell11);
+
+                    PdfPCell equcontentCell21 = new PdfPCell(new Paragraph(log.getScanInfo(), valueFont));
+                    equcontentCell21.setHorizontalAlignment(Element.ALIGN_CENTER);
+                    equcontentCell21.setVerticalAlignment(Element.ALIGN_MIDDLE);
+                    equcontentCell21.setPaddingBottom(3);
+                    equcontentCell21.setPaddingTop(1);
+
+                    if (index % 2 == 0) {
+                        equcontentCell21.setBackgroundColor(new BaseColor(253, 239, 192));//黄色
+                    } else {
+                        equcontentCell21.setBackgroundColor(BaseColor.WHITE);//白色
+                    }
+                    equcontentCell21.setColspan(2);
+                    equtable.addCell(equcontentCell21);
+                    index++;
+                }
+            }else {
+                PdfPCell equcontentCell11 = new PdfPCell(new Paragraph(" ", valueFont));
                 equcontentCell11.setHorizontalAlignment(Element.ALIGN_CENTER);
                 equcontentCell11.setVerticalAlignment(Element.ALIGN_MIDDLE);
                 equcontentCell11.setPaddingBottom(3);
                 equcontentCell11.setPaddingTop(1);
-
-                if (index % 2 == 0) {
-                    equcontentCell11.setBackgroundColor(new BaseColor(253, 239, 192));//黄色
-                } else {
-                    equcontentCell11.setBackgroundColor(BaseColor.WHITE);//白色
-                }
-
-                equcontentCell11.setColspan(4);
+                equcontentCell11.setBackgroundColor(new BaseColor(253, 239, 192));//黄色
+                equcontentCell11.setColspan(8);
                 equtable.addCell(equcontentCell11);
-
-                PdfPCell equcontentCell21 = new PdfPCell(new Paragraph(log.getScanInfo(), valueFont));
-                equcontentCell21.setHorizontalAlignment(Element.ALIGN_CENTER);
-                equcontentCell21.setVerticalAlignment(Element.ALIGN_MIDDLE);
-                equcontentCell21.setPaddingBottom(3);
-                equcontentCell21.setPaddingTop(1);
-
-                if (index % 2 == 0) {
-                    equcontentCell21.setBackgroundColor(new BaseColor(253, 239, 192));//黄色
-                } else {
-                    equcontentCell21.setBackgroundColor(BaseColor.WHITE);//白色
-                }
-                equcontentCell21.setColspan(2);
-                equtable.addCell(equcontentCell21);
-                index++;
             }
 
             document.add(equtable);