修改

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

@@ -16,5 +16,5 @@ import java.math.BigDecimal;
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
-    public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId) throws Exception ;
+    public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
 }

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

@@ -246,7 +246,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 8:
             case 9:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
-                measureCommission.put("isRelationEAS", true);
+                measureCommission.put("isRelationEAS", false);
                 measureCommission.put("flowTo", "进厂");
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
@@ -278,8 +278,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
         }
         /*访问接口发送数据*/
-        sendMesToMeasure(measureCommission);
-        return 1;
+        return sendMesToMeasure(measureCommission);
+
     }
 
 

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.BmsShipFeign;
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.service.IUtilsService;
@@ -22,6 +24,9 @@ public class UtilsServiceImpl implements IUtilsService {
 
     @Autowired
     private IMFeign imFeign;
+
+    @Autowired
+    private BmsTruckFeign bmsTruckFeign;
     /**
      * 查询运输订单ID主键
      * @return
@@ -64,7 +69,11 @@ public class UtilsServiceImpl implements IUtilsService {
         BigDecimal maxSeq = DataChange.dataToBigDecimal(mesMap.get("maxSeq"));
         if(orderSeq.intValue() == maxSeq.intValue()){
             map.put("orderStatus", 2);
-            return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+            utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+        }
+        if(map.get("priceId")!=null){
+            //如果有价格ID 则说明需要结算 调用新增详单接口
+//            bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));
         }
         return 0;
     }

src/main/resources/application-dev.yml

@@ -31,15 +31,15 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
 server:
   port: 8008

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

@@ -596,7 +596,8 @@
                         OO.CAPACITY_ID      "capacityId",
                         RC.CAPACITY_NUMBER  "capacityNumber",
                         TLFR.SEGMENT_SQE    "segmentSqe",
-                        OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
+                        OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe",
+                        OO.PRICE_ID             "priceId"
                  from OMSTRUCK_ORDER OO
                           left join TMSTRUCK_TOTAL_RESULT TTR
                                     on OO.ORDER_ID = TTR.ORDER_ID

src/main/test/tts.java

@@ -10,4 +10,18 @@ public class tts {
         BigDecimal divide = bigDecimal.subtract(bigDecimal1).divide(new BigDecimal(1), 2, 4);
         System.out.println(divide);
     }
+
+    @Test
+    public void test2(){
+        BigDecimal b1 = new BigDecimal("2");
+        BigDecimal b2 = new BigDecimal("1");
+        int i = b1.compareTo(b2);
+        System.out.println(i);
+    }
+
+
+    @Test
+    public void test3(){
+
+    }
 }