修改

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -14,7 +14,10 @@ import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -1101,7 +1104,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.updateCarAddress(mapValue);
         //查询单拼的数据
         try {
-            BigDecimal orderId = (BigDecimal) mapValue.get("orderId");
+            BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
             BigDecimal capacityIdS=amsSaleOrderMapper.queueSingle(orderId);
             if (capacityIdS !=null){
                 //删除单拼
@@ -1133,6 +1136,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 Map<String, Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
                 System.out.println("--------------------------------------------");
                 System.out.println(resultMap);
+                //Map<String,Object> outMap = (Map<String,Object>) resultMap.get("output");
+                //JSONObject jsonObject = new JSONObject(outMap);
+                //System.out.println(jsonObject);
+
             }
         }
         return success(result);

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

@@ -66,4 +66,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     int selectSaleOrderIdIsUpload(BigDecimal saleOrderId);
 
+    String getAddressRemark(BigDecimal saleShippingAddressId);
+
 }

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

@@ -681,8 +681,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     if(place != null && !"null".equals(place)){
                         carrierCount = amsSaleOrderMapper.getMoreCarrier(place);
                     }
+                    //根据收货地址id查询备注，判断是否需要匹配承运商
+                    String addressRemark = amsSaleOrderMaterialMapper.getAddressRemark(shippingAddressId);
                     // 单一承运商才进行匹配
-                    if (carrierList != null && carrierList.size() == 1 && carrierList.get(0) != null  && carrierCount.intValue() == 0) {
+                    if (carrierList != null && carrierList.size() == 1 && carrierList.get(0) != null  && carrierCount.intValue() == 0 && addressRemark == null) {
                         List<Map<String, Object>> list = new ArrayList<>();
                         Map<String, Object> map1 = carrierList.get(0);
                         // 传入车序号主键和承运商id

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

@@ -131,7 +131,7 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());
             omstruckOrder.setInsertUpdateRemark("无");
-            omstruckOrder.setDeleted(new BigDecimal(0));
+            omstruckOrder.setDeleted(new BigDecimal(100));
             omstruckOrder.setOrderType(new BigDecimal(11));
             omstruckOrder.setCarrierId(new BigDecimal(carrierId));
             result +=omstruckOrderMapper.insertSelective(omstruckOrder);

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -697,5 +697,6 @@
         RM.material_specification||RM.material_model||RM.material_length
         =#{Specification}
         and RM.Material_Name=#{materialName}
+        fetch next 1 row only
     </select>
 </mapper>

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

@@ -4241,7 +4241,9 @@
     FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
            LEFT JOIN RMS_RECEIVE_PLACE RRP
                      ON RRP.PLACE_ID = ACTP.PLACE_ID
-    WHERE RRP.ADDRESS_ID = #{addressId}
+    WHERE
+    ACTP.CARRIER_ID IS NOT NULL
+    AND RRP.ADDRESS_ID = #{addressId}
     and  ACTP.DELETED = 0
   </select>
 

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

@@ -921,6 +921,10 @@
       AND
       ASO.SALE_ORDER_ID = #{saleOrderId}
     </select>
+    <select id="getAddressRemark" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+      SELECT RRA.INSERT_UPDATE_REMARK FROM RMS_RECEIVE_ADDRESS RRA
+      WHERE RRA.ADDRESS_ID = #{saleShippingAddressId}
+    </select>
 
     <update id="updateSendStation">
     update

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO,file,RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout