as

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

@@ -78,7 +78,11 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
 
     @ApiOperation(value="发送留皮计量委托(neizhuan)")
     @GetMapping("/sendLiuPiMeasureCommission")
-    public String sendLiuPiMeasureCommission(String capacityNumber){
-        return tmstruckMeasureCommissionService.sendLiuPiMeasureCommission(capacityNumber);
+    public RESTfulResult sendLiuPiMeasureCommission(String capacityNumber){
+        String str = tmstruckMeasureCommissionService.sendLiuPiMeasureCommission(capacityNumber);
+        if("no".equals(str)){
+            return failed("发送失败！请联系管理员");
+        }
+        return success(str);
     }
 }

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

@@ -309,15 +309,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //判断是否为未装货
         if (map.get("insertUpdateRemark")!=null) {
             String insertUpdateRemark = (String) map.get("insertUpdateRemark");
-            if("未装货".equals(insertUpdateRemark)){
+            if("未装货".equals(insertUpdateRemark) && orderType.intValue() != 11){
                 loadJudge(orderMap);
             }
             tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
         }
-
-//        if (j == 0) {
-//            throw new Exception("第二次委托发送失败");
-//        }
         tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
         i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket

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

@@ -325,7 +325,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计量委托
 
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission, daGangUrl);
+        return sendMesToMeasure(measureCommission);
 
     }
 
@@ -413,14 +413,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @param map
      * @return
      */
-    public int sendMesToMeasure(Map<String, Object> map, String url){
+    public int sendMesToMeasure(Map<String, Object> map){
         List<Map<String, Object>> sendMap = new ArrayList<>();
         sendMap.add(map);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data", sendMap);
         String jsonData = null;
         try {
-            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+            jsonData = HTTPRequestUtils.send(daGangUrl, jsonObject, "utf-8");
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -555,7 +555,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         map.put("purchOrder", num);
         int i = sendMesToMeasure2(map, liuPiUrl);
         if(i != 1){
-            return "委托发送失败!";
+            return "no";
         }
         // 设置单线程避免因网络问题同一时间高并发导致时间戳重复  (访问接口需要时间 也可能不需要)
         try {