UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据排序问题

Browse Source
busUser
anthonywj 2 years ago
parent 0f09e030e2
commit 692d5f062d
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -47,6 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -298,6 +299,7 @@ public class UdiRelevanceController {
//更新供应商关联表相关信息
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceRequest.getId(), customerId + "");
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceRequest.getPrice()));
companyProductRelevanceEntity.setUpdate_time(new Date());
companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
}
}

4
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -487,7 +487,9 @@ public class OrderDetailController {
}
}
Collections.sort(resultList, (o1, o2) -> {
Integer cp = o1.getCodeId() - o2.getCodeId();
String o1Str = o1.getCoName() + o1.getPackSpec() + o1.getBatchNo() + o1.getSerialNo();
String o2Str = o2.getCoName() + o2.getPackSpec() + o2.getBatchNo() + o1.getSerialNo();
Integer cp = o1Str.compareTo(o2Str);
return cp;
});
return resultList;

43
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
Unescape Escape View File

@ -97,26 +97,25 @@ public class StockOrderDetailController {
List<StockOrderDetailEntity> stockOrderDetailEntityList
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
//计算实际数量
if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) {
List<WarehouseEntity> codeList = codesService.findByReceiptId(stockOrderEntity.getOrderIdFk());
if (CollUtil.isNotEmpty(codeList)) {
stockOrderDetailEntityList.forEach(stockOrderDetailEntity -> {
codeList.forEach(codeEntity -> {
if (StrUtil.trimToEmpty(codeEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) && (StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))) {
int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(stockOrderDetailEntity.getRelId(), codeEntity.getNameCode());
stockOrderDetailEntity.setReCount(String.valueOf(codeEntity.getCount() * actCount));
}
});
});
}
}
// //计算实际数量
// if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) {
// List<WarehouseEntity> codeList = codesService.findByReceiptId(stockOrderEntity.getOrderIdFk());
// if (CollUtil.isNotEmpty(codeList)) {
// stockOrderDetailEntityList.forEach(stockOrderDetailEntity -> {
// codeList.forEach(codeEntity -> {
// if (StrUtil.trimToEmpty(codeEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) && (StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))) {
// int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(stockOrderDetailEntity.getRelId(), codeEntity.getNameCode());
// stockOrderDetailEntity.setReCount(String.valueOf(codeEntity.getCount() * actCount));
// }
// });
//
// });
// }
//
// }
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {
stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk());
}
@ -146,10 +145,10 @@ public class StockOrderDetailController {
item.setCodeId(codeDetaiEntity.getId().intValue());
item.setSerialNo(codeDetaiEntity.getSerialNo());
item.setCount(codeDetaiEntity.getCount() + "");
//item.setReCount(codeDetaiEntity.getCount() + "");
item.setReCount(codeDetaiEntity.getCount() + "");
//计算实际数量
int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(codeDetaiEntity.getRelId(), codeDetaiEntity.getNameCode());
item.setReCount(String.valueOf(codeDetaiEntity.getCount() * actCount));
// int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(codeDetaiEntity.getRelId(), codeDetaiEntity.getNameCode());
// item.setReCount(String.valueOf(codeDetaiEntity.getCount() * actCount));
resultList.add(item);
}
@ -159,7 +158,9 @@ public class StockOrderDetailController {
}
}
Collections.sort(resultList, (o1, o2) -> {
Integer cp = o1.getCodeId() - o2.getCodeId();
String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo();
String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo();
Integer cp = o1Str.compareTo(o2Str);
return cp;
});

10
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
Unescape Escape View File

@ -441,6 +441,14 @@ public class StockQRCodeTextController {
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
List<StockOrderPrintEntity> list = stockOrderService.listCodePrint(stockOrderEntity.getOrderIdFk());
Collections.sort(list, (o1, o2) -> {
String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo();
String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo();
Integer cp = o1Str.compareTo(o2Str);
return cp;
});
if (list != null && list.size() > 0) {
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
SystemPDFTemplateEntity systemPDFTemplateEntity =
@ -483,6 +491,8 @@ public class StockQRCodeTextController {
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", list);
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");

Write Preview
Loading…
Cancel
Save