|
@@ -350,7 +350,7 @@ public class TMSController extends BaseRESTfulController {
|
|
|
@PostMapping(value = "/purchaseTrainLoad")
|
|
@PostMapping(value = "/purchaseTrainLoad")
|
|
|
// @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
|
|
// @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
|
|
|
public Map<String, Object> purchaseTrainLoad(@RequestBody MultipartFile file,
|
|
public Map<String, Object> purchaseTrainLoad(@RequestBody MultipartFile file,
|
|
|
- String materialType,
|
|
|
|
|
|
|
+ String orderType,
|
|
|
String userId,
|
|
String userId,
|
|
|
String userName) throws Exception {
|
|
String userName) throws Exception {
|
|
|
File excel = ExcelToolUtils.multipartFileToFile(file);
|
|
File excel = ExcelToolUtils.multipartFileToFile(file);
|
|
@@ -421,8 +421,8 @@ public class TMSController extends BaseRESTfulController {
|
|
|
//新增AMS及TMS
|
|
//新增AMS及TMS
|
|
|
map.put("userId",userId);
|
|
map.put("userId",userId);
|
|
|
map.put("userName",userName);
|
|
map.put("userName",userName);
|
|
|
- map.put("materialType",materialType);
|
|
|
|
|
- return tmsFeign.purchaseTrainLoad(map,userId,userName);
|
|
|
|
|
|
|
+ map.put("orderType",orderType);
|
|
|
|
|
+ return tmsFeign.purchaseTrainLoad(map);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation(value = "查询采购火运装货")
|
|
@ApiOperation(value = "查询采购火运装货")
|