diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesYfReportService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesYfReportService.java
index 322602f..ae548a6 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesYfReportService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesYfReportService.java
@@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProdRuleReportConditionModel
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
 import cn.estsh.i3plus.pojo.mes.model.report.MesTraceabilityReportModel;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.ApiOperation;
@@ -41,4 +42,10 @@ public interface IMesYfReportService {
 
     @ApiOperation("查询追溯报表")
     List<MesTraceabilityReportModel> findTraceabilityReport(MesProduceSn mesProduceSn);
+
+    @ApiOperation("零件条码状态查询")
+    ListPager<MesProduceSn> queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager);
+
+    @ApiOperation("产品加工记录")
+    ListPager<MesProductionRecord> queryMesProductionRecord(MesProductionRecord mesProductionRecord, Pager pager);
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
index 025f2d9..b486e42 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
@@ -3,7 +3,9 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
 import cn.estsh.i3plus.ext.mes.api.busi.report.IMesYfReportService;
 import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
 import cn.estsh.impp.framework.base.controller.MesBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -45,4 +47,31 @@ public class MesBusiReportController extends MesBaseController {
         }
     }
 
+    @ApiOperation(value = "零件条码状态查询", notes = "零件条码状态查询")
+    @GetMapping("/mesProduceSn/query")
+    public ResultBean queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager) {
+        try {
+            mesProduceSn.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+            return ResultBean.success("查询成功").setListPager(mesYfReportService.queryMesProduceSn(mesProduceSn,pager));
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+    @ApiOperation(value = "产品加工记录", notes = "产品加工记录")
+    @GetMapping("/mesProductionRecord/query")
+    public ResultBean queryMesProductionRecord(MesProductionRecord mesProductionRecord, Pager pager) {
+        try {
+            mesProductionRecord.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+            return ResultBean.success("查询成功").setListPager(mesYfReportService.queryMesProductionRecord(mesProductionRecord,pager));
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java
index 3e1b4a4..a8028e3 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java
@@ -94,6 +94,9 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
     @Autowired
     private IMesConfigService mesConfigService;
 
+    @Autowired
+    private MesProductionRecordRepository mesProductionRecordRepository;
+
     @Override
     public ListPager<MesDeviceDataQueryReportResultModel> queryMesDeviceDataByPager(MesDeviceDataQueryReportConditionModel queryReportModel, Pager pager) {
         ListPager<MesDeviceDataQueryReportResultModel> mesDeviceDataQueryReportResultModelListPager =
@@ -224,6 +227,56 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
         return mesTraceabilityReportModelList;
     }
 
+    @Override
+    public ListPager<MesProduceSn> queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager) {
+        DdlPackBean packBean = getMesProduceSnPackBean(mesProduceSn);
+
+        pager = PagerHelper.getPager(pager, mesProduceSnRDao.findByHqlWhereCount(packBean));
+        List<MesProduceSn> list = mesProduceSnRDao.findByHqlWherePage(packBean, pager);
+        return new ListPager<>(list, pager);
+    }
+
+    @Override
+    public ListPager<MesProductionRecord> queryMesProductionRecord(MesProductionRecord mesProductionRecord, Pager pager) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesProductionRecord.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getProductSn(), "productSn", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getWorkOrderNo(), "workOrderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringBiggerPack(mesProductionRecord.getCompleteDateTimeStart(), "completeDateTime", packBean);
+        DdlPreparedPack.getStringSmallerPack(mesProductionRecord.getCompleteDateTimeEnd(), "completeDateTime", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getMouldNo(), "mouldNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getShiftGroup(), "shiftGroup", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getShiftCode(), "shiftCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProductionRecord.getReportStatus(), "reportStatus", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProductionRecord.getReportType(), "reportType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProductionRecord.getIsComplete(), "isComplete", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProductionRecord.getIsTest(), "isTest", packBean);
+        pager = PagerHelper.getPager(pager, mesProductionRecordRepository.findByHqlWhereCount(packBean));
+        List<MesProductionRecord> list = mesProductionRecordRepository.findByHqlWherePage(packBean, pager);
+        return new ListPager<>(list, pager);
+    }
+
+    private DdlPackBean getMesProduceSnPackBean(MesProduceSn mesProduceSn) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesProduceSn.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+        DdlPreparedPack.getStringBiggerPack(mesProduceSn.getCreateDateTimeStart(), "createDatetime", packBean);
+        DdlPreparedPack.getStringSmallerPack(mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintCount(), "printCount", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getCreateUser(), "createUser", packBean);
+        return packBean;
+    }
+
     private Map<String, List<MesEquipmentLogDetail>> getMesEquipmentLogDetailMap(String organizeCode, List<MesProductionRecord> productionRecordList) {
         List<String> organizeCodeEquipList = getEquipList(organizeCode, productionRecordList);
         //工艺加工参数