MES-PCN 点检问题

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -430,13 +430,20 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         }
 
         //生成单据号
-        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
-        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
+//        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);
+        }
         //保存单据
         BeanUtils.copyProperties(equipmentSpotCheck, bean, "id");
 //        bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0003");
-        bean.setSpotCheckOrderNo(resultList.get(0));
+        bean.setSpotCheckOrderNo(orderNo);
         ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
         bean = spotCheckOrderRepository.insert(bean);