From 9c56a2542f71e2d2ec92c3113010da7d0a070081 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Thu, 6 Jun 2024 22:02:33 +0800
Subject: [PATCH] =?UTF-8?q?MES-PCN=20=E7=82=B9=E6=A3=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesSpotCheckOrderService.java | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

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 bb92c66..c62ecd7 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
@@ -3,10 +3,13 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.spot.IMesSpotCheckOrderService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSpotCheckOrderModel;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud;
 import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
 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;
@@ -30,6 +33,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,7 +72,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
     @Autowired
     private MesEquipmentSpotCheckPartRepository equipmentSpotCheckPartRepository;
 
-
+    @Autowired
+    private ICoreUtilCloud sysOrderNoRuleCloud;
 
     @Override
     public ListPager<MesSpotCheckOrder> querySpotCheckOrder(MesSpotCheckOrder spotCheckOrder, Pager pager) {
@@ -236,12 +241,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             if (!CollectionUtils.isEmpty(partNoList)) {
                 throw new ImppBusiException(String.format("剩余物料号【%s】对应的条码未扫描，请扫描完成后再完成质检", partNoList));
             }
-
-            model.getOrderPartList().forEach(k -> {
-                ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
-            });
-            spotCheckOrderPartRepository.saveAll(model.getOrderPartList());
         }
+        model.getOrderPartList().forEach(k -> {
+            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+        });
+        spotCheckOrderPartRepository.saveAll(model.getOrderPartList());
 
         Integer orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue();
         for (MesSpotCheckOrderResult result : model.getOrderResultList()) {
@@ -289,12 +293,19 @@ 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();
-
+//        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);
+        }
         //保存新点检单
-        spotCheckOrderTemp.setSpotCheckOrderNo(resultList.get(0));
+        spotCheckOrderTemp.setSpotCheckOrderNo(orderNo);
         ConvertBean.serviceModelInitialize(spotCheckOrderTemp, AuthUtil.getSessionUser().getUserName());
         spotCheckOrderTemp = spotCheckOrderRepository.insert(spotCheckOrderTemp);