From 34d749cfccb8336a2fc07a3165a96193bf3c1770 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 29 Jul 2021 13:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 production/pom.xml                            |  4 ++
 .../service/impl/PodTemplateServiceImpl.java  | 44 +++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/production/pom.xml b/production/pom.xml
index 1370b9c6..052e6ba4 100644
--- a/production/pom.xml
+++ b/production/pom.xml
@@ -36,5 +36,9 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>integration</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
index 917a6dbb..1fdab6f5 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.foreverwin.mesnac.common.constant.Constants;
+import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn;
@@ -19,6 +20,8 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.mesnac.common.util.ERPAPI;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.integration.model.IntegrationLog;
+import com.foreverwin.mesnac.integration.service.IntegrationLogService;
 import com.foreverwin.mesnac.meapi.dto.BomComponentDto;
 import com.foreverwin.mesnac.meapi.dto.SfcDto;
 import com.foreverwin.mesnac.meapi.dto.WorkCenterDto;
@@ -44,10 +47,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
 
 
 @Service
@@ -58,7 +59,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
     @Autowired
     private SfcService sfcService;
     @Autowired
-    private BomService bomService;
+    private IntegrationLogService integrationLogService;
     @Autowired
     private RouterService routerService;
     @Autowired
@@ -399,7 +400,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
     }
 
 
-    void sendErp(String sfc, String stepId, BigDecimal qty) throws RemoteException {
+    void sendErp(String sfc, String stepId, BigDecimal qty)  {
         Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(),sfc));
         String shopOrderBo = sfcServiceById.getShopOrderBo();
         String shopOrder = StringUtil.trimHandle(shopOrderBo);
@@ -441,14 +442,31 @@ public class PodTemplateServiceImpl implements PodTemplateService {
         TableOfZprodordconfStruOutHolder outHolder = new TableOfZprodordconfStruOutHolder(outs);
 
         //调用WS
-        ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder);
-        String status = outHolder.value[1].getRet();
-        String message = outHolder.value[1].getMsg();
-        System.out.println("ERP接口返回：状态:" + status + ",消息:" + message);
-        if (status.equals("E")) {
-            throw new BaseException("ERP接口返回：状态:" + status + ",消息:" + message);
+        try {
+            ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder);
+        } catch (RemoteException e) {
+            String status = outHolder.value[1].getRet();
+            String message = outHolder.value[1].getMsg();
+            if (status.equals("E")) {
+                throw new BaseException("ERP接口返回：状态:" + status + ",消息:" + message);
+            }
+        } finally {
+            //记录接口日志
+            IntegrationLog log = new IntegrationLog();
+            log.setHandle(UUID.randomUUID().toString());
+            log.setSite(CommonMethods.getSite());
+            log.setIntegrationType(IntegrationTypeConstant.ROUTER);
+            log.setCategory("SEND");
+            log.setIntegrationWay("ERP");
+            log.setIntegrationMethod("erpWebService.zmesProdordconf");
+            log.setParam(struIn.toString());
+            log.setStatus(outHolder.value[1].getRet());
+            log.setResultMessage(outHolder.value[1].getMsg());
+            log.setTransactionId("");
+            log.setRequestDateTime(LocalDateTime.now());
+            log.setCreatedDateTime(LocalDateTime.now());
+            integrationLogService.saveIntegrationLog(log);
         }
-
     }
 
     @Override