|
@@ -712,21 +712,21 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
return failed("匹配不到车牌号!");
|
|
return failed("匹配不到车牌号!");
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
-// for (Map<String, Object> map : mapList) {
|
|
|
|
-// // 调用EAS接口将车牌号传给金蝶
|
|
|
|
-// BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
|
|
|
|
-// Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
|
|
|
|
-// Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
|
|
|
|
-// totalMap.put("input",input);
|
|
|
|
-// System.out.println(totalMap);
|
|
|
|
-// String json = JSONUtils.toJSONString(totalMap);
|
|
|
|
-// System.out.println(json);
|
|
|
|
-// Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
|
|
|
|
-// if (s == null || s.size() == 0) {
|
|
|
|
-// throw new Exception("登录金蝶失败");
|
|
|
|
-// }
|
|
|
|
-// System.out.println(s);
|
|
|
|
-// }
|
|
|
|
|
|
+ for (Map<String, Object> map : mapList) {
|
|
|
|
+ // 调用EAS接口将车牌号传给金蝶
|
|
|
|
+ BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
|
|
|
|
+ Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
|
|
|
|
+ Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
|
|
|
|
+ totalMap.put("input",input);
|
|
|
|
+ System.out.println(totalMap);
|
|
|
|
+ String json = JSONUtils.toJSONString(totalMap);
|
|
|
|
+ System.out.println(json);
|
|
|
|
+ Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
|
|
|
|
+ if (s == null || s.size() == 0) {
|
|
|
|
+ throw new Exception("登录金蝶失败");
|
|
|
|
+ }
|
|
|
|
+ System.out.println(s);
|
|
|
|
+ }
|
|
return success(result);
|
|
return success(result);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1156,18 +1156,18 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
return failed("已装货车辆不允许修改车牌");
|
|
return failed("已装货车辆不允许修改车牌");
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
-// // 调用EAS接口将车牌号传给金蝶
|
|
|
|
-// BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
|
|
|
|
-// Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
|
|
|
|
-// Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
|
|
|
|
-// totalMap.put("input", input);
|
|
|
|
-// System.out.println(totalMap);
|
|
|
|
-// String json = JSONUtils.toJSONString(totalMap);
|
|
|
|
-// System.out.println(json);
|
|
|
|
-// Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
|
|
|
|
-// System.out.println("-------------------------------------");
|
|
|
|
-// System.out.println(s);
|
|
|
|
-// System.out.println("-------------------------------------");
|
|
|
|
|
|
+ // 调用EAS接口将车牌号传给金蝶
|
|
|
|
+ BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
|
|
|
|
+ Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
|
|
|
|
+ Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
|
|
|
|
+ totalMap.put("input", input);
|
|
|
|
+ System.out.println(totalMap);
|
|
|
|
+ String json = JSONUtils.toJSONString(totalMap);
|
|
|
|
+ System.out.println(json);
|
|
|
|
+ Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
|
|
|
|
+ System.out.println("-------------------------------------");
|
|
|
|
+ System.out.println(s);
|
|
|
|
+ System.out.println("-------------------------------------");
|
|
return success(result);
|
|
return success(result);
|
|
}
|
|
}
|
|
}
|
|
}
|