yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出入库导出功能

Browse Source
product
杨世强 1 year ago
parent ad491f5b73
commit a52b397093
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File

24
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
Unescape View File

@ -224,10 +224,18 @@ public class ReceiptinController {
List<ReceiptinEntity> list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(ReceiptinEntity entity:list){
Map<String,Object> soucenoMap = new HashMap<>();
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap));
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap));
PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(entity.getSouceno());
if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){
entity.setPurchaseorderSouceno(purchaseorderitemEntity.getDocumentNo());
}
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
if (ObjectUtils.isNotEmpty(supplierEntity)){
entity.setSupplier(supplierEntity.getSupplierName());
}
// Map<String,Object> soucenoMap = new HashMap<>();
// entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap));
// Map<String,Object> supplierIdMap = new HashMap<>();
// entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
@ -254,8 +262,8 @@ public class ReceiptinController {
case "type" :
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
break;
case "souceno" :
entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
case "purchaseorderSouceno" :
entitys.add(new ExcelExportEntity("来源单号" ,"purchaseorderSouceno"));
break;
case "receiptamount" :
entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount"));
@ -266,8 +274,8 @@ public class ReceiptinController {
case "receiptnum" :
entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum"));
break;
case "suppliername" :
entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername"));
case "supplier" :
entitys.add(new ExcelExportEntity("供应商名称" ,"supplier"));
break;
case "supplierId" :
entitys.add(new ExcelExportEntity("供应商id" ,"supplierId"));

26
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java
Unescape View File

@ -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"));

Write Preview
Loading…
Cancel
Save