aaa

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

@@ -20,8 +20,12 @@ public interface AmsFeign {
     @PostMapping("api/v1/ams/amstruckpurplanmaterial/updateMaterial")
     RESTfulResult updateMaterial(@RequestBody(required = false) Map<String, Object> map);
 
-
     //更改计划子表重量
     @PostMapping("api/v1/ams/amstrucksporadicorders/addSporadicOrderTimes")
     RESTfulResult addSporadicOrderTimes(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据物资查询运输物资单价
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
+    Map<String,Object> getInwardPriceBy(Map<String, Object> priceMap);
+
 }

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.Map;
+
+/**
+ * @ author    :luobang
+ * @ time      :2022/03/24 15:02
+ */
+
+@FeignClient(value = "dil-bmstruck-api-dev", url = "${openfeign.BmsTruckFeign.url}")
+public interface BmsTruckFeign {
+
+    @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
+    int addDetailsOrder(Map<String,Object> map);
+}

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -124,7 +124,11 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getSporadicStatus(Object orderId);
 
+
     List<Map<String, Object>> getThreeDateMes(BigDecimal resultTotalId);
 
     int cancelLoadMaterialBySteel(BigDecimal orderId);
+
+    Map<String, Object> getPriceInfo(Integer orderId);
+
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectReader;
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -52,6 +54,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     IMFeign imFeign;
 
+    @Autowired
+    AmsFeign amsFeign;
+
+    @Autowired
+    BmsTruckFeign bmsTruckFeign;
+
     /**
      * 通过线路子表路线图生成各实绩
      * @param map
@@ -666,6 +674,22 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 i += addNewTransportOrder(new BigDecimal(orderId));
             }
         }
+        //根据订单ID查找需求里面的承运范围和物资
+        Map<String,Object>priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
+        if(priceMap.get("rangeId") ==null){
+            priceMap.put("rangeId",new BigDecimal(1));
+        }
+        Map<String,Object>priceValueMap = null;
+        try {
+            priceValueMap = amsFeign.getInwardPriceBy(priceMap);
+            if(priceValueMap != null){
+                priceValueMap.put("resultNetWeight", resultNetWeight);
+                priceValueMap.put("orderId",orderId);
+                i += bmsTruckFeign.addDetailsOrder(priceValueMap);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return i;
     }
 

src/main/resources/application-dev.yml

@@ -13,11 +13,13 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
 
 
 server:

src/main/resources/application-prod.yml

@@ -15,9 +15,10 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
-
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
 server:
   port: 8095

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -755,6 +755,23 @@
         ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getPriceInfo" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select
+        ARM.MATERIAL_ID "materialId",
+        AIR.LINE_ID     "rangeId",
+        AIR.REQUIREMENT_TYPE    "requirementType",
+        AIR.IS_MINERAL  "isMineral"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON ARP.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        where oo.ORDER_ID = #{orderId}
+    </select>
 
     <select id="getTwoDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select