修改

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

@@ -223,4 +223,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     BigDecimal getSaleOrderId(String saleNumber);
 
+    BigDecimal getSaleOrderIdByASOM(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -2200,10 +2200,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
         BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
         String oldCapacityNumber = omstruckOrderMapper.getOldCapacityNumber(oldCapacityId);
+        mapValue.put("updateFlag",1);
+        mapValue.put("oldCapacityNumber",oldCapacityNumber);
         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;
         }
@@ -2427,7 +2427,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String reason = (String) mapValue.get("reason");
         BigDecimal saleMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleMaterialId"));
         try {
-            BigDecimal saleOrderId = amsSaleOrderMapper.getSaleOrderId(mapValue.get("number").toString());
+            BigDecimal saleOrderId = amsSaleOrderMapper.getSaleOrderIdByASOM(saleOrderMaterialId);
             saleLogUtil.logSaleOrder(saleOrderId,"物流同步关闭金蝶分录,分录为" + saleMaterialId ,"物流" ,SaleLogUtil.CLOSE);
         } catch (Exception e) {
             e.printStackTrace();
@@ -3239,6 +3239,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     throw new Exception("上传金蝶失败！请重试派车:"+result.getJSONObject("requestException").getString("message"));
                 }else {
                     if(map.get("oldCapacityNumber") != null && DataChange.dataToBigDecimal(map.get("capacityId")).compareTo(new BigDecimal(35128)) == 0) {
+                        System.out.println("联动计量取消：" + map.get("oldCapacityNumber"));
                         String url = "http://172.16.33.122:44325/api/logistics/CancleOrdersBill";
                         Map<String, Object> cancelOrderMap = new HashMap<>();
                         cancelOrderMap.put("carNo",map.get("oldCapacityNumber"));

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

@@ -5013,5 +5013,9 @@
     SELECT SALE_ORDER_ID FROM AMS_SALE_ORDER
     WHERE SALE_NUMBER = #{saleNumber}
   </select>
+  <select id="getSaleOrderIdByASOM" resultType="java.math.BigDecimal" parameterType="decimal">
+    SELECT SALE_ORDER_ID FROM AMS_SALE_ORDER_MATERIAL
+    WHERE SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+  </select>
 
 </mapper>

src/main/resources/log4j.properties

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