改动：取消的逻辑

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

@@ -2546,7 +2546,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             tmstruckWeightResult.setGrossSegmentSqe(new BigDecimal(grossNum));
             tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(tareNum));
             result += tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
-
             // 出库子表
             BigDecimal outBoundId = (BigDecimal) saleMaterialMap.get("outBoundId");
             BigDecimal materialNumber = (BigDecimal) saleMaterialMap.get("materialNumber");
@@ -3214,6 +3213,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         try{
             //存在capacityId则判断是否取消或撤销取消
             if(map.get("capacityId")!=null){
+                List<Map<String,Object>> entriesList = (List<Map<String,Object>>) input.get("entries");
                 //新车号、当前车号、旧车号
                 String capacityId ="" + map.get("capacityId");
                 Map<String,Object>  capacityDetails=  amsSaleOrderMapper.getCapacityDetailByAsom(map);
@@ -3223,26 +3223,34 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     if(capacityId.equals("35128") && !capacityId.equals(nowCapcaityId)){
                         //判断是否正常转取消:新车号为取消且不等于旧车号
                         input.put("cancel",true);
+                        for(Map<String,Object> entriesMap : entriesList) {
+                            entriesMap.put("changeStatus",1);
+                        }
                     }else if(capacityDetails.get("oldCapacityIds")!=null){
                         //存在旧车号，判断是否撤销取消:当前车号为取消，且最近的旧车号等于新车号
                         String[] oldCapacityIds =("" + capacityDetails.get("oldCapacityIds")).split(",");
                         String lastOldCapacity = oldCapacityIds[0];
                         if(nowCapcaityId.equals("35128") && lastOldCapacity.equals(capacityId)){
                             input.put("unCancel",true);
+                            for(Map<String,Object> entriesMap : entriesList) {
+                                entriesMap.put("changeStatus",2);
+                            }
                         }
                     }
                     //发送给计量
                     if(input.get("cancel")!=null || input.get("unCancel")!=null){
                         Map<String, Object> cancelOrderMap = new HashMap<>();
-                        cancelOrderMap.put("carNo",map.get("oldCapacityNumber"));
+                        cancelOrderMap.put("orderID",capacityDetails.get("orderNumber"));
                         if(input.get("cancel")!=null){
-                            cancelOrderMap.put("cancel",input.get("cancel"));
+                            cancelOrderMap.put("changeStatus",1);
+                            cancelOrderMap.put("content","取消");
                             System.out.println("联动计量取消：" + map.get("oldCapacityNumber"));
                         }else if(input.get("unCancel")!=null){
-                            cancelOrderMap.put("unCancel",input.get("unCancel"));
+                            cancelOrderMap.put("changeStatus",2);
+                            cancelOrderMap.put("content",map.get("capacityNo"));
                             System.out.println("联动计量撤销取消：" + map.get("oldCapacityNumber"));
                         }
-                        String url = "http://172.16.33.122:44325/api/logistics/CancleOrdersBill";
+                        String url = "http://172.16.33.122:44325/api/logistics/DelOrdersBill";
                         JSONObject cancelOrderJson = new JSONObject(cancelOrderMap);
                         String sendUrl = url ;
                         String jsonData =  HTTPRequestUtils.send(sendUrl, cancelOrderJson,"utf-8");

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

@@ -5020,7 +5020,8 @@
     <select id="getCapacityDetailByAsom" resultType="java.util.Map">
       SELECT
         OO .CAPACITY_ID "nowCapcaityId",
-        OO .CAPACITYIDS "oldCapacityIds"
+        OO .CAPACITYIDS "oldCapacityIds",
+        OO .ORDER_NUMBER    "orderNumber"
       FROM AMS_SALE_ORDER ASO
              LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID