diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
index e717b0e..f662769 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
@@ -15,8 +15,6 @@ import cn.estsh.i3plus.mes.pcn.util.DateUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
-import cn.estsh.i3plus.platform.common.util.WmsConstWords;
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -24,6 +22,7 @@ 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.*;
+import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
 import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -382,17 +381,9 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         BeanUtils.copyProperties(spotCheckOrder, spotCheckOrderTemp, "id");
 
         //生成单据号
-//        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_COPY_RULE);
-//        genSerialNoModel.setSerialNumber(spotCheckOrder.getSpotCheckOrderNo());
-//        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, spotCheckOrder.getCreateUser(), spotCheckOrder.getOrganizeCode(), 1).getResultList();
-
-        String orderNo="";
-        BaseResultBean<LinkedHashMap> orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
-        if (orderResutlBean != null && orderResutlBean.isSuccess()) {
-            orderNo = orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString();
-        } else {
-            orderNo = TimeTool.getDateTime().replaceAll("-", "") + String.valueOf((int) (Math.random() * 9000) + 1000);
-        }
+        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
+        String orderNo = (String) syncFuncService.syncSerialNo(genSerialNoModel, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganizeCode(), MesPcnExtConstWords.ONE).getResultList().iterator().next();
+
         //保存新点检单
         spotCheckOrderTemp.setSpotCheckOrderNo(orderNo);
         spotCheckOrderTemp.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue());
@@ -533,19 +524,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
                     .build();
         }
 
-        //生成单据号
-//        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
-//        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
-
-        String orderNo="";
-        BaseResultBean<LinkedHashMap> orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
-        if (orderResutlBean != null && orderResutlBean.isSuccess()) {
-            orderNo = orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString();
-        } else {
-            orderNo = TimeTool.getDateTime().replaceAll("-", "") + String.valueOf((int) (Math.random() * 9000) + 1000);
-        }
+        //生成单号
+        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
+        String orderNo = (String) syncFuncService.syncSerialNo(genSerialNoModel, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganizeCode(), MesPcnExtConstWords.ONE).getResultList().iterator().next();
         //保存单据
-        BeanUtils.copyProperties(equipmentSpotCheck, bean, "id");
+        BeanUtils.copyProperties(equipmentSpotCheck, bean, MesPcnExtConstWords.BASE_BEAN_FIELDS);
 //        bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0003");
         bean.setSpotCheckOrderNo(orderNo);
         bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
@@ -558,7 +541,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         MesSpotCheckOrder finalBean = bean;
         detailList.forEach(k -> {
             MesSpotCheckOrderResult result = new MesSpotCheckOrderResult();
-            BeanUtils.copyProperties(k, result, "id");
+            BeanUtils.copyProperties(k, result, MesPcnExtConstWords.BASE_BEAN_FIELDS);
             result.setSpotCheckOrderNo(finalBean.getSpotCheckOrderNo());
             result.setPid(finalBean.getId());
             result.setWorkCenterCode(finalBean.getWorkCenterCode());
@@ -580,7 +563,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             equipmentSpotCheckPartList.forEach(k -> {
                 MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart();
                 spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId());
-                BeanUtils.copyProperties(k, spotCheckOrderPart, "id");
+                BeanUtils.copyProperties(k, spotCheckOrderPart, MesPcnExtConstWords.BASE_BEAN_FIELDS);
                 spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE);
                 spotCheckOrderPart.setSystemSyncDatetime("");
                 ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName());