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

Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

Browse Source
product
mhsnet 1 year ago
parent 821be7afb1 ce62f8891b
commit 1a995d1144
18 changed files with 747 additions and 331 deletions
Show Stats Download Patch File Download Diff File

16
SC-boot/linkage-example/src/main/java/jnpf/util/GeneraterSwapUtil.java
Unescape View File

@ -293,6 +293,22 @@ public class GeneraterSwapUtil {
}
return "";
}
/**
* 用户id转名称,但是去掉账户
*
* @param id
* @return
*/
public String userSelectValue2(String id) {
if (StringUtil.isNotEmpty(id)) {
UserEntity userEntity = userService.getInfo(id);
if (ObjectUtil.isNotEmpty(userEntity)) {
return userEntity.getRealName();
}
return id;
}
return "";
}
/**
* 用户id转名称(多选)

50
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
Unescape View File

@ -252,12 +252,38 @@ public class ArinvoicesController {
List<ArinvoicesEntity> list= arinvoicesService.getTypeList(arinvoicesPagination,arinvoicesPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(ArinvoicesEntity entity:list){
Map<String,Object> salesOrderIdMap = new HashMap<>();
entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity)){
entity.setCustomerNm(customerEntity.getSupplierNm());
}
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setContractNm(contractFileEntity.getContractName());
}
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(entity.getSalesOrderId());
if (ObjectUtils.isNotEmpty(saleorderitemEntity)){
entity.setSourceOrderNo(saleorderitemEntity.getDocumentNo());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("审批中");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已审批");
}
// Map<String,Object> salesOrderIdMap = new HashMap<>();
// entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
// Map<String,Object> contractIdMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
// Map<String,Object> customerIdMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
}
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){
@ -304,14 +330,14 @@ public class ArinvoicesController {
case "invoiceQuantity" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceQuantity"));
break;
case "salesOrderId" :
entitys.add(new ExcelExportEntity("销售订单号" ,"salesOrderId"));
case "sourceOrderNo" :
entitys.add(new ExcelExportEntity("来源单号" ,"sourceOrderNo"));
break;
case "contractId" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractId"));
case "contractNm" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractNm"));
break;
case "customerId" :
entitys.add(new ExcelExportEntity("客户" ,"customerId"));
case "customerNm" :
entitys.add(new ExcelExportEntity("客户" ,"customerNm"));
break;
default:
break;

77
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -369,11 +369,53 @@ public class CollectionController {
List<CollectionEntity> list= collectionService.getTypeList(collectionPagination,collectionPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(CollectionEntity entity:list){
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity)){
entity.setCustomerNm(customerEntity.getSupplierNm());
}
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setContractNm(contractFileEntity.getContractName());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("已提交");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已认款");
}
if("0".equals(entity.getPaymentType())){
entity.setPaymentType("货款");
}else if("1".equals(entity.getPaymentType())){
entity.setPaymentType("运费");
}else if("2".equals(entity.getPaymentType())){
entity.setPaymentType("仓储");
}
if("0".equals(entity.getSettlementType())){
entity.setSettlementType("现金");
}else if("1".equals(entity.getSettlementType())){
entity.setSettlementType("赊购");
}else if("2".equals(entity.getSettlementType())){
entity.setSettlementType("网银");
}else if("3".equals(entity.getSettlementType())){
entity.setSettlementType("银企直连");
}else if("4".equals(entity.getSettlementType())){
entity.setSettlementType("银票");
}else if("5".equals(entity.getSettlementType())){
entity.setSettlementType("商票");
}
// Map<String,Object> customerIdMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap));
// Map<String,Object> contractIdMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
// entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
}
List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class);
for(CollectionListVO collectionVO:listVO){
@ -396,8 +438,14 @@ public class CollectionController {
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "customerId" :
entitys.add(new ExcelExportEntity("客户" ,"customerId"));
case "customerNm" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerNm"));
break;
case "contractNm" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractNm"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "amountCollected" :
entitys.add(new ExcelExportEntity("收款金额" ,"amountCollected"));
@ -411,18 +459,15 @@ public class CollectionController {
case "paymentType" :
entitys.add(new ExcelExportEntity("收款类型 " ,"paymentType"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "settlementType" :
entitys.add(new ExcelExportEntity("结算类型" ,"settlementType"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
case "voucher" :
entitys.add(new ExcelExportEntity("收款凭证" ,"voucher"));
break;
// case "remark" :
// entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
// break;
// case "voucher" :
// entitys.add(new ExcelExportEntity("收款凭证" ,"voucher"));
// break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;

46
SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java
Unescape View File

@ -24,6 +24,7 @@ import jnpf.poundlist.service.PoundlistService;
import jnpf.purchaseback.entity.PurchaseorderEntity;
import jnpf.purchaseback.service.PurchaseorderService;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.Purchaseorder_item0Service;
import jnpf.purchaseorder.service.PurchaseorderitemService;
import jnpf.supplier.entity.SupplierEntity;
@ -242,12 +243,45 @@ public class InvoicesController {
List<InvoicesEntity> list= invoicesService.getTypeList(invoicesPagination,invoicesPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(InvoicesEntity entity:list){
Map<String,Object> purchaseorderIdMap = new HashMap<>();
entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseorderId(),purchaseorderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(entity.getPurchaseorderId());
if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){
entity.setPurchaseorderId(purchaseorderitemEntity.getDocumentNo());
}
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
if (ObjectUtils.isNotEmpty(supplierEntity)){
entity.setSupplierId(supplierEntity.getSupplierName());
}
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setContractId(contractFileEntity.getContractName());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("审批中");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已审批");
}
if("0".equals(entity.getInvoiceType())){
entity.setInvoiceType("普通增值税发票");
}else if("1".equals(entity.getInvoiceType())){
entity.setInvoiceType("专用增值税发票");
}else if("2".equals(entity.getInvoiceType())){
entity.setInvoiceType("电子增值税发票");
}
// Map<String,Object> purchaseorderIdMap = new HashMap<>();
// entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseorderId(),purchaseorderIdMap));
// Map<String,Object> contractIdMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
// Map<String,Object> supplierIdMap = new HashMap<>();
// entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
}
List<InvoicesListVO> listVO=JsonUtil.getJsonToList(list,InvoicesListVO.class);
for(InvoicesListVO invoicesVO:listVO){

124
SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java
Unescape View File

@ -32,6 +32,8 @@ import jnpf.purchaseback.service.PurchaseorderService;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.PurchaseorderitemService;
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.math.NumberUtils;
@ -114,6 +116,8 @@ public class PaymentController {
private PoundlistService poundlistService;
@Autowired
private PaymentdocItem1Service paymentdocItem1Service;
@Autowired
private SupplierService supplierService;
@PostMapping("/submitprice")
@Transactional
@ -320,7 +324,46 @@ public class PaymentController {
List<PaymentEntity> list= paymentService.getTypeList(paymentPagination,paymentPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(PaymentEntity entity:list){
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
// entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
if (ObjectUtils.isNotEmpty(supplierEntity)){
entity.setSuppliername(supplierEntity.getSupplierName());
}
entity.setApplicantName(generaterSwapUtil.userSelectValue2(entity.getApplicant()));
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("已提交");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已认款");
}
if("0".equals(entity.getPaymenttype())){
entity.setPaymenttype("货款");
}else if("1".equals(entity.getPaymenttype())){
entity.setPaymenttype("运费");
}else if("2".equals(entity.getPaymenttype())){
entity.setPaymenttype("仓储");
}
if("0".equals(entity.getSettlementtype())){
entity.setSettlementtype("现金");
}else if("1".equals(entity.getSettlementtype())){
entity.setSettlementtype("赊购");
}else if("2".equals(entity.getSettlementtype())){
entity.setSettlementtype("网银");
}else if("3".equals(entity.getSettlementtype())){
entity.setSettlementtype("银企直连");
}else if("4".equals(entity.getSettlementtype())){
entity.setSettlementtype("银票");
}else if("5".equals(entity.getSettlementtype())){
entity.setSettlementtype("商票");
}
}
List<PaymentListVO> listVO=JsonUtil.getJsonToList(list,PaymentListVO.class);
for(PaymentListVO paymentVO:listVO){
@ -343,53 +386,60 @@ public class PaymentController {
case "documentno" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentno"));
break;
case "paymentno" :
entitys.add(new ExcelExportEntity("来源单号" ,"paymentno"));
break;
case "suppliername" :
entitys.add(new ExcelExportEntity("供应商" ,"suppliername"));
break;
case "paymenttype" :
entitys.add(new ExcelExportEntity("付款类型" ,"paymenttype"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态" ,"status"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "duedate" :
entitys.add(new ExcelExportEntity("应付日期" ,"duedate"));
break;
case "businessdate" :
entitys.add(new ExcelExportEntity("实付日期" ,"businessdate"));
break;
case "paymentamount" :
entitys.add(new ExcelExportEntity("付款金额" ,"paymentamount"));
break;
case "requestedamount" :
entitys.add(new ExcelExportEntity("申请金额" ,"requestedamount"));
break;
case "applicantName" :
entitys.add(new ExcelExportEntity("申请人" ,"applicantName"));
break;
case "paymentdocNum" :
entitys.add(new ExcelExportEntity("结算重量" ,"paymentdocNum"));
break;
case "paymentaccount" :
entitys.add(new ExcelExportEntity("付款账户" ,"paymentaccount"));
break;
case "paymentbank" :
entitys.add(new ExcelExportEntity("付款银行" ,"paymentbank"));
break;
case "paymentamount" :
entitys.add(new ExcelExportEntity("付款金额" ,"paymentamount"));
break;
case "collectionaccount" :
entitys.add(new ExcelExportEntity("收款账户" ,"collectionaccount"));
break;
case "collectionbank" :
entitys.add(new ExcelExportEntity("收款银行" ,"collectionbank"));
break;
case "requestedamount" :
entitys.add(new ExcelExportEntity("申请金额" ,"requestedamount"));
break;
case "duedate" :
entitys.add(new ExcelExportEntity("应付日期" ,"duedate"));
break;
case "businessdate" :
entitys.add(new ExcelExportEntity("实付日期" ,"businessdate"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "settlementtype" :
entitys.add(new ExcelExportEntity("结算类型" ,"settlementtype"));
break;
case "paymentno" :
entitys.add(new ExcelExportEntity("来源单号" ,"paymentno"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
case "paymenttype" :
entitys.add(new ExcelExportEntity("付款类型" ,"paymenttype"));
break;
case "settlementtype" :
entitys.add(new ExcelExportEntity("结算类型" ,"settlementtype"));
break;
case "accountingPeriod" :
entitys.add(new ExcelExportEntity("账期(日)" ,"accountingPeriod"));
break;
case "paymentDate" :
entitys.add(new ExcelExportEntity("应回日期" ,"paymentDate"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态" ,"status"));
case "overdueInterest" :
entitys.add(new ExcelExportEntity("逾期利息" ,"overdueInterest"));
break;
case "voucher" :
entitys.add(new ExcelExportEntity("付款凭证" ,"voucher"));
default:
break;
}

208
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -260,6 +260,10 @@ public class PoundlistController {
List<PoundlistEntity> list= poundlistService.getTypeList(poundlistPagination,poundlistPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(PoundlistEntity entity:list){
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
if (ObjectUtils.isNotEmpty(vehicleEntity)){
entity.setVehicleName(vehicleEntity.getTicketno());
}
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
entity.setAdvance("0".equals(entity.getAdvance()) ? "否" : "是");
@ -316,111 +320,105 @@ public class PoundlistController {
if(keys.length>0){
for(String key:keys){
switch(key){
case "poundPictures" :
entitys.add(new ExcelExportEntity("磅单图片" ,"poundPictures"));
break;
case "materialName" :
entitys.add(new ExcelExportEntity("物料名称" ,"materialName"));
break;
case "customerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
break;
case "salesName" :
entitys.add(new ExcelExportEntity("销售合同" ,"salesName"));
break;
case "vehicleName" :
entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName"));
break;
case "vehiclePictures" :
entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
break;
case "poundDate" :
entitys.add(new ExcelExportEntity("磅单日期" ,"poundDate"));
break;
case "poundlistNo" :
entitys.add(new ExcelExportEntity("磅单号" ,"poundlistNo"));
break;
case "tareWeight" :
entitys.add(new ExcelExportEntity("皮重" ,"tareWeight"));
break;
case "grossWeight" :
entitys.add(new ExcelExportEntity("毛重" ,"grossWeight"));
break;
case "buckleWeight" :
entitys.add(new ExcelExportEntity("扣重" ,"buckleWeight"));
break;
case "netWeight" :
entitys.add(new ExcelExportEntity("净重" ,"netWeight"));
break;
case "unit" :
entitys.add(new ExcelExportEntity("单位" ,"unit"));
break;
case "transportType" :
entitys.add(new ExcelExportEntity("运输类型" ,"transportType"));
break;
case "advance" :
entitys.add(new ExcelExportEntity("是否垫资" ,"advance"));
break;
case "collectPrice" :
entitys.add(new ExcelExportEntity("收货价格" ,"collectPrice"));
break;
case "salesPrice" :
entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
break;
case "businessName" :
entitys.add(new ExcelExportEntity("业务员" ,"businessName"));
break;
case "naturalId" :
entitys.add(new ExcelExportEntity("自然人" ,"naturalId"));
break;
case "purchaseName" :
entitys.add(new ExcelExportEntity("采购合同" ,"purchaseName"));
break;
case "supplierName" :
entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
break;
case "settlement" :
entitys.add(new ExcelExportEntity("结算重量" ,"settlement"));
break;
case "purchasePrice" :
entitys.add(new ExcelExportEntity("采购单价" ,"purchasePrice"));
break;
case "inputDate" :
entitys.add(new ExcelExportEntity("进项票日期" ,"inputDate"));
break;
case "outputDate" :
entitys.add(new ExcelExportEntity("销项票日期" ,"outputDate"));
break;
case "payDate" :
entitys.add(new ExcelExportEntity("付款日期" ,"payDate"));
break;
case "paymentDate" :
entitys.add(new ExcelExportEntity("回款日期" ,"paymentDate"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
break;
case "purchaseStatus" :
entitys.add(new ExcelExportEntity("采购状态" ,"purchaseStatus"));
break;
case "salesStatus" :
entitys.add(new ExcelExportEntity("销售状态" ,"salesStatus"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("创建日期" ,"creatorTime"));
break;
case "isInvoicing" :
entitys.add(new ExcelExportEntity("是否开进项票" ,"isInvoicing"));
break;
case "isPay" :
entitys.add(new ExcelExportEntity("是否付款" ,"isPay"));
break;
case "isCollection" :
entitys.add(new ExcelExportEntity("是否回款" ,"isCollection"));
break;
case "isExpense" :
entitys.add(new ExcelExportEntity("是否开销项票" ,"isExpense"));
break;
case "vehicleName":
entitys.add(new ExcelExportEntity("车号", "vehicleName"));
break;
case "purchaseStatus":
entitys.add(new ExcelExportEntity("采购状态", "purchaseStatus"));
break;
case "salesStatus":
entitys.add(new ExcelExportEntity("销售状态", "salesStatus"));
break;
case "materialName":
entitys.add(new ExcelExportEntity("物料名称", "materialName"));
break;
case "settlement":
entitys.add(new ExcelExportEntity("结算重量", "settlement"));
break;
case "purchasePrice":
entitys.add(new ExcelExportEntity("采购单价", "purchasePrice"));
break;
case "salesPrice":
entitys.add(new ExcelExportEntity("销售价格", "salesPrice"));
break;
case "collectPrice":
entitys.add(new ExcelExportEntity("收货价格", "collectPrice"));
break;
case "tareWeight":
entitys.add(new ExcelExportEntity("皮重", "tareWeight"));
break;
case "grossWeight":
entitys.add(new ExcelExportEntity("毛重", "grossWeight"));
break;
case "buckleWeight":
entitys.add(new ExcelExportEntity("扣重", "buckleWeight"));
break;
case "netWeight":
entitys.add(new ExcelExportEntity("净重", "netWeight"));
break;
case "unit":
entitys.add(new ExcelExportEntity("单位", "unit"));
break;
case "poundlistNo":
entitys.add(new ExcelExportEntity("磅单号", "poundlistNo"));
break;
case "customerName":
entitys.add(new ExcelExportEntity("客户名称", "customerName"));
break;
case "salesName":
entitys.add(new ExcelExportEntity("销售合同", "salesName"));
break;
case "supplierName":
entitys.add(new ExcelExportEntity("供应商名称", "supplierName"));
break;
case "purchaseName":
entitys.add(new ExcelExportEntity("采购合同", "purchaseName"));
break;
case "advance":
entitys.add(new ExcelExportEntity("是否垫资", "advance"));
break;
case "inputDate":
entitys.add(new ExcelExportEntity("进项票日期", "inputDate"));
break;
case "outputDate":
entitys.add(new ExcelExportEntity("销项票日期", "outputDate"));
break;
case "payDate":
entitys.add(new ExcelExportEntity("付款日期", "payDate"));
break;
case "paymentDate":
entitys.add(new ExcelExportEntity("回款日期", "paymentDate"));
break;
case "poundDate":
entitys.add(new ExcelExportEntity("磅单日期", "poundDate"));
break;
case "creatorTime":
entitys.add(new ExcelExportEntity("创建日期", "creatorTime"));
break;
case "businessName":
entitys.add(new ExcelExportEntity("业务员", "businessName"));
break;
case "isInvoicing":
entitys.add(new ExcelExportEntity("是否开进项票", "isInvoicing"));
break;
case "isPay":
entitys.add(new ExcelExportEntity("是否付款", "isPay"));
break;
case "isCollection":
entitys.add(new ExcelExportEntity("是否回款", "isCollection"));
break;
case "isExpense":
entitys.add(new ExcelExportEntity("是否开销项票", "isExpense"));
break;
case "remark":
entitys.add(new ExcelExportEntity("备注", "remark"));
break;
case "poundPictures":
entitys.add(new ExcelExportEntity("磅单图片", "poundPictures"));
break;
case "vehiclePictures":
entitys.add(new ExcelExportEntity("车辆图片", "vehiclePictures"));
break;
default:
break;
}

75
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java
Unescape View File

@ -14,12 +14,17 @@ import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.contractfile.entity.ContractFileEntity;
import jnpf.contractfile.service.ContractFileService;
import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.Purchaseorder_item0Service;
import jnpf.purchaseorder.service.PurchaseorderitemService;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.service.SupplierService;
import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import org.apache.commons.lang3.ObjectUtils;
@ -96,6 +101,12 @@ public class PurchasebackController {
private PoundlistService poundlistService;
@Autowired
private VehicleService vehicleService;
@Autowired
private PurchaseorderitemService purchaseorderitemService;
@Autowired
private ContractFileService contractFileService;
@Autowired
private SupplierService supplierService;
/**
* 列表
@ -202,8 +213,28 @@ public class PurchasebackController {
List<PurchasebackEntity> list= purchasebackService.getTypeList(purchasebackPagination,purchasebackPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(PurchasebackEntity entity:list){
Map<String,Object> purchaseOrderIdMap = new HashMap<>();
entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",entity.getPurchaseOrderId(),purchaseOrderIdMap));
PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(entity.getPurchaseOrderId());
if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){
entity.setPurchaseorderdocumentno(purchaseorderitemEntity.getDocumentNo());
ContractFileEntity contractFileEntity = contractFileService.getById(purchaseorderitemEntity.getContractCode());
if (ObjectUtils.isNotEmpty(contractFileEntity)) {
entity.setContractName(contractFileEntity.getContractName());
}
SupplierEntity supplierEntity = supplierService.getById(purchaseorderitemEntity.getSupplierId());
if (ObjectUtils.isNotEmpty(supplierEntity)) {
entity.setSupplierName(supplierEntity.getSupplierName());
}
entity.setStatus("0".equals(entity.getStatus()) ? "已保存" : "已提交");
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
}
// Map<String,Object> purchaseOrderIdMap = new HashMap<>();
// entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",entity.getPurchaseOrderId(),purchaseOrderIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<PurchasebackListVO> listVO=JsonUtil.getJsonToList(list,PurchasebackListVO.class);
@ -216,15 +247,15 @@ public class PurchasebackController {
//转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
mapList.stream().forEach(map -> {
Map<String,Object> map2 =new HashMap<>();
Map<String, Object> map1 = JsonUtil.entityToMap(map.get("purchaseorder"));
for (Map.Entry entry : map1.entrySet()){
String key = "purchaseorder." +entry.getKey();
map2.put(key,entry.getValue());
}
map.putAll(map2);
});
// mapList.stream().forEach(map -> {
// Map<String,Object> map2 =new HashMap<>();
// Map<String, Object> map1 = JsonUtil.entityToMap(map.get("purchaseorder"));
// for (Map.Entry entry : map1.entrySet()){
// String key = "purchaseorder." +entry.getKey();
// map2.put(key,entry.getValue());
// }
// map.putAll(map2);
// });
String[]keys=!StringUtil.isEmpty(purchasebackPaginationExportModel.getSelectKey())?purchasebackPaginationExportModel.getSelectKey().split(","):new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
@ -237,27 +268,27 @@ public class PurchasebackController {
if(keys.length>0){
for(String key:keys){
switch(key){
case "jg_purchaseorder.contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"jg_purchaseorder.contractName"));
break;
case "jg_purchaseorder.supplierName" :
entitys.add(new ExcelExportEntity("供应商名称" ,"jg_purchaseorder.supplierName"));
break;
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "purchaseOrderId" :
entitys.add(new ExcelExportEntity("采购订单" ,"purchaseOrderId"));
case "purchaseorderdocumentno" :
entitys.add(new ExcelExportEntity("来源单号" ,"purchaseorderdocumentno"));
break;
case "contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break;
case "supplierName" :
entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "refundAmount" :
entitys.add(new ExcelExportEntity("退货金额" ,"refundAmount"));
break;
case "refundNum" :
entitys.add(new ExcelExportEntity("退货数量" ,"refundNum"));
break;
// case "refundNum" :
// entitys.add(new ExcelExportEntity("退货数量" ,"refundNum"));
// break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
break;

59
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -453,8 +453,34 @@ public class PurchaseorderController {
List<PurchaseorderitemEntity> list = purchaseorderitemService.getTypeList(purchaseorderPagination, purchaseorderPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for (PurchaseorderitemEntity entity : list) {
Map<String, Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "contract_name", "contract_name", entity.getContractName(), contractNameMap));
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractCode());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setContractName(contractFileEntity.getContractName());
}
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
if (ObjectUtils.isNotEmpty(supplierEntity)){
entity.setSupplierName(supplierEntity.getSupplierName());
}
entity.setIsPayment("0".equals(entity.getIsPayment()) ? "否" : "是");
entity.setIsTransfer("0".equals(entity.getIsTransfer()) ? "否" : "是");
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("待开票");
}else if("1".equals(entity.getStatus())){
entity.setStatus("开票中");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已入库");
}else if("3".equals(entity.getStatus())){
entity.setStatus("归档");
}
// Map<String, Object> contractNameMap = new HashMap<>();
// entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "contract_name", "contract_name", entity.getContractName(), contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<PurchaseorderListVO> listVO = JsonUtil.getJsonToList(list, PurchaseorderListVO.class);
@ -488,9 +514,9 @@ public class PurchaseorderController {
case "currency":
entitys.add(new ExcelExportEntity("币种", "currency"));
break;
case "contractNo":
entitys.add(new ExcelExportEntity("对方合同号", "contractNo"));
break;
// case "contractNo":
// entitys.add(new ExcelExportEntity("对方合同号", "contractNo"));
// break;
case "advanceAmount":
entitys.add(new ExcelExportEntity("垫资金额", "advanceAmount"));
break;
@ -500,21 +526,27 @@ public class PurchaseorderController {
case "amount":
entitys.add(new ExcelExportEntity("金额", "amount"));
break;
case "notAmount":
entitys.add(new ExcelExportEntity("不含税金额", "notAmount"));
case "isPayment":
entitys.add(new ExcelExportEntity("付款申请中", "isPayment"));
break;
case "remark":
entitys.add(new ExcelExportEntity("备注信息", "remark"));
case "isTransfer":
entitys.add(new ExcelExportEntity("是否转销售", "isTransfer"));
break;
// case "notAmount":
// entitys.add(new ExcelExportEntity("不含税金额", "notAmount"));
// break;
// case "remark":
// entitys.add(new ExcelExportEntity("备注信息", "remark"));
// break;
case "creatorUserName":
entitys.add(new ExcelExportEntity("制单人", "creatorUserName"));
break;
case "creatorTime":
entitys.add(new ExcelExportEntity("制单时间", "creatorTime"));
break;
case "erpNo":
entitys.add(new ExcelExportEntity("ERP订单号", "erpNo"));
break;
// case "erpNo":
// entitys.add(new ExcelExportEntity("ERP订单号", "erpNo"));
// break;
case "payPrice":
entitys.add(new ExcelExportEntity("已付款金额", "payPrice"));
break;
@ -527,6 +559,9 @@ public class PurchaseorderController {
case "status":
entitys.add(new ExcelExportEntity("单据状态 ", "status"));
break;
case "paymentTime":
entitys.add(new ExcelExportEntity("申请次数 ", "paymentTime"));
break;
default:
break;
}

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

@ -232,6 +232,21 @@ public class ReceiptinController {
if (ObjectUtils.isNotEmpty(supplierEntity)){
entity.setSupplier(supplierEntity.getSupplierName());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
entity.setType("0".equals(entity.getType()) ? "采购入库" : "购销入库");
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("审批中");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已审批");
}
// Map<String,Object> soucenoMap = new HashMap<>();
// entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap));
// Map<String,Object> supplierIdMap = new HashMap<>();

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

@ -257,6 +257,27 @@ public class ReceiptoutController {
if (ObjectUtils.isNotEmpty(customerEntity)){
entity.setCustomerNm(customerEntity.getSupplierNm());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getType())){
entity.setType("销售出库");
}else if("1".equals(entity.getType())){
entity.setType("购销出库");
}else if("2".equals(entity.getType())){
entity.setType("退货出库");
}
if("0".equals(entity.getStatus())){
entity.setStatus("已保存");
}else if("1".equals(entity.getStatus())){
entity.setStatus("审批中");
}else if("2".equals(entity.getStatus())){
entity.setStatus("已审批");
}
// Map<String,Object> sourceNoMap = new HashMap<>();
// entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap));
// Map<String,Object> customerIdMap = new HashMap<>();

50
SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java
Unescape View File

@ -196,8 +196,20 @@ public class SalebackController {
List<SalebackEntity> list= salebackService.getTypeList(salebackPagination,salebackPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(SalebackEntity entity:list){
Map<String,Object> salesOrderIdMap = new HashMap<>();
entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(entity.getSalesOrderId());
if (ObjectUtils.isNotEmpty(saleorderitemEntity)){
entity.setSaledocumentNo(saleorderitemEntity.getDocumentNo());
}
entity.setStatus("0".equals(entity.getStatus()) ? "已保存" : "已提交");
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
// Map<String,Object> salesOrderIdMap = new HashMap<>();
// entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<SalebackListVO> listVO=JsonUtil.getJsonToList(list,SalebackListVO.class);
@ -205,15 +217,15 @@ public class SalebackController {
//转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
mapList.stream().forEach(map -> {
Map<String,Object> map2 =new HashMap<>();
Map<String, Object> map1 = JsonUtil.entityToMap(map.get("saleorder"));
for (Map.Entry entry : map1.entrySet()){
String key = "saleorder." +entry.getKey();
map2.put(key,entry.getValue());
}
map.putAll(map2);
});
// mapList.stream().forEach(map -> {
// Map<String,Object> map2 =new HashMap<>();
// Map<String, Object> map1 = JsonUtil.entityToMap(map.get("saleorder"));
// for (Map.Entry entry : map1.entrySet()){
// String key = "saleorder." +entry.getKey();
// map2.put(key,entry.getValue());
// }
// map.putAll(map2);
// });
String[]keys=!StringUtil.isEmpty(salebackPaginationExportModel.getSelectKey())?salebackPaginationExportModel.getSelectKey().split(","):new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
@ -226,17 +238,17 @@ public class SalebackController {
if(keys.length>0){
for(String key:keys){
switch(key){
case "jg_salesorder.contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"jg_salesorder.contractName"));
break;
case "jg_salesorder.costomerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"jg_salesorder.costomerName"));
break;
// case "jg_salesorder.contractName" :
// entitys.add(new ExcelExportEntity("合同名称" ,"jg_salesorder.contractName"));
// break;
// case "jg_salesorder.costomerName" :
// entitys.add(new ExcelExportEntity("客户名称" ,"jg_salesorder.costomerName"));
// break;
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "salesOrderId" :
entitys.add(new ExcelExportEntity("销售订单" ,"salesOrderId"));
case "saledocumentNo" :
entitys.add(new ExcelExportEntity("销售订单" ,"saledocumentNo"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));

82
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -605,10 +605,34 @@ public class SaleorderitemController {
List<SaleorderitemEntity> list= saleorderitemService.getTypeList(saleorderitemPagination,saleorderitemPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractCodeMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
Map<String,Object> costomerCodeMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setContractName(contractFileEntity.getContractName());
}
CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setCustomerName(customerEntity.getSupplierNm());
}
if("0".equals(entity.getCurrency())){
entity.setCurrency("人民币");
}else if("1".equals(entity.getCurrency())){
entity.setCurrency("美元");
}else if("2".equals(entity.getCurrency())){
entity.setCurrency("英镑");
}
if("0".equals(entity.getStatus())){
entity.setStatus("待发货");
}else if("1".equals(entity.getStatus())){
entity.setStatus("待开票");
}else if("2".equals(entity.getStatus())){
entity.setStatus("待回款");
}else if("3".equals(entity.getStatus())){
entity.setStatus("归档");
}
// Map<String,Object> contractCodeMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
// Map<String,Object> costomerCodeMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
}
@ -633,20 +657,14 @@ public class SaleorderitemController {
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "contractCode" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractCode"));
case "contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break;
case "costomerCode" :
entitys.add(new ExcelExportEntity("客户名称" ,"costomerCode"));
case "customerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "contractNo" :
entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
case "bidSection" :
entitys.add(new ExcelExportEntity("所属标段" ,"bidSection"));
break;
case "num" :
entitys.add(new ExcelExportEntity("重量" ,"num"));
@ -654,27 +672,39 @@ public class SaleorderitemController {
case "price" :
entitys.add(new ExcelExportEntity("金额" ,"price"));
break;
case "notPrice" :
entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "amountCollected" :
entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected"));
case "assessmentPirce" :
entitys.add(new ExcelExportEntity("考核金额" ,"assessmentPirce"));
break;
// case "contractNo" :
// entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
// break;
case "invoiceNum" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum"));
break;
case "invoiceAmount" :
entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
// case "notPrice" :
// entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice"));
// break;
case "amountCollected" :
entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
case "erpNo" :
entitys.add(new ExcelExportEntity("ERP订单号" ,"erpNo"));
break;
// case "erpNo" :
// entitys.add(new ExcelExportEntity("ERP订单号" ,"erpNo"));
// break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;

20
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -50,6 +50,7 @@ import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
@ -596,6 +597,22 @@ public class TradeuploadController {
List<TradeuploadEntity> list= tradeuploadService.getTypeList(tradeuploadPagination,tradeuploadPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(TradeuploadEntity entity:list){
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
if (ObjectUtils.isNotEmpty(vehicleEntity)){
entity.setVehicleName(vehicleEntity.getTicketno());
}
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity)){
entity.setMaterialName(materialEntity.getItemName());
}
CustomerEntity customerEntity = customerService.getById(entity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity)){
entity.setCustomerName(customerEntity.getSupplierNm());
}
ContractFileEntity contractFileEntity = contractFileService.getById(entity.getSalesId());
if (ObjectUtils.isNotEmpty(contractFileEntity)){
entity.setSalesName(contractFileEntity.getContractName());
}
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
entity.setAdvance("0".equals(entity.getAdvance()) ? "否" : "是");
@ -679,6 +696,9 @@ public class TradeuploadController {
case "salesPrice" :
entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
break;
case "collectPrice" :
entitys.add(new ExcelExportEntity("收货价格" ,"collectPrice"));
break;
case "businessName" :
entitys.add(new ExcelExportEntity("业务员" ,"businessName"));
break;

44
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -404,22 +404,34 @@ export default {
formVisible2: false,
exportBoxVisible: false,
columnList: [
{
prop: "paymentno",
label: "来源单号",
},
{
prop: "documentno",
label: "单据编号",
},
{
prop: "paymentno",
label: "来源单号",
},
{
prop: "suppliername",
label: "供应商",
},
{
prop: "status",
label: "单据状态",
},
{
prop: "currency",
label: "币别 ",
},
{
prop: "duedate",
label: "应付日期",
},
{
prop: "businessdate",
label: "实付日期",
},
{
prop: "paymentamount",
label: "付款金额",
@ -428,6 +440,14 @@ export default {
prop: "requestedamount",
label: "申请金额",
},
{
prop: "applicantName",
label: "申请人",
},
{
prop: "paymentdocNum",
label: "结算重量",
},
{
prop: "paymentaccount",
label: "付款账户",
@ -445,8 +465,20 @@ export default {
label: "结算类型",
},
{
prop: "status",
label: "单据状态",
prop: "accountingPeriod",
label: "账期(日)",
},
{
prop: "paymentDate",
label: "应回日期",
},
{
prop: "advanceAmount",
label: "垫资金额",
},
{
prop: "overdueInterest",
label: "逾期利息",
},
],
paymenttypeOptions: [

93
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -730,42 +730,37 @@ export default {
exportBoxVisible: false,
columnList: [
{
prop: "licenseNo",
prop: "vehicleName",
label: "车号",
},
{
prop: "customerName",
label: "客户名称",
prop: "purchaseStatus",
label: "采购状态",
},
{
prop: "salesName",
label: "销售合同",
prop: "salesStatus",
label: "销售状态",
},
{
prop: "supplierName",
label: "供应商名称",
},
{
prop: "purchaseName",
label: "采购合同",
prop: "materialName",
label: "物料名称",
},
{
prop: "materialCode",
label: "物料编码",
prop: "settlement",
label: "结算重量",
},
{
prop: "materialName",
label: "物料名称",
prop: "purchasePrice",
label: "采购单价",
},
{
prop: "advance",
label: "是否垫资",
prop: "salesPrice",
label: "销售价格",
},
{
prop: "unit",
label: "单位",
prop: "collectPrice",
label: "收货价格",
},
{ prop: "creatorTime", label: "创建时间" },
{
prop: "grossWeight",
label: "毛重",
@ -783,20 +778,32 @@ export default {
label: "净重",
},
{
prop: "settlement",
label: "结算重量",
prop: "unit",
label: "单位",
},
{
prop: "purchasePrice",
label: "采购单价",
prop: "poundlistNo",
label: "磅单号",
},
{
prop: "salesPrice",
label: "销售价格",
prop: "customerName",
label: "客户名称",
},
{
prop: "collectPrice",
label: "收货价格",
prop: "salesName",
label: "销售合同",
},
{
prop: "supplierName",
label: "供应商名称",
},
{
prop: "purchaseName",
label: "采购合同",
},
{
prop: "advance",
label: "是否垫资",
},
{
prop: "inputDate",
@ -818,14 +825,42 @@ export default {
prop: "poundDate",
label: "磅单日期",
},
{
prop: "creatorTime",
label: "创建日期",
},
{
prop: "businessName",
label: "业务员名称",
label: "业务员",
},
{
prop: "isInvoicing",
label: "是否开进项票",
},
{
prop: "isPay",
label: "是否付款",
},
{
prop: "isCollection",
label: "是否回款",
},
{
prop: "isExpense",
label: "是否开销项票",
},
{
prop: "remark",
label: "备注",
},
{
prop: "poundPictures",
label: "磅单图片",
},
{
prop: "vehiclePictures",
label: "车辆图片",
},
],
purchaseStatusOptions: [
{

8
SC-web/src/views/scm/basicInformation/purchaseback/index.vue
Unescape View File

@ -278,10 +278,10 @@ export default {
prop: "currency",
label: "币别 ",
},
{
prop: "refundNum",
label: "退货数量",
},
// {
// prop: "refundNum",
// label: "退货数量",
// },
{
prop: "status",
label: "单据状态 ",

88
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -492,73 +492,89 @@ export default {
label: "单据编号",
},
{
prop: "num",
label: "重量",
},
{
prop: "currency",
label: "币种",
},
{
prop: "invoiceNum",
label: "发票数量",
prop: "status",
label: "单据状态 ",
},
{
prop: "invoiceAmount",
label: "发票金额",
prop: "contractName",
label: "合同名称",
},
{
prop: "advanceAmount",
label: "垫资金额",
prop: "supplierName",
label: "供应商名称",
},
{
prop: "status",
label: "单据状态 ",
prop: "amount",
label: "金额",
},
{
prop: "creatorUserName",
label: "制单人",
prop: "num",
label: "重量",
},
{
prop: "contractCode",
label: "合同编码",
prop: "currency",
label: "币种",
},
{
prop: "supplierId",
label: "供应商",
prop: "isPayment",
label: "付款申请中",
},
{
prop: "contractNo",
label: "对方合同号",
prop: "isTransfer",
label: "是否转销售",
},
{
prop: "amount",
label: "金额",
prop: "payPrice",
label: "已付款金额",
},
{
prop: "notAmount",
label: "不含税金额",
prop: "invoiceNum",
label: "发票数量",
},
{
prop: "isPayment",
label: "是否付款",
prop: "invoiceAmount",
label: "发票金额",
},
{
prop: "payPrice",
label: "已付款金额",
prop: "advanceAmount",
label: "垫资金额",
},
{
prop: "erpNo",
label: "ERP订单号",
prop: "paymentTime",
label: "申请次数",
},
{
prop: "creatorTime",
label: "制单时间",
},
{
prop: "remark",
label: "备注信息",
prop: "creatorUserName",
label: "制单人",
},
// {
// prop: "supplierId",
// label: "供应商",
// },
// {
// prop: "contractNo",
// label: "对方合同号",
// },
// {
// prop: "notAmount",
// label: "不含税金额",
// },
// {
// prop: "isPayment",
// label: "是否付款",
// },
// {
// prop: "erpNo",
// label: "ERP订单号",
// },
// {
// prop: "remark",
// label: "备注信息",
// },
],
currencyOptions: [
{

2
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -434,7 +434,7 @@ export default {
exportBoxVisible: false,
columnList: [
{ prop: "documentNo", label: "单据编号" },
{ prop: "erpNo", label: "ERP订单号" },
// { prop: "erpNo", label: "ERP订单号" },
{ prop: "contractName", label: "合同名称" },
{ prop: "customerName", label: "客户名称" },
{ prop: "price", label: "金额" },

Write Preview
Loading…
Cancel
Save