'master'

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @ author    :HJG
+ * @ time      :2022/1/10 14:16
+ */
+
+@FeignClient(value = "dil-ams-api", url = "${openfeign.AmsFeign.url}")
+public interface AmsFeign {
+
+    //销售焦炭自动派单
+    @PostMapping("api/v1/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
+    RESTfulResult dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
+
+}

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
@@ -31,4 +32,8 @@ public interface OmsFeign {
     RESTfulResult pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
     @PostMapping("api/v1/oms/omstruckorders/pushMessageToDriver")
     public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue);
+
+    // 远程调用查询销售订单所有信息
+    @PostMapping("api/v1/oms/omstruckorderseparates/getSaleAllMessages")
+    Map<String,Object> getSaleAllMessages(@RequestParam Integer orderId);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.BmsShipFeign;
 import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.OmsFeign;
@@ -10,6 +11,7 @@ import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +57,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     OmsFeign omsFeign;
 
+    @Autowired
+    AmsFeign amsFeign;
+
     /**
      * 查看运输线路是否为出厂
      * @param orderNumber
@@ -179,6 +184,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     throw new Exception("请提醒司机确认订单！");
                 }
                 i += utilsService.closeOrderNormally(map);
+                Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
+                BigDecimal closeStatus = (BigDecimal) mapValue.get("closeStatus");
+                if (closeStatus.intValue() == 0) {
+                    amsFeign.dispatchTruckOrderByCarrier(mapValue);
+                }
                 break;
             case 4:
                 break;

src/main/resources/application-dev.yml

@@ -38,6 +38,8 @@ openfeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
 server:
   port: 8008

src/main/resources/application-prod.yml

@@ -39,6 +39,8 @@ openfeign:
     url: ${QMSFEIGN_URL:172.16.33.166:8047}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
 
 server:
   port: 8088