|
@@ -228,14 +228,17 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
|
|
|
.eq("relation_id", paymentManagement.getRelationId())
|
|
|
.eq("comp_id", paymentManagement.getCompId()));
|
|
|
+ //公司信息
|
|
|
CommonCompany commonCompany = commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
|
|
|
.eq("comp_id", paymentManagement.getCompId()));
|
|
|
+ //合同信息
|
|
|
ContractManagementInfo contractManagementInfo=ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id",paymentManagement.getCompId())
|
|
|
.eq("contract_no",paymentManagement.getContractNo()));
|
|
|
if (contractManagementInfo!=null){
|
|
|
paymentManagement.setContractManagement(contractManagementInfo);
|
|
|
}
|
|
|
+ //仓库信息
|
|
|
WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
|
|
|
.eq("comp_id",qualityInspectionManagement.getCompId())
|
|
|
.eq("warehouse_name",qualityInspectionManagement.getWarehouseName()));
|
|
@@ -245,6 +248,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
paymentManagement.setCompName(commonCompany.getCompName());
|
|
|
paymentManagement.setTaxRegistrationNo(commonCompany.getCompImo());
|
|
|
}
|
|
|
+ //联系人
|
|
|
+ if(warehouseBaseInfo != null){
|
|
|
+ paymentManagement.setContacts(warehouseBaseInfo.getPersonCharge());
|
|
|
+ paymentManagement.setContactsPhone(warehouseBaseInfo.getPersonPhone());
|
|
|
+ }
|
|
|
PurchasePrice purchasePrice = purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
|
|
|
.eq("warehouse_name", qualityInspectionManagement.getWarehouseName())
|
|
|
.eq("goods_name", qualityInspectionManagement.getGoodsName())
|