diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java index c97daf3..3001afd 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java @@ -179,6 +179,14 @@ public class GetProductBo extends BaseBo { @ApiModelProperty("供应商名称") private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + + public GetProductBo() { } @@ -255,6 +263,7 @@ public class GetProductBo extends BaseBo { SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); Supplier supplier = supplierService.findById(dto.getSupplierId()); this.supplierName = ObjectUtil.isNotNull(supplier) ? supplier.getName() : ""; + this.supplierCode = ObjectUtil.isNotNull(supplier) ? supplier.getCode() : ""; } @Data diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java index dbd24d3..e81b299 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java @@ -115,6 +115,12 @@ public class QueryProductBo extends BaseBo { @ApiModelProperty("供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public QueryProductBo() { } @@ -145,5 +151,6 @@ public class QueryProductBo extends BaseBo { SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); Supplier supplier = supplierService.findById(dto.getSupplierId()); this.supplierName = ObjectUtil.isNotNull(supplier) ? supplier.getName() : ""; + this.supplierCode = ObjectUtil.isNotNull(supplier) ? supplier.getCode() : ""; } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java index c45b818..0103f46 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java @@ -343,6 +343,12 @@ public class GetPurchaseOrderBo extends BaseBo { @ApiModelProperty("供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(String scId, PurchaseOrderFullDto.OrderDetailDto dto) { this.scId = scId; @@ -376,6 +382,7 @@ public class GetPurchaseOrderBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); ProductStockService productStockService = ApplicationUtil.getBean( ProductStockService.class); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java index b94fcbb..db8a0e5 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java @@ -226,6 +226,25 @@ public class PrintPurchaseOrderBo extends BasePrintDataBo @ApiModelProperty("采购金额") private BigDecimal purchaseAmount; + + /** + * 供应商Id + */ + @ApiModelProperty(value = "供应商Id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(PurchaseOrderFullDto.OrderDetailDto dto) { super(dto); @@ -253,6 +272,10 @@ public class PrintPurchaseOrderBo extends BasePrintDataBo this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java index f32a485..e8e5f37 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java @@ -245,6 +245,12 @@ public class PurchaseOrderWithReceiveBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public PurchaseProductBo(String scId, PurchaseProductDto dto) { this.scId = scId; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java index 8ad0ced..f3dcd9a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java @@ -386,6 +386,12 @@ public class GetReceiveSheetBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(String scId, ReceiveSheetFullDto.OrderDetailDto dto) { this.scId = scId; @@ -419,6 +425,7 @@ public class GetReceiveSheetBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); if (!StringUtil.isBlank(dto.getPurchaseOrderDetailId())) { PurchaseOrderDetailService purchaseOrderDetailService = ApplicationUtil.getBean( diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java index a41ae23..b2d0e7c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java @@ -251,6 +251,24 @@ public class PrintReceiveSheetBo extends BasePrintDataBo { @ApiModelProperty("收货金额") private BigDecimal receiveAmount; + /** + * 供应商id + */ + @ApiModelProperty(value = "供应商id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(ReceiveSheetFullDto.OrderDetailDto dto) { this.init(dto); @@ -278,6 +296,9 @@ public class PrintReceiveSheetBo extends BasePrintDataBo { this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java index a9cd210..21a1154 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java @@ -246,6 +246,12 @@ public class ReceiveSheetWithReturnBo extends BaseBo @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public DetailBo(String scId, ReceiveSheetWithReturnDto.DetailDto dto) { this.scId = scId; @@ -287,6 +293,7 @@ public class ReceiveSheetWithReturnBo extends BaseBo this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); this.receiveNum = dto.getOrderNum(); this.purchasePrice = dto.getTaxPrice(); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java index c73fbce..901fa08 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java @@ -376,6 +376,12 @@ public class GetPurchaseReturnBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public ReturnDetailBo(String scId, PurchaseReturnFullDto.ReturnDetailDto dto) { this.scId = scId; @@ -409,6 +415,7 @@ public class GetPurchaseReturnBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); if (!StringUtil.isBlank(dto.getReceiveSheetDetailId())) { ReceiveSheetDetailService receiveSheetDetailService = ApplicationUtil.getBean( diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java index 053839f..5a38c3d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java @@ -251,6 +251,24 @@ public class PrintPurchaseReturnBo extends BasePrintDataBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public RetailProductBo(String scId, RetailProductDto dto) { this.scId = scId; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/GetRetailOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/GetRetailOutSheetBo.java index 4a7bd14..f155e87 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/GetRetailOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/GetRetailOutSheetBo.java @@ -382,6 +382,12 @@ public class GetRetailOutSheetBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(String scId, RetailOutSheetFullDto.SheetDetailDto dto) { this.scId = scId; @@ -416,6 +422,7 @@ public class GetRetailOutSheetBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); ProductStockService productStockService = ApplicationUtil.getBean( ProductStockService.class); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/PrintRetailOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/PrintRetailOutSheetBo.java index 33f2769..211813a 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/PrintRetailOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/PrintRetailOutSheetBo.java @@ -227,6 +227,24 @@ public class PrintRetailOutSheetBo extends BasePrintDataBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public ReturnDetailBo(String scId, RetailReturnFullDto.ReturnDetailDto dto) { this.scId = scId; @@ -411,6 +417,7 @@ public class GetRetailReturnBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); if (!StringUtil.isBlank(dto.getOutSheetDetailId())) { RetailOutSheetDetailLotService receiveSheetDetailService = ApplicationUtil.getBean( diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java index c408100..880bf20 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java @@ -240,6 +240,24 @@ public class PrintRetailReturnBo extends BasePrintDataBo { @ApiModelProperty("退货金额") private BigDecimal returnAmount; + /** + * 供应商Id + */ + @ApiModelProperty(value = "供应商Id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public ReturnDetailBo(RetailReturnFullDto.ReturnDetailDto dto) { super(dto); @@ -267,6 +285,9 @@ public class PrintRetailReturnBo extends BasePrintDataBo { this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java index 1f760f4..ffaa835 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java @@ -353,6 +353,12 @@ public class GetSaleOrderBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(String scId, SaleOrderFullDto.OrderDetailDto dto) { this.scId = scId; @@ -386,6 +392,7 @@ public class GetSaleOrderBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); ProductStockService productStockService = ApplicationUtil.getBean( ProductStockService.class); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java index 9616127..0881500 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java @@ -219,6 +219,24 @@ public class PrintSaleOrderBo extends BasePrintDataBo { @ApiModelProperty("销售金额") private BigDecimal orderAmount; + /** + * 供应商id + */ + @ApiModelProperty(value = "供应商id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(SaleOrderFullDto.OrderDetailDto dto) { super(dto); @@ -244,6 +262,9 @@ public class PrintSaleOrderBo extends BasePrintDataBo { this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java index 189f6e1..25412cb 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java @@ -265,6 +265,12 @@ public class SaleOrderWithOutBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public DetailBo() { } @@ -306,6 +312,7 @@ public class SaleOrderWithOutBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); this.orderNum = dto.getOrderNum(); this.salePrice = dto.getOriPrice(); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java index 23872d5..3cb76bd 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java @@ -111,6 +111,12 @@ public class SaleProductBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public SaleProductBo(String scId, SaleProductDto dto) { this.scId = scId; diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java index fb55b86..1f3ae55 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java @@ -399,6 +399,12 @@ public class GetSaleOutSheetBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(String scId, SaleOutSheetFullDto.SheetDetailDto dto) { this.scId = scId; @@ -432,6 +438,7 @@ public class GetSaleOutSheetBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); if (!StringUtil.isBlank(dto.getSaleOrderDetailId())) { SaleOrderDetailService saleOrderDetailService = ApplicationUtil.getBean( diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java index 8c5bb53..b3eee84 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java @@ -239,6 +239,24 @@ public class PrintSaleOutSheetBo extends BasePrintDataBo { @ApiModelProperty("折扣") private BigDecimal outAmount; + /** + * 供应商Id + */ + @ApiModelProperty(value = "供应商Id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public OrderDetailBo(SaleOutSheetFullDto.SheetDetailDto dto) { super(dto); @@ -265,6 +283,9 @@ public class PrintSaleOutSheetBo extends BasePrintDataBo { this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java index 6d1eb46..5d8f297 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java @@ -253,6 +253,12 @@ public class SaleOutSheetWithReturnBo extends BaseBo @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public DetailBo(String scId, SaleOutSheetWithReturnDto.SheetDetailDto dto) { this.scId = scId; @@ -292,6 +298,7 @@ public class SaleOutSheetWithReturnBo extends BaseBo this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); this.outNum = dto.getOrderNum(); this.salePrice = dto.getOriPrice(); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java index d35c38e..8929f33 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java @@ -374,6 +374,12 @@ public class GetSaleReturnBo extends BaseBo { @ApiModelProperty(value = "供应商名称") private String supplierName; + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public ReturnDetailBo(String scId, SaleReturnFullDto.ReturnDetailDto dto) { this.scId = scId; @@ -408,6 +414,7 @@ public class GetSaleReturnBo extends BaseBo { this.brandName = product.getBrandName(); this.supplierId = product.getSupplierId(); this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); if (!StringUtil.isBlank(dto.getOutSheetDetailId())) { SaleOutSheetDetailLotService receiveSheetDetailService = ApplicationUtil.getBean( diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java index 16498ee..192ac55 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java @@ -236,6 +236,24 @@ public class PrintSaleReturnBo extends BasePrintDataBo { @ApiModelProperty("退货金额") private BigDecimal returnAmount; + /** + * 供应商Id + */ + @ApiModelProperty(value = "供应商Id") + private String supplierId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 供应商编码 + */ + @ApiModelProperty("供应商编码") + private String supplierCode; + public ReturnDetailBo(SaleReturnFullDto.ReturnDetailDto dto) { super(dto); @@ -262,6 +280,9 @@ public class PrintSaleReturnBo extends BasePrintDataBo { this.productName = product.getName(); this.skuCode = product.getSkuCode(); this.externalCode = product.getExternalCode(); + this.supplierId = product.getSupplierId(); + this.supplierName = product.getSupplierName(); + this.supplierCode = product.getSupplierCode(); } } } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java index e277e5b..5f4c9de 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java @@ -89,4 +89,9 @@ public class PurchaseProductDto implements BaseDto, Serializable { * 供应商名称 */ private String supplierName; + + /** + * 供应商编号 + */ + private String supplierCode; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java index cded945..1b23a21 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java @@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.dto.retail; import com.lframework.starter.web.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -89,4 +91,9 @@ public class RetailProductDto implements BaseDto, Serializable { * 供应商名称 */ private String supplierName; + + /** + * 供应商编码 + */ + private String supplierCode; } diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java index 3657654..9a7aa3d 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java @@ -89,4 +89,9 @@ public class SaleProductDto implements BaseDto, Serializable { * 供应商名称 */ private String supplierName; + + /** + * 供应商编码 + */ + private String supplierCode; } diff --git a/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml b/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml index fabb659..d2764fe 100644 --- a/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml @@ -92,6 +92,7 @@ + @@ -167,7 +168,8 @@ g.tax_rate, g.available, g.supplier_id, - s.name AS supplier_name + s.name AS supplier_name, + s.code AS supplier_code FROM base_data_product AS g INNER JOIN base_data_product_purchase AS purchase ON purchase.id = g.id LEFT JOIN base_data_product_category AS c ON c.id = g.category_id diff --git a/xingyun-sc/src/main/resources/mappers/retail/RetailOutSheetMapper.xml b/xingyun-sc/src/main/resources/mappers/retail/RetailOutSheetMapper.xml index 5d08bc3..7da7cf6 100644 --- a/xingyun-sc/src/main/resources/mappers/retail/RetailOutSheetMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/retail/RetailOutSheetMapper.xml @@ -95,6 +95,7 @@ + @@ -174,7 +175,8 @@ g.sale_tax_rate, g.available, g.supplier_id, - s.name AS supplier_name + s.name AS supplier_name, + s.code AS supplier_code FROM base_data_product AS g INNER JOIN base_data_product_retail AS retail ON retail.id = g.id LEFT JOIN base_data_product_category AS c ON c.id = g.category_id diff --git a/xingyun-sc/src/main/resources/mappers/sale/SaleOrderMapper.xml b/xingyun-sc/src/main/resources/mappers/sale/SaleOrderMapper.xml index 9535458..83a2a87 100644 --- a/xingyun-sc/src/main/resources/mappers/sale/SaleOrderMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/sale/SaleOrderMapper.xml @@ -94,6 +94,7 @@ + @@ -171,7 +172,8 @@ g.sale_tax_rate, g.available, g.supplier_id, - s.name AS supplier_name + s.name AS supplier_name, + s.code AS supplier_code FROM base_data_product AS g INNER JOIN base_data_product_sale AS sale ON sale.id = g.id LEFT JOIN base_data_product_category AS c ON c.id = g.category_id diff --git a/xingyun-sc/src/main/resources/print/purchase-order.ftl b/xingyun-sc/src/main/resources/print/purchase-order.ftl index c4b2678..9d7ff4c 100644 --- a/xingyun-sc/src/main/resources/print/purchase-order.ftl +++ b/xingyun-sc/src/main/resources/print/purchase-order.ftl @@ -16,8 +16,10 @@ - -
采购订单
+ +
+ 采购订单
@@ -74,15 +76,21 @@ 商品编号 - + 商品名称 - + 商品SKU编号 - + 商品外部编号 + + 供应商编号 + + + 供应商名称 + 采购价 @@ -92,47 +100,57 @@ 采购金额 - + 仓库 <#if details??> <#list details as detail> - + ${detail.productCode!''} - ${detail.productName!''} - ${detail.skuCode!''} - ${detail.externalCode!''} - ${detail.purchasePrice!''} + + ${detail.supplierCode!''} + + ${detail.supplierName!''} + + ${detail.purchasePrice!''} - ${detail.purchaseNum!''} + + ${detail.purchaseNum!''} - ${detail.purchaseAmount!''} + + ${detail.purchaseAmount!''} - ${scName!''} + + ${scName!''} - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/purchase-return.ftl b/xingyun-sc/src/main/resources/print/purchase-return.ftl index 6ead200..776a0d6 100644 --- a/xingyun-sc/src/main/resources/print/purchase-return.ftl +++ b/xingyun-sc/src/main/resources/print/purchase-return.ftl @@ -16,8 +16,10 @@ - -
采购退货单
+ +
+ 采购退货单
@@ -90,15 +92,21 @@ 商品编号 - + 商品名称 - + 商品SKU编号 - + 商品外部编号 + + 供应商编号 + + + 供应商名称 + 采购价 @@ -108,7 +116,7 @@ 退货金额 - + 仓库 @@ -117,34 +125,40 @@ ${detail.productCode!''} - ${detail.productName!''} - ${detail.skuCode!''} - ${detail.externalCode!''} + + ${detail.supplierCode!''} + + ${detail.supplierName!''} ${detail.purchasePrice!''} ${detail.returnNum!''} ${detail.returnAmount!''} - ${scName!''} + ${scName!''} - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/receive-sheet.ftl b/xingyun-sc/src/main/resources/print/receive-sheet.ftl index 724725c..97235e1 100644 --- a/xingyun-sc/src/main/resources/print/receive-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/receive-sheet.ftl @@ -16,8 +16,10 @@ - -
采购收货单
+ +
+ 采购收货单
@@ -90,15 +92,21 @@ 商品编号 - + 商品名称 - + 商品SKU编号 - + 商品外部编号 + + 供应商编号 + + + 供应商名称 + 采购价 @@ -108,7 +116,7 @@ 收货金额 - + 仓库 @@ -117,35 +125,41 @@ ${detail.productCode!''} - ${detail.productName!''} - ${detail.skuCode!''} - ${detail.externalCode!''} + + ${detail.supplierCode!''} + + ${detail.supplierName!''} ${detail.purchasePrice!''} ${detail.receiveNum!''} ${detail.receiveAmount!''} - ${scName!''} + ${scName!''} - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl b/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl index a0260af..a1a3234 100644 --- a/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl @@ -16,8 +16,10 @@ - -
零售出库单
+ +
+ 零售出库单
@@ -79,12 +81,18 @@ 商品名称 - + 商品SKU编号 - + 商品外部编号 + + 供应商编号 + + + 供应商名称 + 价格 @@ -103,12 +111,18 @@ ${detail.productName!''} - ${detail.skuCode!''} - ${detail.externalCode!''} + + ${detail.supplierCode!''} + + ${detail.supplierName!''} ${detail.taxPrice!''} ${detail.outNum!''} ${detail.outAmount!''} @@ -116,17 +130,17 @@ - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/retail-return.ftl b/xingyun-sc/src/main/resources/print/retail-return.ftl index d44bc12..55345ad 100644 --- a/xingyun-sc/src/main/resources/print/retail-return.ftl +++ b/xingyun-sc/src/main/resources/print/retail-return.ftl @@ -16,8 +16,10 @@ - -
零售退货单
+ +
+ 零售退货单
@@ -75,17 +77,20 @@ 商品编号 - + 商品名称 - + 商品SKU编号 商品外部编号 - 供应商 + 供应商编号 + + + 供应商名称 价格 @@ -102,15 +107,18 @@ ${detail.productCode!''} - ${detail.productName!''} - ${detail.skuCode!''} ${detail.externalCode!''} + + ${detail.supplierCode!''} ${detail.supplierName!''} @@ -121,17 +129,17 @@ - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/sale-order.ftl b/xingyun-sc/src/main/resources/print/sale-order.ftl index c9936d6..0179d90 100644 --- a/xingyun-sc/src/main/resources/print/sale-order.ftl +++ b/xingyun-sc/src/main/resources/print/sale-order.ftl @@ -16,8 +16,10 @@ - -
销售订单
+ +
+ 销售订单
@@ -74,15 +76,21 @@ 商品编号 - + 商品名称 - + 商品SKU编号 - + 商品外部编号 + + 供应商编号 + + + 供应商名称 + 价格 @@ -92,7 +100,7 @@ 销售金额 - + 仓库 @@ -101,34 +109,40 @@ ${detail.productCode!''} - ${detail.productName!''} - ${detail.skuCode!''} - ${detail.externalCode!''} + + ${detail.supplierCode!''} + + ${detail.supplierName!''} ${detail.taxPrice!''} ${detail.orderNum!''} ${detail.orderAmount!''} - ${scName!''} + ${scName!''} - + 合计数量 - ${totalNum!''} - + ${totalNum!''} + 合计金额 - ${totalAmount!''} + ${totalAmount!''} - + 合计 大写金额: ${bigTotalAmount!''} diff --git a/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl b/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl index 0f9ad4a..e2d9fb6 100644 --- a/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl @@ -2,7 +2,7 @@ - + @@ -16,8 +16,10 @@ - -
销售出库单
+ +
+ 销售出库单
@@ -91,15 +93,21 @@
- - - + + @@ -109,7 +117,7 @@ - @@ -118,34 +126,40 @@ - - - + + - + - - - + - + - diff --git a/xingyun-sc/src/main/resources/print/sale-return.ftl b/xingyun-sc/src/main/resources/print/sale-return.ftl index 4eb09af..864685b 100644 --- a/xingyun-sc/src/main/resources/print/sale-return.ftl +++ b/xingyun-sc/src/main/resources/print/sale-return.ftl @@ -16,8 +16,10 @@ - -
销售退货单
+ +
+ 销售退货单
@@ -82,17 +84,20 @@
- - + - @@ -112,38 +117,41 @@ - - + - + - - - + - + - @@ -176,7 +184,7 @@ __________ - +
商品编号 + 商品名称 + 商品SKU编号 + 商品外部编号 + 供应商编号 + + 供应商名称 + 价格 出库金额 + 仓库
${detail.productCode!''} ${detail.productName!''} ${detail.skuCode!''} ${detail.externalCode!''} + ${detail.supplierCode!''} + ${detail.supplierName!''} ${detail.taxPrice!''} ${detail.outNum!''} ${detail.outAmount!''}${scName!''}${scName!''}
+ 合计数量 ${totalNum!''} + ${totalNum!''} 合计金额 ${totalAmount!''}${totalAmount!''}
+ 合计 大写金额: ${bigTotalAmount!''}
商品编号 + 商品名称 + 商品SKU编号 商品外部编号 - 供应商 + 供应商编号 + + 供应商名称 价格 @@ -103,7 +108,7 @@ 退货金额 + 仓库
${detail.productCode!''} ${detail.productName!''} ${detail.skuCode!''} ${detail.externalCode!''} + ${detail.supplierCode!''} ${detail.supplierName!''} ${detail.taxPrice!''} ${detail.returnNum!''} ${detail.returnAmount!''}${scName!''}${scName!''}
+ 合计数量 ${totalNum!''} + ${totalNum!''} 合计金额 ${totalAmount!''}${totalAmount!''}
+ 合计 大写金额: ${bigTotalAmount!''}