From 6473a2c3309dd6809226863c4f996014f5f5865a Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Tue, 25 Apr 2023 09:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jg_naturalPaginationExportModel.java | 9 +++++ .../ArinvoicesPaginationExportModel.java | 23 ++++++++++- .../CollectionPaginationExportModel.java | 16 +++++++- .../ContractFilePaginationExportModel.java | 10 +++++ .../CustomerPaginationExportModel.java | 15 ++++++-- .../InvoicesPaginationExportModel.java | 19 +++++++++- .../MaterialPaginationExportModel.java | 14 ++++++- .../payment/PaymentPaginationExportModel.java | 19 +++++++++- .../PaymentdocPaginationExportModel.java | 14 ++++++- .../PoundlistPaginationExportModel.java | 38 +++++++++++++++++-- .../PurchasebackPaginationExportModel.java | 13 ++++++- .../PurchasementPaginationExportModel.java | 10 +++-- .../PurchaseorderPaginationExportModel.java | 23 ++++++++++- .../ReceiptinPaginationExportModel.java | 20 +++++++++- .../ReceiptoutPaginationExportModel.java | 23 ++++++++++- .../ReservoirareaPaginationExportModel.java | 12 +++++- .../SalebackPaginationExportModel.java | 20 +++++++++- .../SaleorderitemPaginationExportModel.java | 26 ++++++++++++- .../SalesmentPaginationExportModel.java | 8 +++- .../SupplierPaginationExportModel.java | 14 ++++--- .../TradeuploadPaginationExportModel.java | 33 +++++++++++++++- .../vehicle/VehiclePaginationExportModel.java | 11 +++++- .../WareHousePaginationExportModel.java | 12 +++++- 23 files changed, 359 insertions(+), 43 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java index b0339413..ca98d6e1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java @@ -32,4 +32,13 @@ public class Jg_naturalPaginationExportModel extends Pagination { * 银行账户 */ private String bankAccount; + + /** + * 身份证 + */ + private String identity; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java index dfa56154..0cef25cd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java @@ -21,9 +21,28 @@ public class ArinvoicesPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; - /** 业务日期 */ + + private String sourceOrderNo; + + private String contractNm; + + private String customerNm; + private Date startDate; + private Date endDate; + /** 业务日期 */ private List businessDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java index 4106a9a9..8d2be476 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java @@ -21,6 +21,20 @@ public class CollectionPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + private String contractNm; + + private String customerNm; + private String status; + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePaginationExportModel.java index 33b64cad..de906ae3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePaginationExportModel.java @@ -26,4 +26,14 @@ public class ContractFilePaginationExportModel extends Pagination { /** 合同名称 */ private String contractName; + /** 供应商/客户名 **/ + private String name; + + /** 合同类型 **/ + private String contractType; + /** + * 菜单id + */ + private String menuId; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPaginationExportModel.java index f55c76cc..63e94c28 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPaginationExportModel.java @@ -21,15 +21,22 @@ public class CustomerPaginationExportModel extends Pagination { private String dataType; - /** 客户编码 */ + /** 客户编码 */ private String supplierCd; - /** 客户名称 */ + /** 客户名称 */ private String supplierNm; - /** 纳税编号 */ + /** 纳税编号 */ private String vatRegistrationNum; - /** 联系人 */ + /** 联系人 */ private String contactName; + + /**地址**/ + private String address; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPaginationExportModel.java index 24dc4fa9..234fb882 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPaginationExportModel.java @@ -21,6 +21,23 @@ public class InvoicesPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + private String souceno; + private String purchaseName; + private String supplierName; + private List creatorTime; + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/model/material/MaterialPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/model/material/MaterialPaginationExportModel.java index e55fd40e..473594d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/model/material/MaterialPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/model/material/MaterialPaginationExportModel.java @@ -21,9 +21,19 @@ public class MaterialPaginationExportModel extends Pagination { private String dataType; - /** 物料编码 */ + /** 物料编码 */ private String itemCode; - /** 物料名称 */ + /** 物料名称 */ private String itemName; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPaginationExportModel.java index 4379c815..15fca719 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPaginationExportModel.java @@ -21,6 +21,23 @@ public class PaymentPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentno; + private String paymentno; + private List duedate; + private String applicantName; + private String paymentdocNum; + private String status; + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java index afe3ca09..199052d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java @@ -21,6 +21,18 @@ public class PaymentdocPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + /** 供应商 */ + private String supplierName; + /** 申请金额*/ + private String ramount; + /** 结算重量*/ + private String num; + /** 创建人*/ + private String creatorUserName; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPaginationExportModel.java index 6118ff84..0eb7ff66 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPaginationExportModel.java @@ -19,11 +19,41 @@ public class PoundlistPaginationExportModel extends Pagination { private String json; private String dataType; - - - /** 磅单日期 */ + /** 磅单日期 */ private List poundDate; - /** 磅单号 */ + /** 磅单号 */ private String poundlistNo; + + + private String materialName; + private String vehicleName; + private String purchaseName; + private String salesName; + private String supplierName; + private String customerName; + private String isInvoicing; + private String isPay; + private String isCollection; + private String isExpense; + private Date startDate; + private Date endDate; + + private String purchaseOrderId; + private String salesOrderId; + private List poundlistIds; + private String businessId; + + private String purchaseStatus; + private String salesStatus; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java index e9dbe7ec..e2bdff8e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java @@ -21,6 +21,17 @@ public class PurchasebackPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/model/purchasement/PurchasementPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/model/purchasement/PurchasementPaginationExportModel.java index a0ae4b80..6a8b2d52 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/model/purchasement/PurchasementPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/model/purchasement/PurchasementPaginationExportModel.java @@ -21,12 +21,16 @@ public class PurchasementPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentno; - /** 供应商名称 */ + /** 供应商名称 */ private String suppliername; - /** 创建人名称 */ + /** 创建人名称 */ private String creatorUserName; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java index d7c0bc7d..fbfe9190 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java @@ -21,6 +21,27 @@ public class PurchaseorderPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + private String purchaseName; + private String supplierName; + private List creatorTime; + private String status; + private Date startDate; + private Date endDate; + private String num; + private String amount; + private String creatorUserName; + + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java index 2ea80f4e..90ac9a58 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java @@ -21,9 +21,25 @@ public class ReceiptinPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentno; - /** 单据状态 */ + /** 单据状态 */ private String status; + + private String souceno; + private String supplierName; + private List creatorTime; + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java index 7f22e62e..618b86ac 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java @@ -21,9 +21,28 @@ public class ReceiptoutPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; - /** 业务类型 */ + /** 业务类型 */ private String type; + + /** 创建日期 */ + private List creatorTime; + + private String customerNm; + private String sourceOrderNo; + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java index c9f36c29..ce76b7f4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java @@ -21,9 +21,17 @@ public class ReservoirareaPaginationExportModel extends Pagination { private String dataType; - /** 库区编码 */ + /** 库区编码 */ private String areacode; - /** 库区名称 */ + /** 库区名称 */ private String areaname; + + /** 所属仓库**/ + private String warehouseName; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java index 04aa2070..84c82a3a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java @@ -21,6 +21,24 @@ public class SalebackPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; + + private String saledocumentNo; + + private String status; + private List creatorTime; + + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java index 725f8453..956b71c0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java @@ -21,9 +21,31 @@ public class SaleorderitemPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentNo; - /** 单据状态 */ + /** 单据状态 */ private String status; + + private String contractName; + private String num; + private String price; + private String creatorUserName; + + private String customerName; + private Date startDate; + private Date endDate; + + private List creatorTime; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/salesment/model/salesment/SalesmentPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/salesment/model/salesment/SalesmentPaginationExportModel.java index bdcaf3c3..81570db2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/salesment/model/salesment/SalesmentPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/salesment/model/salesment/SalesmentPaginationExportModel.java @@ -21,9 +21,13 @@ public class SalesmentPaginationExportModel extends Pagination { private String dataType; - /** 单据编号 */ + /** 单据编号 */ private String documentno; - /** 客户名称 */ + /** 客户名称 */ private String customername; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java index f9e1a0fc..d0ad5dd0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java @@ -21,18 +21,22 @@ public class SupplierPaginationExportModel extends Pagination { private String dataType; - /** 供应商编码 */ + /** 供应商编码 */ private String supplierCode; - /** 供应商名称 */ + /** 供应商名称 */ private String supplierName; - /** 联系人 */ + /** 联系人 */ private String contactName; - /** 联系电话 */ + /** 联系电话 */ private String contactPhone; - /** 供应商地点 */ + /** 供应商地点 */ private String supplierSiteCode; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java index b4deac91..6284d322 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java @@ -21,9 +21,38 @@ public class TradeuploadPaginationExportModel extends Pagination { private String dataType; - /** 磅单时间 */ + /** 磅单时间 */ private List poundDate; - /** 磅单号 */ + /** 磅单号 */ private String poundlistNo; + + /** 物料名称 */ + private String materialName; + + /** 客户名称 */ + private String customerName; + + /** 销售合同名称 */ + private String salesName; + + /** 业务员名称 */ + private String businessName; + + /** 车牌号 */ + private String vehicleName; + + private Date startDate; + private Date endDate; + + /** + * 添加权限 + */ + private String departmentId; + private String orgnizeId; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePaginationExportModel.java index 3067d928..1a9a9ea3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePaginationExportModel.java @@ -21,9 +21,16 @@ public class VehiclePaginationExportModel extends Pagination { private String dataType; - /** 车牌号 */ + /** 车牌号 */ private String ticketno; - /** 司机名称 */ + /** 司机名称 */ private String drivername; + + /** 联系方式 */ + private String contact; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java index 4f1b7c6a..4cac1fcb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java @@ -21,9 +21,17 @@ public class WareHousePaginationExportModel extends Pagination { private String dataType; - /** 仓库编码 */ + /** 仓库编码 */ private String code; - /** 仓库名称 */ + /** 仓库名称 */ private String name; + + /** 仓库位置 */ + private String location; + + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file