diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java
index b099b1a..c8f7926 100644
--- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java
+++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java
@@ -20,4 +20,6 @@ public interface IMesProdShiftRecordService  {
     void insertMesProdShiftRecord(MesProdShiftRecord item, String organizeCode);
 
     void saveMesProdShiftRecord(MesProdShiftRecord item, String organizeCode);
+
+    MesProdShiftRecord queryMesProdShiftRecord(MesProdShiftRecord mesProdShiftRecord);
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java
index 2ccd850..0abfa76 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesProdShiftRecordService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 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.MesProdShiftRecord;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -53,7 +54,7 @@ public class MesProdShiftRecordController   {
 
 
             mesProdShiftRecordService.insertMesProdShiftRecord(item, AuthUtil.getOrganizeCode());
-            return ResultBean.success("NC处理成功");
+            return ResultBean.success("保存开关班记录成功");
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {
@@ -70,14 +71,28 @@ public class MesProdShiftRecordController   {
             ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
             ValidatorBean.checkNotNull(item.getWorkCenterCode(), "workCenterCode不能为空" );
             ValidatorBean.checkNotNull(item.getShiftGroup(), "shiftGroup不能为空");
-            ValidatorBean.checkNotNull(item.getShiftCode(), "shiftCode不能为空");
 
             mesProdShiftRecordService.saveMesProdShiftRecord(item, AuthUtil.getOrganizeCode());
-            return ResultBean.success("NC处理成功");
+            return ResultBean.success("保存开关班记录成功");
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+    @GetMapping(value = "/query-prod-shift-record")
+    @ApiOperation(value = "查询零件生产组")
+    public ResultBean queryMesProdShiftRecord(MesProdShiftRecord mesProdShiftRecord) {
+        try {
+            mesProdShiftRecord.setOrganizeCode(mesProdShiftRecord.getOrganizeCode());
+            //查询汇总工单数量
+            MesProdShiftRecord mesPartProdGroup= mesProdShiftRecordService.queryMesProdShiftRecord(mesProdShiftRecord);
+            return ResultBean.success("查询成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(mesPartProdGroup);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
index 3681bff..18b392b 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
@@ -41,7 +41,11 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        if(!StringUtil.isEmpty(bean.orderBy())){
+            packBean.setOrderByStr(bean.orderBy());
+        }else {
+            DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        }
         pager = PagerHelper.getPager(pager, mesProdShiftRecordRDao.findByHqlWhereCount(packBean));
 
         List<MesProdShiftRecord> resultList = mesProdShiftRecordRDao.findByHqlWherePage(packBean, pager);
@@ -59,7 +63,7 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
     public void saveMesProdShiftRecord(MesProdShiftRecord item, String organizeCode) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
+        DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
 //        DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean);
 
         MesProdShiftRecord mesProdShiftRecord = mesProdShiftRecordRDao.getByProperty(packBean);
@@ -67,13 +71,24 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("开关班记录产线【%s】班组代码【%s】班次代码【%s】不存在，请检查数据",
-                            item.getWorkCenterCode(),item.getShiftGroup(),item.getShiftCode())
+                    .setErrorDetail("开关班记录产线【%s】班组代码【%s】 不存在，请检查数据",
+                            item.getWorkCenterCode(),item.getShiftGroup())
                     .build();
         }
         mesProdShiftRecord.setShiftGroup(item.getShiftGroup());
         mesProdShiftRecord.setShiftCode(item.getShiftCode());
+        mesProdShiftRecord.setEndTime(item.getEndTime());
         ConvertBean.serviceModelUpdate(item, AuthUtil.getSessionUser().getUserName());
         mesProdShiftRecordRDao.save(item);
     }
+
+    @Override
+    public MesProdShiftRecord queryMesProdShiftRecord(MesProdShiftRecord bean) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
+        packBean.setOrderByStr(bean.orderBy());
+
+        return mesProdShiftRecordRDao.getByProperty(packBean);
+    }
 }