|
@@ -2,6 +2,8 @@ package com.steerinfo.dil.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.google.common.cache.Weigher;
|
|
|
+import com.steerinfo.dil.feign.JoinFeign;
|
|
|
import com.steerinfo.dil.mapper.*;
|
|
|
import com.steerinfo.dil.model.MeasureJsonData;
|
|
|
import com.steerinfo.dil.model.TmstruckMeasureCommission;
|
|
@@ -56,6 +58,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
@Autowired
|
|
|
private TmstruckTareReturnResultMapper tmstruckTareReturnResultMapper;
|
|
|
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private JoinFeign joinFeign;
|
|
|
+
|
|
|
private static final String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
|
|
|
|
|
|
private static final String dagangUrlForLoad = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
|
|
@@ -263,6 +269,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.put("IsAssembly", true);
|
|
|
}
|
|
|
}
|
|
|
+ measureCommission.put("orderType",1);
|
|
|
System.out.println(measureCommission);
|
|
|
return sendMesToMeasure(measureCommission);
|
|
|
}
|
|
@@ -649,6 +656,36 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
System.out.println(hashMap.get("msg"));
|
|
|
if(success){
|
|
|
return 1;
|
|
|
+ }else{
|
|
|
+ try {
|
|
|
+ if(map.get("orderType") != null && DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 1) {
|
|
|
+ Object weight = hashMap.get("weight");
|
|
|
+ Object weightDateTime = hashMap.get("weightDateTime");
|
|
|
+ if(weight != null && weightDateTime != null){
|
|
|
+ List<Map<String,Object>> mapListWeight = new ArrayList<>();
|
|
|
+ Map<String, Object> weightMap = new HashMap<>();
|
|
|
+ weightMap.put("orderNumber",map.get("transportNum"));
|
|
|
+ weightMap.put("resultTareCalculateNumber","一号汽车衡");
|
|
|
+ weightMap.put("resultTareWeight",weight);
|
|
|
+ weightMap.put("resultTareWeightTime",weightDateTime);
|
|
|
+ weightMap.put("carNo",map.get("carNum"));
|
|
|
+ weightMap.put("flag","GCXS");
|
|
|
+ weightMap.put("needCheckToKD",1);
|
|
|
+ weightMap.put("resultCrossCalculateNumber","");
|
|
|
+ weightMap.put("resultCrossWeight","");
|
|
|
+ weightMap.put("resultNetWeight","");
|
|
|
+ weightMap.put("resultCrossWeightTime","");
|
|
|
+ weightMap.put("resultNetWeightTime","");
|
|
|
+ weightMap.put("resultPoundNo","");
|
|
|
+ weightMap.put("materialId","");
|
|
|
+ weightMap.put("wuliuRemark","委托带出皮重");
|
|
|
+ mapListWeight.add(weightMap);
|
|
|
+ joinFeign.receiveTmsTruckWeightResultByDaGang(mapListWeight);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
System.out.println("委托发送失败:" + jsonData);
|