ruoyi-system/src/main/java/com/ruoyi/system/dto/AddProcurementDto.java
@@ -26,6 +26,7 @@ private String supplierId; private BigDecimal goodsSalesAmount; @ApiModelProperty("状态 1草稿") ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
@@ -117,13 +117,13 @@ if(tErpSupplierInventoryGoods1!=null){ // 盘盈 查入库 if(tErpSupplierInventoryGoods1.getInventoryType()==1){ TErpClinicWarehousing tErpSupplierWarehousing = erpClinicWarehousingMapper.selectById(tErpSupplierInventoryGoods1.getWarehousingId()); TErpClinicWarehousingBatch tErpSupplierWarehousing = erpClinicWarehousingBatchMapper.selectById(tErpSupplierInventoryGoods1.getWarehousingBatchId()); // List<TErpSupplierWarehousingBatch> tErpSupplierWarehousingBatches = erpSupplierWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpSupplierWarehousingBatch>().eq(TErpSupplierWarehousingBatch::getWarehousingId, tErpSupplierWarehousing.getId())); // int sum = tErpSupplierWarehousingBatches.stream().mapToInt(TErpSupplierWarehousingBatch::getWarehousingNumber).sum(); String goodsId = tErpSupplierInventoryGoods1.getGoodsId(); TErpGoods goods = erpGoodsMapper.selectById(goodsId); // TErpGoods goods = erpGoodsMapper.selectById(goodsId); int count = tErpSupplierInventoryGoods1.getInventoryCount() - tErpSupplierInventoryGoods1.getDamagedCount(); BigDecimal multiply = goods.getSalesAmount().multiply(new BigDecimal(count)); BigDecimal multiply = tErpSupplierWarehousing.getSalesAmount().multiply(new BigDecimal(count)); add = add.add(multiply); }else { // 盘亏 查出库 @@ -131,11 +131,11 @@ List<TErpClinicOutboundGoods> tErpSupplierOutboundGoods = erpClinicOutboundGoodsMapper.selectList(new LambdaQueryWrapper<TErpClinicOutboundGoods>().eq(TErpClinicOutboundGoods::getOutboundId, tErpSupplierOutbound.getId())); for (TErpClinicOutboundGoods tErpSupplierOutboundGood : tErpSupplierOutboundGoods) { TErpClinicWarehousing tErpSupplierWarehousing = erpClinicWarehousingMapper.selectById(tErpSupplierOutboundGood.getWarehousingId()); String goodsId = tErpSupplierInventoryGoods1.getGoodsId(); TErpGoods goods = erpGoodsMapper.selectById(goodsId); TErpClinicWarehousingBatch tErpSupplierWarehousing = erpClinicWarehousingBatchMapper.selectById(tErpSupplierOutboundGood.getWarehousingBatchId()); // String goodsId = tErpSupplierInventoryGoods1.getGoodsId(); // TErpGoods goods = erpGoodsMapper.selectById(goodsId); int count = tErpSupplierInventoryGoods1.getInventoryCount() - tErpSupplierInventoryGoods1.getDamagedCount(); BigDecimal multiply = goods.getSalesAmount().multiply(new BigDecimal(count)); BigDecimal multiply = tErpSupplierWarehousing.getSalesAmount().multiply(new BigDecimal(count)); add = add.add(multiply); } // int sum = tErpSupplierOutboundGoods.stream().mapToInt(TErpSupplierOutboundGoods::getOutboundCount).sum(); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java
@@ -396,9 +396,9 @@ // List<TErpSupplierWarehousingBatch> tErpSupplierWarehousingBatches = erpSupplierWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpSupplierWarehousingBatch>().eq(TErpSupplierWarehousingBatch::getWarehousingId, tErpSupplierWarehousing.getId())); // int sum = tErpSupplierWarehousingBatches.stream().mapToInt(TErpSupplierWarehousingBatch::getWarehousingNumber).sum(); String goodsId = tErpSupplierWarehousing.getGoodsId(); TErpGoods goods = erpGoodsMapper.selectById(goodsId); // TErpGoods goods = erpGoodsMapper.selectById(goodsId); int count = tErpSupplierInventoryGoods1.getInventoryCount() - tErpSupplierInventoryGoods1.getDamagedCount(); BigDecimal multiply = goods.getSalesAmount().multiply(new BigDecimal(count)); BigDecimal multiply = tErpSupplierWarehousing.getUnitAmount().multiply(new BigDecimal(count)); add = add.add(multiply); }else { // 盘亏 查出库 @@ -408,9 +408,9 @@ for (TErpSupplierOutboundGoods tErpSupplierOutboundGood : tErpSupplierOutboundGoods) { TErpSupplierWarehousing tErpSupplierWarehousing = erpSupplierWarehousingMapper.selectById(tErpSupplierOutboundGood.getWarehousingId()); String goodsId = tErpSupplierWarehousing.getGoodsId(); TErpGoods goods = erpGoodsMapper.selectById(goodsId); // TErpGoods goods = erpGoodsMapper.selectById(goodsId); int count = tErpSupplierInventoryGoods1.getInventoryCount() - tErpSupplierInventoryGoods1.getDamagedCount(); BigDecimal multiply = goods.getSalesAmount().multiply(new BigDecimal(count)); BigDecimal multiply = tErpSupplierWarehousing.getUnitAmount().multiply(new BigDecimal(count)); add = add.add(multiply); } // int sum = tErpSupplierOutboundGoods.stream().mapToInt(TErpSupplierOutboundGoods::getOutboundCount).sum(); ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
@@ -51,9 +51,13 @@ private String packingUnitId; @ApiModelProperty(value = "商品单价") @ApiModelProperty(value = "商品售价") private BigDecimal salesAmount; @ApiModelProperty(value = "商品单价") private BigDecimal unitAmount; @ApiModelProperty(value = "失效日期") private LocalDateTime expiryDate;
@@ -178,7 +178,8 @@ t1.warehousing_number, t2.create_time, t1.warehousing_number - coalesce(sum(t5.outbound_count),0) as num, t1.unit_amount as sales_amount, t1.unit_amount as unitAmount, t1.sales_amount as salesAmount, t1.expiry_date from t_erp_clinic_warehousing_batch t1 LEFT JOIN t_erp_clinic_warehousing t2 on t1.warehousing_id = t2.id
