wurenji
/
erp-ht
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(xingyun): 采购、销售、零售单据增加供应商编码字段 

- 在多个 BO、DTO 类中添加供应商编码字段
- 更新相关 Mapper XML 文件，增加供应商编码的查询和映射
- 修改采购订单打印模板，添加供应商编码信息
This commit is contained in:
lijiaqi 2024-11-26 11:54:54 +08:00
parent 15dd0d8e18
commit 26b1bcc9b1
40 changed files with 543 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java
View File

@ -179,6 +179,14 @@ public class GetProductBo extends BaseBo<Product> {
@ApiModelProperty("供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public GetProductBo() {
}
@ -255,6 +263,7 @@ public class GetProductBo extends BaseBo<Product> {
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

7
xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java
View File

@ -115,6 +115,12 @@ public class QueryProductBo extends BaseBo<Product> {
@ApiModelProperty("供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public QueryProductBo() {
}
@ -145,5 +151,6 @@ public class QueryProductBo extends BaseBo<Product> {
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() : "";
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/GetPurchaseOrderBo.java
View File

@ -343,6 +343,12 @@ public class GetPurchaseOrderBo extends BaseBo<PurchaseOrderFullDto> {
@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<PurchaseOrderFullDto> {
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
ProductStockService productStockService = ApplicationUtil.getBean(
ProductStockService.class);

23
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PrintPurchaseOrderBo.java
View File

@ -226,6 +226,25 @@ public class PrintPurchaseOrderBo extends BasePrintDataBo<PurchaseOrderFullDto>
@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<PurchaseOrderFullDto>
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseOrderWithReceiveBo.java
View File

@ -245,6 +245,12 @@ public class PurchaseOrderWithReceiveBo extends BaseBo<PurchaseOrderWithReceiveD
@ApiModelProperty("供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public DetailBo() {
}
@ -289,6 +295,7 @@ public class PurchaseOrderWithReceiveBo extends BaseBo<PurchaseOrderWithReceiveD
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
this.orderNum = dto.getOrderNum();
this.purchasePrice = dto.getTaxPrice();

6
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/PurchaseProductBo.java
View File

@ -117,6 +117,12 @@ public class PurchaseProductBo extends BaseBo<PurchaseProductDto> {
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public PurchaseProductBo(String scId, PurchaseProductDto dto) {
this.scId = scId;

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/GetReceiveSheetBo.java
View File

@ -386,6 +386,12 @@ public class GetReceiveSheetBo extends BaseBo<ReceiveSheetFullDto> {
@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<ReceiveSheetFullDto> {
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(

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/PrintReceiveSheetBo.java
View File

@ -251,6 +251,24 @@ public class PrintReceiveSheetBo extends BasePrintDataBo<ReceiveSheetFullDto> {
@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<ReceiveSheetFullDto> {
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/receive/ReceiveSheetWithReturnBo.java
View File

@ -246,6 +246,12 @@ public class ReceiveSheetWithReturnBo extends BaseBo<ReceiveSheetWithReturnDto>
@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<ReceiveSheetWithReturnDto>
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
this.receiveNum = dto.getOrderNum();
this.purchasePrice = dto.getTaxPrice();

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/GetPurchaseReturnBo.java
View File

@ -376,6 +376,12 @@ public class GetPurchaseReturnBo extends BaseBo<PurchaseReturnFullDto> {
@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<PurchaseReturnFullDto> {
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(

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/purchase/returned/PrintPurchaseReturnBo.java
View File

@ -251,6 +251,24 @@ public class PrintPurchaseReturnBo extends BasePrintDataBo<PurchaseReturnFullDto
@ApiModelProperty("退货金额")
private BigDecimal returnAmount;
/**
* 供应商id
*/
@ApiModelProperty(value = "供应商id")
private String supplierId;
/**
* 供应商名称
*/
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public ReturnDetailBo(PurchaseReturnFullDto.ReturnDetailDto dto) {
super(dto);
@ -278,6 +296,9 @@ public class PrintPurchaseReturnBo extends BasePrintDataBo<PurchaseReturnFullDto
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

6
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/RetailProductBo.java
View File

@ -110,6 +110,12 @@ public class RetailProductBo extends BaseBo<RetailProductDto> {
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public RetailProductBo(String scId, RetailProductDto dto) {
this.scId = scId;

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/GetRetailOutSheetBo.java
View File

@ -382,6 +382,12 @@ public class GetRetailOutSheetBo extends BaseBo<RetailOutSheetFullDto> {
@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<RetailOutSheetFullDto> {
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
ProductStockService productStockService = ApplicationUtil.getBean(
ProductStockService.class);

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/PrintRetailOutSheetBo.java
View File

@ -227,6 +227,24 @@ public class PrintRetailOutSheetBo extends BasePrintDataBo<RetailOutSheetFullDto
@ApiModelProperty("出库金额")
private BigDecimal outAmount;
/**
* 供应商ID
*/
@ApiModelProperty("供应商ID")
private String supplierId;
/**
* 供应商名称
*/
@ApiModelProperty("供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public OrderDetailBo(RetailOutSheetFullDto.SheetDetailDto dto) {
super(dto);
@ -254,6 +272,9 @@ public class PrintRetailOutSheetBo extends BasePrintDataBo<RetailOutSheetFullDto
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/out/RetailOutSheetWithReturnBo.java
View File

@ -254,6 +254,12 @@ public class RetailOutSheetWithReturnBo extends BaseBo<RetailOutSheetWithReturnD
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public DetailBo(String scId, RetailOutSheetWithReturnDto.SheetDetailDto dto) {
this.scId = scId;
@ -294,6 +300,7 @@ public class RetailOutSheetWithReturnBo extends BaseBo<RetailOutSheetWithReturnD
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
this.outNum = dto.getOrderNum();
this.retailPrice = dto.getOriPrice();

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/GetRetailReturnBo.java
View File

@ -376,6 +376,12 @@ public class GetRetailReturnBo extends BaseBo<RetailReturnFullDto> {
@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<RetailReturnFullDto> {
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(

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/retail/returned/PrintRetailReturnBo.java
View File

@ -240,6 +240,24 @@ public class PrintRetailReturnBo extends BasePrintDataBo<RetailReturnFullDto> {
@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<RetailReturnFullDto> {
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/GetSaleOrderBo.java
View File

@ -353,6 +353,12 @@ public class GetSaleOrderBo extends BaseBo<SaleOrderFullDto> {
@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<SaleOrderFullDto> {
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
ProductStockService productStockService = ApplicationUtil.getBean(
ProductStockService.class);

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/PrintSaleOrderBo.java
View File

@ -219,6 +219,24 @@ public class PrintSaleOrderBo extends BasePrintDataBo<SaleOrderFullDto> {
@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<SaleOrderFullDto> {
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleOrderWithOutBo.java
View File

@ -265,6 +265,12 @@ public class SaleOrderWithOutBo extends BaseBo<SaleOrderWithOutDto> {
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public DetailBo() {
}
@ -306,6 +312,7 @@ public class SaleOrderWithOutBo extends BaseBo<SaleOrderWithOutDto> {
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
this.orderNum = dto.getOrderNum();
this.salePrice = dto.getOriPrice();

6
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/SaleProductBo.java
View File

@ -111,6 +111,12 @@ public class SaleProductBo extends BaseBo<SaleProductDto> {
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 供应商编码
*/
@ApiModelProperty("供应商编码")
private String supplierCode;
public SaleProductBo(String scId, SaleProductDto dto) {
this.scId = scId;

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/GetSaleOutSheetBo.java
View File

@ -399,6 +399,12 @@ public class GetSaleOutSheetBo extends BaseBo<SaleOutSheetFullDto> {
@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<SaleOutSheetFullDto> {
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(

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/PrintSaleOutSheetBo.java
View File

@ -239,6 +239,24 @@ public class PrintSaleOutSheetBo extends BasePrintDataBo<SaleOutSheetFullDto> {
@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<SaleOutSheetFullDto> {
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/out/SaleOutSheetWithReturnBo.java
View File

@ -253,6 +253,12 @@ public class SaleOutSheetWithReturnBo extends BaseBo<SaleOutSheetWithReturnDto>
@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<SaleOutSheetWithReturnDto>
this.brandName = product.getBrandName();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
this.outNum = dto.getOrderNum();
this.salePrice = dto.getOriPrice();

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/GetSaleReturnBo.java
View File

@ -374,6 +374,12 @@ public class GetSaleReturnBo extends BaseBo<SaleReturnFullDto> {
@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<SaleReturnFullDto> {
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(

21
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sale/returned/PrintSaleReturnBo.java
View File

@ -236,6 +236,24 @@ public class PrintSaleReturnBo extends BasePrintDataBo<SaleReturnFullDto> {
@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<SaleReturnFullDto> {
this.productName = product.getName();
this.skuCode = product.getSkuCode();
this.externalCode = product.getExternalCode();
this.supplierId = product.getSupplierId();
this.supplierName = product.getSupplierName();
this.supplierCode = product.getSupplierCode();
}
}
}

5
xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/purchase/PurchaseProductDto.java
View File

@ -89,4 +89,9 @@ public class PurchaseProductDto implements BaseDto, Serializable {
* 供应商名称
*/
private String supplierName;
/**
* 供应商编号
*/
private String supplierCode;
}

7
xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/retail/RetailProductDto.java
View File

@ -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;
}

5
xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/sale/SaleProductDto.java
View File

@ -89,4 +89,9 @@ public class SaleProductDto implements BaseDto, Serializable {
* 供应商名称
*/
private String supplierName;
/**
* 供应商编码
*/
private String supplierCode;
}

4
xingyun-sc/src/main/resources/mappers/purchase/PurchaseOrderMapper.xml
View File

@ -92,6 +92,7 @@
<result column="available" property="available"/>
<result column="supplier_id" property="supplierId"/>
<result column="supplier_name" property="supplierName"/>
<result column="supplier_code" property="supplierCode"/>
</resultMap>
<sql id="PurchaseOrderDto_sql">
@ -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

4
xingyun-sc/src/main/resources/mappers/retail/RetailOutSheetMapper.xml
View File

@ -95,6 +95,7 @@
<result column="available" property="available"/>
<result column="supplier_id" property="supplierId"/>
<result column="supplier_name" property="supplierName"/>
<result column="supplier_code" property="supplierCode"/>
</resultMap>
<sql id="RetailOutSheetDto_sql">
@ -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

4
xingyun-sc/src/main/resources/mappers/sale/SaleOrderMapper.xml
View File

@ -94,6 +94,7 @@
<result column="available" property="available"/>
<result column="supplier_id" property="supplierId"/>
<result column="supplier_name" property="supplierName"/>
<result column="supplier_code" property="supplierCode"/>
</resultMap>
<sql id="SaleOrderDto_sql">
@ -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

54
xingyun-sc/src/main/resources/print/purchase-order.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">采购订单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
采购订单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 27%;display: flex;">
<div>
@ -74,15 +76,21 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
采购价
</td>
@ -92,47 +100,57 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
采购金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
<#if details??>
<#list details as detail>
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
<td class="et6" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.purchasePrice!''}
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et6" style="border-width: 1px; border-style: solid;">
${detail.purchasePrice!''}
</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.purchaseNum!''}
<td class="et6" style="border-width: 1px; border-style: solid;">
${detail.purchaseNum!''}
</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.purchaseAmount!''}
<td class="et6" style="border-width: 1px; border-style: solid;">
${detail.purchaseAmount!''}
</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et6" style="border-width: 1px; border-style: solid;">
${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

42
xingyun-sc/src/main/resources/print/purchase-return.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">采购退货单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
采购退货单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -90,15 +92,21 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
采购价
</td>
@ -108,7 +116,7 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
退货金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
@ -117,34 +125,40 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.purchasePrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.returnNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.returnAmount!''}</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

42
xingyun-sc/src/main/resources/print/receive-sheet.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">采购收货单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
采购收货单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -90,15 +92,21 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
采购价
</td>
@ -108,7 +116,7 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
收货金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
@ -117,35 +125,41 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.purchasePrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.receiveNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.receiveAmount!''}</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

34
xingyun-sc/src/main/resources/print/retail-out-sheet.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">零售出库单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
零售出库单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -79,12 +81,18 @@
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
价格
</td>
@ -103,12 +111,18 @@
<td colspan="3" class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.taxPrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.outNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.outAmount!''}</td>
@ -116,17 +130,17 @@
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="11" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

30
xingyun-sc/src/main/resources/print/retail-return.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">零售退货单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
零售退货单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -75,17 +77,20 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
价格
@ -102,15 +107,18 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="3" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
@ -121,17 +129,17 @@
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="2" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="9" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

42
xingyun-sc/src/main/resources/print/sale-order.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">销售订单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
销售订单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 27%;display: flex;">
<div>
@ -74,15 +76,21 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
价格
</td>
@ -92,7 +100,7 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
销售金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
@ -101,34 +109,40 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.taxPrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.orderNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.orderAmount!''}</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3"class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3"class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

44
xingyun-sc/src/main/resources/print/sale-out-sheet.ftl
View File

@ -2,7 +2,7 @@
<body>
<table cellspacing="0">
<colgroup >
<colgroup>
<col style="width: 29.8mm;" />
<col style="width: 22.4mm;" />
<col style="width: 22.6mm;" />
@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">销售出库单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
销售出库单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -91,15 +93,21 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
价格
</td>
@ -109,7 +117,7 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
出库金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
@ -118,34 +126,40 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.taxPrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.outNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.outAmount!''}</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>

34
xingyun-sc/src/main/resources/print/sale-return.ftl
View File

@ -17,7 +17,9 @@
</colgroup>
<tbody>
<div style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">销售退货单</div>
<div
style="awidth: 100%;text-align: center;height:14.40pt;padding-top: 20px;padding-bottom: 20px;font-size: 18px;font-weight: 600;">
销售退货单</div>
<div style="width: 100%;display: flex;margin-top: 10px;margin-bottom: 20px;">
<div style="width: 25%;display: flex;">
<div>
@ -82,17 +84,20 @@
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
商品编号
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品名称
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品SKU编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
商品外部编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商
供应商编号
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
供应商名称
</td>
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
价格
@ -103,7 +108,7 @@
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
退货金额
</td>
<td colspan="2" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
仓库
</td>
</tr>
@ -112,38 +117,41 @@
<tr height="24" style="height:14.40pt;">
<td class="et5" height="14" style="border-width: 1px; border-style: solid;">
${detail.productCode!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.productName!''}</td>
<td colspan="2" class="et6"
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.skuCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.externalCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierCode!''}</td>
<td class="et6"
style="border-width: 1px; border-style: solid; border-right-color: rgb(0, 0, 0);">
${detail.supplierName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.taxPrice!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.returnNum!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${detail.returnAmount!''}</td>
<td class="et5" colspan="2" style="border-width: 1px; border-style: solid;">${scName!''}</td>
<td class="et5" style="border-width: 1px; border-style: solid;">${scName!''}</td>
</tr>
</#list>
</#if>
<tr height="24" style="height:14.40pt;">
<td class="et2" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="3" class="et2" x:str="" style="border-width: 1px; border-style: solid;">
合计数量
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalNum!''}</td>
<td colspan="3" class="et2" height="14" x:str="" style="border-width: 1px; border-style: solid;">
合计金额
</td>
<td colspan="5" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
<td colspan="2" class="et3" style="border-width: 1px; border-style: solid;">${totalAmount!''}</td>
</tr>
<tr height="24" style="height:14.40pt;">
<td class="et2" height="14" x:str="" colspan="12" style="border-width: 1px; border-style: solid;">
<td class="et2" height="14" x:str="" colspan="10" style="border-width: 1px; border-style: solid;">
合计 大写金额: ${bigTotalAmount!''}
</td>
</tr>