|
@@ -77,7 +77,7 @@ public class OTMSController {
|
|
|
|
|
|
@ApiOperation(value = "新增抵达")
|
|
@ApiOperation(value = "新增抵达")
|
|
@PostMapping(value = "/addtmstruckArrivalResult")
|
|
@PostMapping(value = "/addtmstruckArrivalResult")
|
|
- public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartRequest request) throws Exception {
|
|
|
|
|
|
+ public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, Long arrivalTime, MultipartRequest request) throws Exception {
|
|
//添加到files数组
|
|
//添加到files数组
|
|
List<MultipartFile> files = new ArrayList<>();
|
|
List<MultipartFile> files = new ArrayList<>();
|
|
int index=-1;
|
|
int index=-1;
|
|
@@ -114,7 +114,8 @@ public class OTMSController {
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
}
|
|
}
|
|
mapValue.put("url",url);
|
|
mapValue.put("url",url);
|
|
- return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,url);
|
|
|
|
|
|
+ mapValue.put("arrivalTime",arrivalTime);
|
|
|
|
+ return otmsFeign.addtmstruckArrivalResult(mapValue,orderNumber,resultArrivalAddress,url);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "新增签收")
|
|
@ApiOperation(value = "新增签收")
|
|
@@ -141,12 +142,12 @@ public class OTMSController {
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
}
|
|
}
|
|
mapValue.put("url",url);
|
|
mapValue.put("url",url);
|
|
- return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
|
|
|
|
|
|
+ return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "新增签收网页端")
|
|
@ApiOperation(value = "新增签收网页端")
|
|
@PostMapping(value = "/addTmstruckReceiptResultForWeb")
|
|
@PostMapping(value = "/addTmstruckReceiptResultForWeb")
|
|
- public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
|
|
|
|
|
|
+ public synchronized RESTfulResult addTmstruckReceiptResultForWeb(MultipartRequest request,Long receiptTime, String orderNumber, String resultArrivalAddress) throws Exception {
|
|
//添加到files数组
|
|
//添加到files数组
|
|
List<MultipartFile> files = new ArrayList<>();
|
|
List<MultipartFile> files = new ArrayList<>();
|
|
int index=-1;
|
|
int index=-1;
|
|
@@ -183,7 +184,8 @@ public class OTMSController {
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
url += imageFileUtils.updateFile(file,i)+';';
|
|
}
|
|
}
|
|
mapValue.put("url",url);
|
|
mapValue.put("url",url);
|
|
- return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
|
|
|
|
|
|
+ mapValue.put("receiptTime",receiptTime);
|
|
|
|
+ return otmsFeign.addTmstruckReceiptResult(mapValue,orderNumber,resultArrivalAddress);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value="查询当前报警类型")
|
|
@ApiOperation(value="查询当前报警类型")
|