修改

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

@@ -101,4 +101,8 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     Date getOldDateOfReceipt(BigDecimal saleOrderId);
 
+    int getOrderCount(BigDecimal saleOrderMaterialId);
+
+    int updateOrderCarrier(@Param("saleOrderMaterialId") BigDecimal saleOrderMaterialId, @Param("carrierId") BigDecimal carrierId);
+
 }

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

@@ -1391,6 +1391,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 车序号状态
             amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(2));
             result += amsDispatchSaleOrderMapper.insertSelective(amsDispatchSaleOrder);
+            //判断有没有运输订单
+            int countOrder = amsSaleOrderMaterialMapper.getOrderCount(saleOrderMaterialId);
+            if (countOrder > 0) {
+                amsSaleOrderMaterialMapper.updateOrderCarrier(saleOrderMaterialId,carrierId);
+            }
         }
         return result;
     }
@@ -1511,6 +1516,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         List<AmsDispatchSaleOrder> amsDispatchSaleOrders = amsDispatchSaleOrderMapper.selectByParameters(mapValue);
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrders.get(0);
         amsDispatchSaleOrder.setCarrierId(carrierId);
+        int countOrder = amsSaleOrderMaterialMapper.getOrderCount(amsDispatchSaleOrder.getSaleOrderMaterialId());
+        if (countOrder > 0) {
+            amsSaleOrderMaterialMapper.updateOrderCarrier(amsDispatchSaleOrder.getSaleOrderMaterialId(),carrierId);
+        }
         int result = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
         return result;
     }
@@ -3183,13 +3192,18 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public int pushCarNumberToEas(Map<String, Object> map) throws Exception {
+
         // 调用EAS接口将车牌号传给金蝶
         List<Map<String,Object>> mapList = new ArrayList<>();
+
         mapList.add(map);
+
         Map<String,Object> input = joinFeign.findCarNumberByOrderList(mapList);
         Map<String,Object> totalMap = new HashMap<>();
+
         totalMap.putAll(easCapacityTestUtil.getTotalMap());
         totalMap.put("input",input);
+
         Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
         System.out.println(totalMap);
         String json = JSONUtils.toJSONString(totalMap);

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

@@ -4649,6 +4649,7 @@
     FROM RMS_CONSIGNEE RC
     WHERE RC.CONSIGNEE_COMPANY_NAME = #{receiveName}
     AND RC.CONSIGNEE_CODE IS NOT NULL
+    AND RC.EAS_CONSIGNEE_ID IS NOT NULL
   </select>
 
   <select id="findSalerId" parameterType="java.lang.String" resultType="DECIMAL" >

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

@@ -1041,9 +1041,21 @@
     SET ASOM.SALE_DATE_OF_RECEIPT = #{receiptDateByDate}
     WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
   </update>
+
   <select id="getOldDateOfReceipt" resultType="java.util.Date" parameterType="decimal">
     SELECT SALE_DATE_OF_RECEIPT FROM AMS_SALE_ORDER_MATERIAL
     WHERE SALE_ORDER_ID = #{saleOrderId}
     FETCH NEXT 1 ROWS ONLY
   </select>
+  <select id="getOrderCount" resultType="java.lang.Integer" parameterType="decimal">
+    SELECT COUNT(ORDER_ID) FROM OMSTRUCK_ORDER
+    WHERE ORDER_PLAN_ID = #{saleOrderMaterialId}
+    AND ORDER_TYPE = 1
+  </select>
+  <update id="updateOrderCarrier">
+    UPDATE OMSTRUCK_ORDER
+    SET CARRIER_ID = #{carrierId}
+    WHERE ORDER_PLAN_ID = #{saleOrderMaterialId}
+    AND ORDER_TYPE = 1
+  </update>
 </mapper>