修改

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

@@ -2202,6 +2202,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String oldCapacityNumber = omstruckOrderMapper.getOldCapacityNumber(oldCapacityId);
         if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
             mapValue.put("result",1);
+            mapValue.put("updateFlag",1);
+            mapValue.put("oldCapacityNumber",oldCapacityNumber);
             pushCarNumberToEas(mapValue);
             return mapValue;
         }
@@ -3205,7 +3207,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public int pushCarNumberToEas(Map<String, Object> map) throws Exception {
-
         // 调用EAS接口将车牌号传给金蝶
         List<Map<String,Object>> mapList = new ArrayList<>();
 
@@ -3236,6 +3237,20 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 //如果status不为1,抛出异常
                 if(!result.getJSONObject("res").getString("status").equals("1")){
                     throw new Exception("上传金蝶失败！请重试派车:"+result.getJSONObject("requestException").getString("message"));
+                }else {
+                    if(map.get("oldCapacityNumber") != null && DataChange.dataToBigDecimal(map.get("capacityId")).compareTo(new BigDecimal(35128)) == 0) {
+                        String url = "http://172.16.33.122:44325/api/logistics/CancleOrdersBill";
+                        Map<String, Object> cancelOrderMap = new HashMap<>();
+                        cancelOrderMap.put("carNo",map.get("oldCapacityNumber"));
+                        JSONObject cancelOrderJson = new JSONObject(cancelOrderMap);
+                        String sendUrl = url ;
+                        String jsonData = null;
+                        try {
+                            jsonData = HTTPRequestUtils.send(sendUrl, cancelOrderJson,"utf-8");
+                        } catch (org.apache.http.ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
             }catch (Exception e){
                 e.printStackTrace();

src/main/java/com/steerinfo/dil/util/HTTPRequestUtils.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.util;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.ParseException;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -35,7 +36,10 @@ public class HTTPRequestUtils {
 
         //创建post方式请求对象
         HttpPost httpPost = new HttpPost(url);
-
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectTimeout(5000).setConnectionRequestTimeout(1000)
+                .setSocketTimeout(5000).build();
+        httpPost.setConfig(requestConfig);
         //装填参数
         StringEntity s = new StringEntity(json.toString(), "utf-8");
         s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));

src/main/resources/application-prod.yml

@@ -19,7 +19,7 @@ openfeign:
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:
-     url: ${JOINFEIGN_URL:localhost:8066}
+     url: ${JOINFEIGN_URL:172.16.33.166:8066}
    OTMSFeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
    RmsFeign:

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

@@ -935,7 +935,6 @@
         WHERE TTR.ORDER_ID = #{orderId}
     </select>
     <select id="selectNetWeightCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
-<<<<<<< HEAD
         SELECT COUNT(TWB.WEIGHT_BATCH_ID)  FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID