diff --git a/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java b/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java index 40cd5829..672bdce0 100644 --- a/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.Builder; import lombok.Data; @@ -30,47 +29,35 @@ public class AllotStockBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport(value = "调出方仓库") private String warehouseName; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long otherWarehouseId; - @ExcelExport(value = "调入方仓库") private String otherWarehouseName; - @ExcelExport(value = "条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport(value = "商品名称") private String productName; - @ExcelExport(value = "规格") private String productStandard; - @ExcelExport(value = "型号") private String productModel; - @ExcelExport(value = "单位") private String productUnit; - @ExcelExport(value = "库存") private Integer stock; - @ExcelExport(value = "数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "金额") private BigDecimal amount; - @ExcelExport(value = "备注") private String remark; } diff --git a/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java new file mode 100644 index 00000000..5e5ba8d5 --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java @@ -0,0 +1,63 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Builder +public class AllotStockDataExportBO { + + @ExcelExport(value = "调拨单号") + private String receiptNumber; + + @ExcelExport(value = "调出方仓库") + private String warehouseName; + + @ExcelExport(value = "调入方仓库") + private String otherWarehouseName; + + @ExcelExport(value = "条码") + private String barCode; + + @ExcelExport(value = "商品名称") + private String productName; + + @ExcelExport(value = "规格") + private String productStandard; + + @ExcelExport(value = "型号") + private String productModel; + + @ExcelExport(value = "单位") + private String productUnit; + + @ExcelExport(value = "库存") + private Integer stock; + + @ExcelExport(value = "数量") + private Integer productNumber; + + @ExcelExport(value = "单价") + private BigDecimal unitPrice; + + @ExcelExport(value = "金额") + private BigDecimal amount; + + @ExcelExport(value = "备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/bo/AssembleStockBO.java b/core/domain/src/main/java/com/wansenai/bo/AssembleStockBO.java index 82fe5397..20093fda 100644 --- a/core/domain/src/main/java/com/wansenai/bo/AssembleStockBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/AssembleStockBO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.Builder; import lombok.Data; @@ -27,47 +26,35 @@ public class AssembleStockBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; - @ExcelExport("商品类型") private String type; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport("仓库") private String warehouseName; - @ExcelExport("条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport("商品名称") private String productName; - @ExcelExport("规格") private String productStandard; - @ExcelExport("型号") private String productModel; - @ExcelExport("单位") private String productUnit; - @ExcelExport("库存") private Integer stock; - @ExcelExport("商品数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("金额") private BigDecimal amount; - @ExcelExport("备注") private String remark; } diff --git a/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java new file mode 100644 index 00000000..79bfab39 --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java @@ -0,0 +1,66 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 组装单和拆卸单导出数据BO (AssembleStockDataExportBO) 共存在这一个类中 + */ +@Data +@Builder +public class AssembleStockDataExportBO { + + @ExcelExport("单据编号") + private String receiptNumber; + + @ExcelExport("商品类型") + private String type; + + @ExcelExport("仓库") + private String warehouseName; + + @ExcelExport("条码") + private String barCode; + + @ExcelExport("商品名称") + private String productName; + + @ExcelExport("规格") + private String productStandard; + + @ExcelExport("型号") + private String productModel; + + @ExcelExport("单位") + private String productUnit; + + @ExcelExport("库存") + private Integer stock; + + @ExcelExport("商品数量") + private Integer productNumber; + + @ExcelExport("单价") + private BigDecimal unitPrice; + + @ExcelExport("金额") + private BigDecimal amount; + + @ExcelExport("备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java index 420425bf..1671c5b0 100644 --- a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,57 +30,41 @@ public class PurchaseDataBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport(value = "仓库名称") private String warehouseName; - @ExcelExport(value = "条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport(value = "商品名称") private String productName; - @ExcelExport(value = "规格") private String productStandard; - @ExcelExport(value = "型号") private String productModel; - @ExcelExport(value = "颜色") private String productColor; - @ExcelExport(value = "库存") private Integer stock; - @ExcelExport(value = "单位") private String productUnit; - @ExcelExport(value = "数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "金额") private BigDecimal amount; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "税率(%)") private BigDecimal taxRate; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "税额") private BigDecimal taxAmount; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "价税合计") private BigDecimal taxTotalPrice; - @ExcelExport(value = "备注") private String remark; - } diff --git a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java new file mode 100644 index 00000000..38f4c5ca --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java @@ -0,0 +1,75 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Builder +public class PurchaseDataExportBO { + + @ExcelExport(value = "供应商") + private String supplierName; + + @ExcelExport(value = "单据编号") + private String receiptNumber; + + @ExcelExport(value = "仓库名称") + private String warehouseName; + + @ExcelExport(value = "条码") + private String barCode; + + @ExcelExport(value = "商品名称") + private String productName; + + @ExcelExport(value = "规格") + private String productStandard; + + @ExcelExport(value = "型号") + private String productModel; + + @ExcelExport(value = "颜色") + private String productColor; + + @ExcelExport(value = "库存") + private Integer stock; + + @ExcelExport(value = "单位") + private String productUnit; + + @ExcelExport(value = "数量") + private Integer productNumber; + + @ExcelExport(value = "单价") + private BigDecimal unitPrice; + + @ExcelExport(value = "金额") + private BigDecimal amount; + + @ExcelExport(value = "税率(%)") + private BigDecimal taxRate; + + @ExcelExport(value = "税额") + private BigDecimal taxAmount; + + @ExcelExport(value = "价税合计") + private BigDecimal taxTotalPrice; + + @ExcelExport(value = "备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java b/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java index 347c11b0..8d5d1512 100644 --- a/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,56 +30,41 @@ public class SalesDataBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport("仓库名称") private String warehouseName; - @ExcelExport("条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport("商品名称") private String productName; - @ExcelExport("规格") private String productStandard; - @ExcelExport("型号") private String productModel; - @ExcelExport("颜色") private String productColor; - @ExcelExport("库存") private Integer stock; - @ExcelExport("单位") private String productUnit; - @ExcelExport("数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("金额") private BigDecimal amount; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("税率(%)") private BigDecimal taxRate; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("税额") private BigDecimal taxAmount; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport("价税合计") private BigDecimal taxTotalPrice; - @ExcelExport("备注") private String remark; } diff --git a/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java new file mode 100644 index 00000000..ec842eef --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java @@ -0,0 +1,75 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Builder +public class SalesDataExportBO { + + @ExcelExport(value = "客户") + private String customerName; + + @ExcelExport(value = "单据编号") + private String receiptNumber; + + @ExcelExport("仓库名称") + private String warehouseName; + + @ExcelExport("条码") + private String barCode; + + @ExcelExport("商品名称") + private String productName; + + @ExcelExport("规格") + private String productStandard; + + @ExcelExport("型号") + private String productModel; + + @ExcelExport("颜色") + private String productColor; + + @ExcelExport("库存") + private Integer stock; + + @ExcelExport("单位") + private String productUnit; + + @ExcelExport("数量") + private Integer productNumber; + + @ExcelExport("单价") + private BigDecimal unitPrice; + + @ExcelExport("金额") + private BigDecimal amount; + + @ExcelExport("税率(%)") + private BigDecimal taxRate; + + @ExcelExport("税额") + private BigDecimal taxAmount; + + @ExcelExport("价税合计") + private BigDecimal taxTotalPrice; + + @ExcelExport("备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java index edfc66b4..b63b14ca 100644 --- a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java @@ -1,8 +1,19 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ package com.wansenai.bo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,46 +30,34 @@ public class ShipmentsDataBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport(value = "仓库名称") private String warehouseName; private String productCode; - @ExcelExport(value = "条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport(value = "商品名称") private String productName; - @ExcelExport(value = "规格") private String productStandard; - @ExcelExport(value = "型号") private String productModel; - @ExcelExport(value = "颜色") private String productColor; - @ExcelExport(value = "库存") private Integer stock; - @ExcelExport(value = "单位") private String productUnit; - @ExcelExport(value = "数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "金额") private BigDecimal amount; - @ExcelExport(value = "备注") private String remark; } diff --git a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java new file mode 100644 index 00000000..ab901426 --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java @@ -0,0 +1,66 @@ +/* + * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance + * with the License. A copy of the License is located at + * + * http://opensource.wansenai.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Builder +public class ShipmentsDataExportBO { + + @ExcelExport(value = "会员") + private String memberName; + + @ExcelExport(value = "单据编号") + private String receiptNumber; + + @ExcelExport(value = "仓库名称") + private String warehouseName; + + @ExcelExport(value = "条码") + private String barCode; + + @ExcelExport(value = "商品名称") + private String productName; + + @ExcelExport(value = "规格") + private String productStandard; + + @ExcelExport(value = "型号") + private String productModel; + + @ExcelExport(value = "颜色") + private String productColor; + + @ExcelExport(value = "库存") + private Integer stock; + + @ExcelExport(value = "单位") + private String productUnit; + + @ExcelExport(value = "数量") + private Integer productNumber; + + @ExcelExport(value = "单价") + private BigDecimal unitPrice; + + @ExcelExport(value = "金额") + private BigDecimal amount; + + @ExcelExport(value = "备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockBO.java b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockBO.java index 98bf6676..b5560cec 100644 --- a/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockBO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.wansenai.utils.excel.ExcelExport; import lombok.Builder; import lombok.Data; @@ -30,44 +29,32 @@ public class StorageShipmentStockBO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long warehouseId; - @ExcelExport(value = "仓库名称") private String warehouseName; - @ExcelExport(value = "条码") private String barCode; @JsonFormat(shape = JsonFormat.Shape.STRING) private Long productId; - @ExcelExport(value = "商品名称") private String productName; - @ExcelExport(value = "规格") private String productStandard; - @ExcelExport(value = "型号") private String productModel; - @ExcelExport(value = "扩展信息") private String productExtendInfo; - @ExcelExport(value = "库存") private Integer stock; - @ExcelExport(value = "单位") private String productUnit; - @ExcelExport(value = "数量") private Integer productNumber; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "单价") private BigDecimal unitPrice; @JsonSerialize(using = BigDecimalSerializerBO.class) - @ExcelExport(value = "金额") private BigDecimal amount; - @ExcelExport(value = "备注") private String remark; } diff --git a/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java new file mode 100644 index 00000000..7f58797f --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java @@ -0,0 +1,60 @@ +package com.wansenai.bo; + +import com.wansenai.utils.excel.ExcelExport; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 其他入库/出库导出BO (StorageShipmentStockExportBO) 两个BO类的字段一样，只是一个用于导出，一个用于导入 + */ +@Data +@Builder +public class StorageShipmentStockExportBO { + + @ExcelExport(value = "单据编号") + private String receiptNumber; + + @ExcelExport(value = "关联人员类型") + private String relatedPersonType; + + @ExcelExport(value = "关联人员") + private String relatedPerson; + + @ExcelExport(value = "仓库名称") + private String warehouseName; + + @ExcelExport(value = "条码") + private String barCode; + + @ExcelExport(value = "商品名称") + private String productName; + + @ExcelExport(value = "规格") + private String productStandard; + + @ExcelExport(value = "型号") + private String productModel; + + @ExcelExport(value = "扩展信息") + private String productExtendInfo; + + @ExcelExport(value = "库存") + private Integer stock; + + @ExcelExport(value = "单位") + private String productUnit; + + @ExcelExport(value = "数量") + private Integer productNumber; + + @ExcelExport(value = "单价") + private BigDecimal unitPrice; + + @ExcelExport(value = "金额") + private BigDecimal amount; + + @ExcelExport(value = "备注") + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java index 66053e6c..c25192c7 100644 --- a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java +++ b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java @@ -33,7 +33,7 @@ public class RetailRefundVO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; - @ExcelExport(value = "会员名称") + @ExcelExport(value = "会员") private String memberName; @ExcelExport(value = "单据编号") diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailShipmentsVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailShipmentsVO.java index 188d6229..91603d0c 100644 --- a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailShipmentsVO.java +++ b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailShipmentsVO.java @@ -21,7 +21,7 @@ public class RetailShipmentsVO { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; - @ExcelExport(value = "会员名称") + @ExcelExport(value = "会员") private String memberName; @ExcelExport(value = "单据编号") diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java index 5e22e14b..7f12e2d2 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.PurchaseDataBO; +import com.wansenai.bo.PurchaseDataExportBO; import com.wansenai.dto.receipt.purchase.*; import com.wansenai.entities.financial.FinancialMain; import com.wansenai.entities.financial.FinancialSub; @@ -1322,12 +1323,14 @@ public void exportPurchaseOrderExcel(QueryPurchaseOrderDTO queryPurchaseOrderDTO var mainData = getPurchaseOrderList(queryPurchaseOrderDTO); if (!mainData.isEmpty()) { if (queryPurchaseOrderDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (PurchaseOrderVO purchaseOrderVO : mainData) { var detail = getPurchaseOrderDetail(purchaseOrderVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var purchaseDataBo = PurchaseDataBO.builder() + var purchaseDataBo = PurchaseDataExportBO.builder() + .supplierName(purchaseOrderVO.getSupplierName()) + .receiptNumber(purchaseOrderVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) @@ -1361,12 +1364,14 @@ public void exportPurchaseStorageExcel(QueryPurchaseStorageDTO queryPurchaseStor var mainData = getPurchaseStorageList(queryPurchaseStorageDTO); if (!mainData.isEmpty()) { if (queryPurchaseStorageDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (PurchaseStorageVO purchaseStorageVO : mainData) { var detail = getPurchaseStorageDetail(purchaseStorageVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var purchaseDataBo = PurchaseDataBO.builder() + var purchaseDataBo = PurchaseDataExportBO.builder() + .supplierName(purchaseStorageVO.getSupplierName()) + .receiptNumber(purchaseStorageVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) @@ -1400,12 +1405,14 @@ public void exportPurchaseRefundExcel(QueryPurchaseRefundDTO queryPurchaseRefund var mainData = getPurchaseRefundList(queryPurchaseRefundDTO); if (!mainData.isEmpty()) { if (queryPurchaseRefundDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (PurchaseRefundVO purchaseRefundVO : mainData) { var detail = getPurchaseRefundDetail(purchaseRefundVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var purchaseDataBo = PurchaseDataBO.builder() + var purchaseDataBo = PurchaseDataExportBO.builder() + .supplierName(purchaseRefundVO.getSupplierName()) + .receiptNumber(purchaseRefundVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java index 0cf8b1b3..3cdfe204 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.ShipmentsDataBO; +import com.wansenai.bo.ShipmentsDataExportBO; import com.wansenai.dto.receipt.retail.QueryRetailRefundDTO; import com.wansenai.dto.receipt.retail.QueryShipmentsDTO; import com.wansenai.dto.receipt.retail.RetailRefundDTO; @@ -890,11 +891,13 @@ public void exportRetailShipmentsExcel(QueryShipmentsDTO queryShipmentsDTO, Http var mainData = getRetailShipmentsList(queryShipmentsDTO).getData(); if (!mainData.isEmpty()) { if (queryShipmentsDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (RetailShipmentsVO retailShipmentsVO : mainData) { var detail = getRetailShipmentsDetail(retailShipmentsVO.getId()).getData().getTableData(); detail.forEach(item -> { - var shipmentBo = ShipmentsDataBO.builder() + var shipmentBo = ShipmentsDataExportBO.builder() + .memberName(retailShipmentsVO.getMemberName()) + .receiptNumber(retailShipmentsVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) @@ -924,11 +927,13 @@ public void exportRetailRefundExcel(QueryRetailRefundDTO queryRetailRefundDTO, H var mainData = getRetailRefundList(queryRetailRefundDTO).getData(); if (!mainData.isEmpty()) { if (queryRetailRefundDTO.getIsExportDetail()) { - var subData = new ArrayList<>(); + var subData = new ArrayList(); for (RetailRefundVO refundVO : mainData) { var detail = getRetailRefundDetail(refundVO.getId()).getData().getTableData(); detail.forEach(item -> { - var shipmentBo = ShipmentsDataBO.builder() + var shipmentBo = ShipmentsDataExportBO.builder() + .memberName(refundVO.getMemberName()) + .receiptNumber(refundVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java index 4f4ec15b..fd3b16f0 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.SalesDataBO; +import com.wansenai.bo.SalesDataExportBO; import com.wansenai.dto.receipt.sale.*; import com.wansenai.entities.financial.FinancialMain; import com.wansenai.entities.financial.FinancialSub; @@ -1326,12 +1327,14 @@ public void exportSaleOrderExcel(QuerySaleOrderDTO querySaleOrderDTO, HttpServle var mainData = getSaleOrderList(querySaleOrderDTO); if (!mainData.isEmpty()) { if (querySaleOrderDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (SaleOrderVO saleOrderVO : mainData) { var detail = getSaleOrderDetail(saleOrderVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var saleDataBo = SalesDataBO.builder() + var saleDataBo = SalesDataExportBO.builder() + .customerName(saleOrderVO.getCustomerName()) + .receiptNumber(saleOrderVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) @@ -1366,12 +1369,14 @@ public void exportSaleShipmentsExcel(QuerySaleShipmentsDTO querySaleShipmentsDTO var mainData = getSaleShipmentsList(querySaleShipmentsDTO); if (!mainData.isEmpty()) { if (querySaleShipmentsDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (SaleShipmentsVO saleShipmentsVO : mainData) { var detail = getSaleShipmentsDetail(saleShipmentsVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var saleDataBo = SalesDataBO.builder() + var saleDataBo = SalesDataExportBO.builder() + .customerName(saleShipmentsVO.getCustomerName()) + .receiptNumber(saleShipmentsVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) @@ -1406,12 +1411,14 @@ public void exportSaleRefundExcel(QuerySaleRefundDTO querySaleRefundDTO, HttpSer var mainData = getSaleRefundList(querySaleRefundDTO); if (!mainData.isEmpty()) { if (querySaleRefundDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (SaleRefundVO saleRefundVO : mainData) { var detail = getSaleShipmentsDetail(saleRefundVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var saleDataBo = SalesDataBO.builder() + var saleDataBo = SalesDataExportBO.builder() + .customerName(saleRefundVO.getCustomerName()) + .receiptNumber(saleRefundVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java index 394e6b0f..6ddebf4c 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java @@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.AllotStockBO; +import com.wansenai.bo.AllotStockDataExportBO; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.StorageShipmentStockBO; import com.wansenai.dto.warehouse.AllotReceiptDTO; @@ -481,12 +482,13 @@ public void exportAllotReceipt(QueryAllotReceiptDTO queryAllotReceiptDTO, HttpSe if (!mainData.isEmpty()) { exportMap.put("调拨出库", ExcelUtils.getSheetData(mainData)); if (queryAllotReceiptDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (AllotReceiptVO allotReceiptVO : mainData) { var detail = getAllotReceiptDetail(allotReceiptVO.getId()).getData().getTableData(); if (!detail.isEmpty()) { detail.forEach(item -> { - var allotStockBo = AllotStockBO.builder() + var allotStockBo = AllotStockDataExportBO.builder() + .receiptNumber(allotReceiptVO.getReceiptNumber()) .warehouseName(item.getWarehouseName()) .otherWarehouseName(item.getOtherWarehouseName()) .barCode(item.getBarCode()) diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java index 14e08ab1..ffef1cad 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java @@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.AssembleStockBO; +import com.wansenai.bo.AssembleStockDataExportBO; import com.wansenai.bo.FileDataBO; import com.wansenai.dto.warehouse.AssembleReceiptDTO; import com.wansenai.dto.warehouse.QueryAssembleReceiptDTO; @@ -477,12 +478,13 @@ public void exportAssembleReceipt(QueryAssembleReceiptDTO queryAssembleReceiptDT if (!mainData.isEmpty()) { exportMap.put("组装单", ExcelUtils.getSheetData(mainData)); if (queryAssembleReceiptDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (AssembleReceiptVO assembleReceiptVO : mainData) { var detail = getAssembleReceiptDetail(assembleReceiptVO.getId()).getData().getTableData(); if(!detail.isEmpty()) { detail.forEach(item -> { - var assembleStockBO = AssembleStockBO.builder() + var assembleStockBO = AssembleStockDataExportBO.builder() + .receiptNumber(assembleReceiptVO.getReceiptNumber()) .type(item.getType()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java index 87cc5da4..ad28a10f 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java @@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.AssembleStockBO; +import com.wansenai.bo.AssembleStockDataExportBO; import com.wansenai.bo.FileDataBO; import com.wansenai.dto.warehouse.DisassembleReceiptDTO; import com.wansenai.dto.warehouse.QueryDisassembleReceiptDTO; @@ -480,18 +481,16 @@ public void exportDisAssembleReceipt(QueryDisassembleReceiptDTO queryDisassemble if (!mainData.isEmpty()) { exportMap.put("拆卸单", ExcelUtils.getSheetData(mainData)); if (queryDisassembleReceiptDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (DisassembleReceiptVO disassembleReceiptVO : mainData) { var detail = getDisassembleReceiptDetail(disassembleReceiptVO.getId()).getData().getTableData(); if(!detail.isEmpty()) { detail.forEach(item -> { - var assembleStockBO = AssembleStockBO.builder() - .id(item.getId()) - .warehouseId(item.getWarehouseId()) + var assembleStockBO = AssembleStockDataExportBO.builder() + .receiptNumber(disassembleReceiptVO.getReceiptNumber()) .type(item.getType()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) - .productId(item.getProductId()) .productName(item.getProductName()) .productModel(item.getProductModel()) .productUnit(item.getProductUnit()) diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java index 1376dbe7..30145839 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.StorageShipmentStockBO; +import com.wansenai.bo.StorageShipmentStockExportBO; import com.wansenai.dto.warehouse.OtherShipmentDTO; import com.wansenai.dto.warehouse.QueryOtherShipmentDTO; import com.wansenai.entities.product.ProductStock; @@ -434,12 +435,15 @@ public void exportOtherShipments(QueryOtherShipmentDTO queryOtherShipmentDTO, Ht if (!mainData.isEmpty()) { exportMap.put("其他出库", ExcelUtils.getSheetData(mainData)); if (queryOtherShipmentDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (OtherShipmentVO otherShipmentVO : mainData) { var detail = getOtherShipmentsDetail(otherShipmentVO.getId()).getData().getTableData(); if(!detail.isEmpty()) { detail.forEach(item -> { - var storageShipmentStockBO = StorageShipmentStockBO.builder() + var storageShipmentStockBO = StorageShipmentStockExportBO.builder() + .receiptNumber(otherShipmentVO.getReceiptNumber()) + .relatedPersonType("客户") + .relatedPerson(otherShipmentVO.getCustomerName()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName()) diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java index 8af2fd5b..90b4b10b 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.StorageShipmentStockBO; +import com.wansenai.bo.StorageShipmentStockExportBO; import com.wansenai.dto.warehouse.OtherStorageDTO; import com.wansenai.dto.warehouse.QueryOtherStorageDTO; import com.wansenai.entities.product.ProductStock; @@ -437,12 +438,15 @@ public void exportOtherStorage(QueryOtherStorageDTO queryOtherStorageDTO, HttpSe if (!mainData.isEmpty()) { exportMap.put("其他入库", ExcelUtils.getSheetData(mainData)); if (queryOtherStorageDTO.getIsExportDetail()) { - var subData = new ArrayList(); + var subData = new ArrayList(); for (OtherStorageVO otherStorageVO : mainData) { var detail = getOtherStorageDetail(otherStorageVO.getId()).getData().getTableData(); if(!detail.isEmpty()) { detail.forEach(item -> { - var storageShipmentStockBO = StorageShipmentStockBO.builder() + var storageShipmentStockBO = StorageShipmentStockExportBO.builder() + .receiptNumber(otherStorageVO.getReceiptNumber()) + .relatedPersonType("供应商") + .relatedPerson(otherStorageVO.getSupplierName()) .warehouseName(item.getWarehouseName()) .barCode(item.getBarCode()) .productName(item.getProductName())