|
|
|
@ -249,12 +249,20 @@ public class ReceiptoutController {
|
|
|
|
|
List<ReceiptoutEntity> list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType());
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(ReceiptoutEntity entity:list){
|
|
|
|
|
Map<String,Object> sourceNoMap = new HashMap<>();
|
|
|
|
|
entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap));
|
|
|
|
|
Map<String,Object> customerIdMap = new HashMap<>();
|
|
|
|
|
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
|
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(entity.getSourceNo());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)){
|
|
|
|
|
entity.setSourceOrderNo(saleorderitemEntity.getDocumentNo());
|
|
|
|
|
}
|
|
|
|
|
CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(customerEntity)){
|
|
|
|
|
entity.setCustomerNm(customerEntity.getSupplierNm());
|
|
|
|
|
}
|
|
|
|
|
// Map<String,Object> sourceNoMap = new HashMap<>();
|
|
|
|
|
// entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap));
|
|
|
|
|
// Map<String,Object> customerIdMap = new HashMap<>();
|
|
|
|
|
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
// entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
}
|
|
|
|
|
List<ReceiptoutListVO> listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class);
|
|
|
|
|
for(ReceiptoutListVO receiptoutVO:listVO){
|
|
|
|
@ -280,8 +288,8 @@ public class ReceiptoutController {
|
|
|
|
|
case "type" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
|
|
|
|
|
break;
|
|
|
|
|
case "source" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"source"));
|
|
|
|
|
case "sourceOrderNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"sourceOrderNo"));
|
|
|
|
|
break;
|
|
|
|
|
case "amount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库金额" ,"amount"));
|
|
|
|
@ -292,8 +300,8 @@ public class ReceiptoutController {
|
|
|
|
|
case "num" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库数量" ,"num"));
|
|
|
|
|
break;
|
|
|
|
|
case "customerName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
|
|
|
|
|
case "customerNm" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("客户名称" ,"customerNm"));
|
|
|
|
|
break;
|
|
|
|
|
case "remark" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("备注" ,"remark"));
|
|
|
|
|