|
@@ -29,35 +29,28 @@ public class DataWareHouseController { |
|
@@ -29,35 +29,28 @@ public class DataWareHouseController { |
|
29
|
/**
|
29
|
/**
|
|
30
|
* 获取数据仓库服务的相关数据.
|
30
|
* 获取数据仓库服务的相关数据.
|
|
31
|
*
|
31
|
*
|
|
32
|
- * @param resultList {@link ResultExitData}
|
32
|
+ * @param waybillNoMaster 运单号
|
|
33
|
* @return
|
33
|
* @return
|
|
34
|
*/
|
34
|
*/
|
|
35
|
- @PutMapping("/getInfo")
|
|
|
|
36
|
- public List<ResultExitData> getInfo(@RequestBody List<ResultExitData> resultList) {
|
|
|
|
37
|
- System.out.println("开始调用数据仓库服务");
|
|
|
|
38
|
- System.out.println("长度为" + resultList.size());
|
|
|
|
39
|
- for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) {
|
|
|
|
40
|
- ResultExitData result = resultList.get(i);
|
|
|
|
41
|
- System.out.println(i + "运单号" + result.getWaybillNoMaster());
|
|
|
|
42
|
-
|
|
|
|
43
|
- /**
|
|
|
|
44
|
- * 根据运单号，获取 TxdUdep 中的体积
|
|
|
|
45
|
- */
|
|
|
|
46
|
- List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(result.getWaybillNoMaster());
|
|
|
|
47
|
- if (txdUdeps != null && txdUdeps.size() > 0) {
|
|
|
|
48
|
- //设置体积
|
|
|
|
49
|
- result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure());
|
|
|
|
50
|
- }
|
|
|
|
51
|
- /**
|
|
|
|
52
|
- * 根据运单号，获取计费重量
|
|
|
|
53
|
- */
|
|
|
|
54
|
- List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(result.getWaybillNoMaster());
|
|
|
|
55
|
- if (txdUfoInfo != null && txdUfoInfo.size() > 0) {
|
|
|
|
56
|
- //设置计费重量
|
|
|
|
57
|
- result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure());
|
|
|
|
58
|
- }
|
35
|
+ @GetMapping("/getInfo")
|
|
|
|
36
|
+ public ResultExitData getInfo(@RequestParam(value = "waybillNoMaster", required = false) String waybillNoMaster) {
|
|
|
|
37
|
+ ResultExitData result = new ResultExitData();
|
|
|
|
38
|
+ /**
|
|
|
|
39
|
+ * 根据运单号，获取 TxdUdep 中的体积
|
|
|
|
40
|
+ */
|
|
|
|
41
|
+ List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(waybillNoMaster);
|
|
|
|
42
|
+ if (txdUdeps != null && txdUdeps.size() > 0) {
|
|
|
|
43
|
+ //设置体积
|
|
|
|
44
|
+ result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure());
|
|
|
|
45
|
+ }
|
|
|
|
46
|
+ /**
|
|
|
|
47
|
+ * 根据运单号，获取计费重量
|
|
|
|
48
|
+ */
|
|
|
|
49
|
+ List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(waybillNoMaster);
|
|
|
|
50
|
+ if (txdUfoInfo != null && txdUfoInfo.size() > 0) {
|
|
|
|
51
|
+ //设置计费重量
|
|
|
|
52
|
+ result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure());
|
|
59
|
}
|
53
|
}
|
|
60
|
- System.out.println("数据仓库服务，调用完毕");
|
|
|
|
61
|
- return resultList;
|
54
|
+ return result;
|
|
62
|
}
|
55
|
}
|
|
63
|
} |
56
|
} |
