|
@@ -457,7 +457,7 @@ public class ReportController {
|
|
List<String> shipmentList = new ArrayList<>();
|
|
List<String> shipmentList = new ArrayList<>();
|
|
List<Stock> stockList = stockService.findList(work.getId());
|
|
List<Stock> stockList = stockService.findList(work.getId());
|
|
for(Stock stock : stockList){
|
|
for(Stock stock : stockList){
|
|
- lengthList.add(stock.getLength() + "m");
|
|
|
|
|
|
+ lengthList.add(stock.getTagLength() + "m");
|
|
actualQuantityM = actualQuantityM.add(stock.getLength());
|
|
actualQuantityM = actualQuantityM.add(stock.getLength());
|
|
if(stock.getUpdateTime() != null && !shipmentList.contains(sdf.format(stock.getUpdateTime()))) {
|
|
if(stock.getUpdateTime() != null && !shipmentList.contains(sdf.format(stock.getUpdateTime()))) {
|
|
shipmentList.add(sdf.format(stock.getUpdateTime()));
|
|
shipmentList.add(sdf.format(stock.getUpdateTime()));
|
|
@@ -507,7 +507,7 @@ public class ReportController {
|
|
return msgResult;
|
|
return msgResult;
|
|
}
|
|
}
|
|
|
|
|
|
- @ApiOperation(value="年度对账单报表")
|
|
|
|
|
|
+ @ApiOperation(value="发货结算表报表")
|
|
@RequestMapping(value = "monthFHJSBXls",method = RequestMethod.POST)
|
|
@RequestMapping(value = "monthFHJSBXls",method = RequestMethod.POST)
|
|
public MessageResult monthFHJSBXls(String customerId, Date selectDate) throws Exception {
|
|
public MessageResult monthFHJSBXls(String customerId, Date selectDate) throws Exception {
|
|
MessageResult msgResult = new MessageResult<>();
|
|
MessageResult msgResult = new MessageResult<>();
|