diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java
index 11dceee..e91d410 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java
@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.api.busi.report.IMesCimSeresReportService;
-import cn.estsh.i3plus.ext.mes.pojo.model.MesDefectRecordModel;
+import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -9,10 +11,14 @@ 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.mes.bean.MesConfig;
 import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresJisQueue;
 import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresJisVinOverPoint;
 import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresSrmRunSheetJis;
-import cn.estsh.i3plus.pojo.mes.model.report.*;
+import cn.estsh.i3plus.pojo.mes.model.report.DataTwoDimensionalModel;
+import cn.estsh.i3plus.pojo.mes.model.report.MesCimSeresJisQueueRequest;
+import cn.estsh.i3plus.pojo.mes.model.report.MesCimSeresJisQueueSummaryRequest;
+import cn.estsh.i3plus.pojo.mes.model.report.MesCimSeresJisQueueSummaryResponse;
 import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresJisQueueRepository;
 import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresJisVinOverPointRepository;
 import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresSrmRunSheetJisRepository;
@@ -37,6 +43,8 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
     private IMesCimSeresJisQueueRepository queueJisRDao;
     @Autowired
     private IMesCimSeresJisVinOverPointRepository overPointJisRDao;
+    @Autowired
+    private IMesConfigService mesConfigService;
 
     @Override
     public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, Pager pager) {
@@ -56,7 +64,7 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(ids, "id", packBean);
 
-        runSheetJisRDao.updateByProperties(new String[]{"status","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK, username, TimeTool.getNowTime(true)}, packBean);
+        runSheetJisRDao.updateByProperties(new String[]{"status","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean);
     }
 
     @Override
@@ -77,7 +85,7 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(ids, "id", packBean);
 
-        queueJisRDao.updateByProperties(new String[]{"checkStatus","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK, username, TimeTool.getNowTime(true)}, packBean);
+        queueJisRDao.updateByProperties(new String[]{"checkStatus","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean);
     }
 
     @Override
@@ -251,6 +259,10 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
     @Override
     public ListPager<DataTwoDimensionalModel> queryTwoDimensionalByPager(DataTwoDimensionalModel request, Pager pager) {
         final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+        MesConfig shippingGroupConfig = mesConfigService.getCfgValueByCode(organizeCode, MesExtConstWords.TWO_DIMENSIONAL_SHIPPING_GROUP_CODE);
+        if (shippingGroupConfig == null || StringUtils.isEmpty(shippingGroupConfig.getCfgValue())){
+            MesException.throwMesBusiException("未维护赛力斯数据二维表发运组编码【TWO_DIMENSIONAL_SHIPPING_GROUP_CODE】");
+        }
 
         StringBuilder hql = new StringBuilder();
         hql.append(" from mes_cim_seres_jis_rfid AA join (");
@@ -270,14 +282,14 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
         StringBuilder countQueryHql= new StringBuilder();
         countQueryHql.append("select count(1) ");
         Query countQuery = entityManager.createNativeQuery(countQueryHql.append(hql).toString());
-        packTwoDimensional(countQuery, request, organizeCode);
+        packTwoDimensional(countQuery, request, shippingGroupConfig.getCfgValue(), organizeCode);
         //本次查询满足条件的总数
         int count = Integer.parseInt(String.valueOf(countQuery.getSingleResult()));
 
         StringBuilder dataQueryHql = new StringBuilder();
         dataQueryHql.append(" select BB.shipping_code, BB.cust_info_seq, BB.vin, csn, CONCAT(LEFT(rfid,114), UPPER('326312JSG1DJ05')) as rfid, AA.create_date_time");
         Query dataQuery = entityManager.createNativeQuery(dataQueryHql.append(hql).toString());
-        packTwoDimensional(dataQuery, request, organizeCode);
+        packTwoDimensional(dataQuery, request, shippingGroupConfig.getCfgValue(), organizeCode);
 
         pager = PagerHelper.getPager(pager, count);
         //查询本页数据
@@ -306,11 +318,11 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
         return new ListPager<>(modelList, pager);
     }
 
-    private void packTwoDimensional(Query query, DataTwoDimensionalModel request, String organizeCode) {
+    private void packTwoDimensional(Query query, DataTwoDimensionalModel request, String shippingGroupCode, String organizeCode) {
         query.setParameter("organizeCode", organizeCode)
                 .setParameter("isValid", CommonEnumUtil.VALID)
                 .setParameter("isDeleted", CommonEnumUtil.FALSE);
-        query.setParameter("shippingGroupCode", request.getShippingGroupCode());
+        query.setParameter("shippingGroupCode", shippingGroupCode);
         if (!StringUtils.isEmpty(request.getShippingCode())){
             query.setParameter("shippingCode", request.getShippingCode());
         }
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
index 4ef475a..3518aac 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
@@ -455,4 +455,6 @@ public class MesExtConstWords {
     //排序线不能做报工调整ESD属性类型
     public static final String NOT_ALLOW_WRITE_OFF = "NOT_ALLOW_WRITE_OFF";
 
+    //赛力斯数据二维表发运组编码
+    public static final String TWO_DIMENSIONAL_SHIPPING_GROUP_CODE = "TWO_DIMENSIONAL_SHIPPING_GROUP_CODE";
 }