xiu

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

@@ -1177,6 +1177,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                 head.put("reason", reason);
                 Map<String, Object> input = new HashMap<>();
                 input.put("head", head);
+                input.put("cancel",true);
                 Map<String, Object> totalMap = easUtil.getTotalMap();
                 totalMap.put("input", input);
                 String json = JSONUtils.toJSONString(totalMap);
@@ -1194,8 +1195,23 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                 //Map<String,Object> outMap = (Map<String,Object>) resultMap.get("output");
                 //JSONObject jsonObject = new JSONObject(outMap);
                 //System.out.println(jsonObject);
-
             }
+            //发送给计量
+            Map<String, Object> cancelOrderMap = new HashMap<>();
+            if(mapValue.get("capacityNo")!=null){
+                cancelOrderMap.put("orderID",mapValue.get("capacityNo"));
+            }else{
+                cancelOrderMap.put("orderID","空白");
+            }
+            cancelOrderMap.put("changeStatus",1);
+            cancelOrderMap.put("content","取消");
+            System.out.println("联动计量取消：" + mapValue.get("capacityNo"));
+            String url = "http://172.16.33.122:44325/api/logistics/CancleOrdersBill";
+            JSONObject cancelOrderJson = new JSONObject(cancelOrderMap);
+            System.out.println("联动计量撤销取消报文：" + cancelOrderJson);
+            String sendUrl = url ;
+            String jsonData =  HTTPRequestUtils.send(sendUrl, cancelOrderJson,"utf-8");
+            System.out.println("联动计量撤销取消响应：" + jsonData);
         }
         return success(result);
     }

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2741,6 +2742,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 设置状态：unClose，反关闭；close，关闭
                 head.put("status",status);
                 input.put("head",head);
+                input.put("unCancel",true);
                 Map<String, Object> totalMap = easUtil.getTotalMap();
                 input.put("head",head);
                 totalMap.put("input",input);
@@ -2755,6 +2757,27 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 }
                 System.out.println(resultMap);
             }
+            try {
+                //发送给计量
+                Map<String, Object> cancelOrderMap = new HashMap<>();
+                if(map.get("capacityNo")!=null){
+                    cancelOrderMap.put("orderID",map.get("capacityNo"));
+                }else{
+                    cancelOrderMap.put("orderID","空白");
+                }
+                cancelOrderMap.put("changeStatus",2);
+                cancelOrderMap.put("content",map.get("capacityNo"));
+                System.out.println("联动计量撤销取消：" + map.get("capacityNo"));
+                String url = "http://172.16.33.122:44325/api/logistics/CancleOrdersBill";
+                JSONObject cancelOrderJson = new JSONObject(cancelOrderMap);
+                System.out.println("联动计量撤销取消报文：" + cancelOrderJson);
+                String sendUrl = url ;
+                String jsonData = null;
+                jsonData = HTTPRequestUtils.send(sendUrl, cancelOrderJson,"utf-8");
+                System.out.println("联动计量撤销取消响应：" + jsonData);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             return 0;
 
         }