|
|
@ -23,6 +23,9 @@ import jnpf.poundlist.service.PoundlistService;
|
|
|
|
import jnpf.purchaseback.entity.PurchaseorderEntity;
|
|
|
|
import jnpf.purchaseback.entity.PurchaseorderEntity;
|
|
|
|
import jnpf.purchaseback.service.PurchaseorderService;
|
|
|
|
import jnpf.purchaseback.service.PurchaseorderService;
|
|
|
|
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
|
|
|
|
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
|
|
|
|
|
|
|
|
import jnpf.supplier.entity.SupplierEntity;
|
|
|
|
|
|
|
|
import jnpf.supplier.service.SupplierService;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
@ -112,6 +115,8 @@ public class PaymentdocController {
|
|
|
|
private PaymentService paymentService;
|
|
|
|
private PaymentService paymentService;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private PoundlistService poundlistService;
|
|
|
|
private PoundlistService poundlistService;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private SupplierService supplierService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 列表
|
|
|
|
* 列表
|
|
|
@ -124,9 +129,13 @@ public class PaymentdocController {
|
|
|
|
List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
|
|
|
|
List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
for(PaymentdocEntity entity:list){
|
|
|
|
for(PaymentdocEntity entity:list){
|
|
|
|
Map<String,Object> supplierIdMap = new HashMap<>();
|
|
|
|
// Map<String,Object> supplierIdMap = new HashMap<>();
|
|
|
|
entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
|
|
|
|
// entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
|
|
|
|
|
|
|
|
if (ObjectUtils.isNotEmpty(supplierEntity)){
|
|
|
|
|
|
|
|
entity.setSupplierName(supplierEntity.getSupplierName());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<PaymentdocItem1Entity> PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<PaymentdocItem1Entity> PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>();
|
|
|
|
PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId());
|
|
|
|
PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId());
|
|
|
|