p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

✨ ERP：基本完成采购订单 100%

This commit is contained in:
YunaiV 2024-02-12 10:00:02 +08:00
parent c5d9ad59e0
commit 5d092361ed
7 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
View File

@ -87,10 +87,10 @@ public class ErpPurchaseOrderRespVO {
@ExcelProperty("产品信息")
private String productNames;
// ========== 采购出库 ==========
// ========== 采购入库 ==========
@Schema(description = "采购出库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal outCount;
@Schema(description = "采购入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal inCount;
// ========== 采购退货（出库）） ==========
@ -125,10 +125,10 @@ public class ErpPurchaseOrderRespVO {
@Schema(description = "备注", example = "随便")
private String remark;
// ========== 采购出库 ==========
// ========== 采购入库 ==========
@Schema(description = "采购出库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal outCount;
@Schema(description = "采购入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal inCount;
// ========== 采购退货（入库）） ==========

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java
View File

@ -14,8 +14,8 @@ import java.math.BigDecimal;
*
* @author 芋道源码
*/
@TableName("erp_sale_order_items")
@KeySequence("erp_sale_order_items_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@TableName("erp_purchase_order_items")
@KeySequence("erp_purchase_order_items_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
View File

@ -162,9 +162,7 @@ public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService {
if (item.getTotalPrice() == null) {
return;
}
if (item.getTaxPercent() == null) {
item.setTaxPercent(BigDecimal.ZERO);
} else {
if (item.getTaxPercent() != null) {
item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
}
}));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java
View File

@ -68,10 +68,10 @@ public class ErpSupplierServiceImpl implements ErpSupplierService {
public ErpSupplierDO validateSupplier(Long id) {
ErpSupplierDO supplier = supplierMapper.selectById(id);
if (supplier == null) {
throw exception(WAREHOUSE_NOT_EXISTS);
throw exception(SUPPLIER_NOT_EXISTS);
}
if (CommonStatusEnum.isDisable(supplier.getStatus())) {
throw exception(WAREHOUSE_NOT_ENABLE, supplier.getName());
throw exception(SUPPLIER_NOT_ENABLE, supplier.getName());
}
return supplier;
}

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
View File

@ -174,9 +174,7 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
if (item.getTotalPrice() == null) {
return;
}
if (item.getTaxPercent() == null) {
item.setTaxPercent(BigDecimal.ZERO);
} else {
if (item.getTaxPercent() != null) {
item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
}
}));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
View File

@ -206,9 +206,7 @@ public class ErpSaleOutServiceImpl implements ErpSaleOutService {
if (item.getTotalPrice() == null) {
return;
}
if (item.getTaxPercent() == null) {
item.setTaxPercent(BigDecimal.ZERO);
} else {
if (item.getTaxPercent() != null) {
item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
}
}));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java
View File

@ -206,9 +206,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
if (item.getTotalPrice() == null) {
return;
}
if (item.getTaxPercent() == null) {
item.setTaxPercent(BigDecimal.ZERO);
} else {
if (item.getTaxPercent() != null) {
item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
}
}));