From 433bc1e314ecfd483379ca0e2e74e7c815d3261f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 09:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
index 4da89fe..00bf92e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
@@ -52,31 +52,37 @@
@Resource
private TErpSupplierInventoryMapper erpSupplierInventoryMapper;
+
@Resource
private TErpClinicInventoryMapper erpClinicInventoryMapper;
@Resource
private TErpSupplierInventoryGoodsMapper erpSupplierInventoryGoodsMapper;
+
@Resource
private TErpClinicInventoryGoodsMapper erpClinicInventoryGoodsMapper;
@Resource
private TErpSupplierWarehousingMapper erpSupplierWarehousingMapper;
+
@Resource
private TErpClinicWarehousingMapper erpClinicWarehousingMapper;
@Resource
private TErpSupplierWarehousingBatchMapper erpSupplierWarehousingBatchMapper;
+
@Resource
private TErpClinicWarehousingBatchMapper erpClinicWarehousingBatchMapper;
@Resource
private TErpSupplierOutboundMapper erpSupplierOutboundMapper;
+
@Resource
private TErpClinicOutboundMapper erpClinicOutboundMapper;
@Resource
private TErpSupplierOutboundGoodsMapper erpSupplierOutboundGoodsMapper;
+
@Resource
private TErpClinicOutboundGoodsMapper erpClinicOutboundGoodsMapper;
@@ -85,6 +91,10 @@
@Resource
private TCrmSupplierMapper crmSupplierMapper;
+
+ @Resource
+ private TErpProcurementMapper erpProcurementMapper;
+
@Override
@@ -412,8 +422,8 @@
warehouseGoodsDetailVo.setCreateTime(tErpClinicWarehousing.getCreateTime());
warehouseGoodsDetailVo.setCreateBy(tErpClinicWarehousing.getCreateBy());
if(tErpClinicWarehousing.getType()==1){
- TErpClinicInventory tErpClinicInventory = erpClinicInventoryMapper.selectById(tErpClinicWarehousing.getInventoryId());
- warehouseGoodsDetailVo.setInventoryNumber(tErpClinicInventory.getInventoryNumber());
+ TErpProcurement tErpProcurement = erpProcurementMapper.selectById(tErpClinicWarehousing.getProcurementId());
+ warehouseGoodsDetailVo.setInventoryNumber(tErpProcurement.getProcurementCode());
}
List<TErpClinicWarehousingBatch> tErpClinicWarehousingBatches = erpClinicWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpClinicWarehousingBatch>().eq(TErpClinicWarehousingBatch::getWarehousingId, id));
@@ -560,6 +570,28 @@
String warehousingId1 = tErpSupplierWarehousingBatch1.getWarehousingId();
TErpSupplierWarehousing tErpSupplierWarehousing2 = erpSupplierWarehousingMapper.selectById(warehousingId1);
+ if(inventoryGoodsDto.getDamagedCount()!=null && inventoryGoodsDto.getDamagedCount()>0){
+ TErpSupplierOutbound tErpSupplierOutbound = new TErpSupplierOutbound();
+ tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
+ tErpSupplierOutbound.setSupplierId(supplierClinicId);
+ tErpSupplierOutbound.setOutboundType(1);
+ tErpSupplierOutbound.setOutboundNumber("G" + s);
+ int count = inventoryGoodsDto.getDamagedCount();
+ tErpSupplierOutbound.setTotalMoney(tErpSupplierWarehousing1.getUnitAmount().multiply(new BigDecimal(count)));
+ tErpSupplierOutbound.setGoodsId(tErpSupplierWarehousing2.getGoodsId());
+ erpSupplierOutboundMapper.insert(tErpSupplierOutbound);
+
+
+ TErpSupplierOutboundGoods tErpSupplierOutboundGoods = new TErpSupplierOutboundGoods();
+ tErpSupplierOutboundGoods.setOutboundId(tErpSupplierOutbound.getId());
+ tErpSupplierOutboundGoods.setWarehousingId(tErpSupplierWarehousing1.getId());
+ tErpSupplierOutboundGoods.setWarehousingBatchId(tErpSupplierWarehousingBatch.getId());
+ tErpSupplierOutboundGoods.setOutboundCount(count);
+ tErpSupplierOutboundGoods.setTotalPrice(tErpSupplierWarehousing1.getUnitAmount().multiply(new BigDecimal(count)));
+ erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);
+ }
+
+
TErpSupplierOutbound tErpSupplierOutbound = new TErpSupplierOutbound();
tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
tErpSupplierOutbound.setSupplierId(supplierClinicId);
@@ -628,6 +660,8 @@
TErpClinicWarehousing tErpSupplierWarehousing1 = erpClinicWarehousingMapper.selectById(warehousingId);
TErpGoods erpGoods = this.getById(tErpSupplierWarehousingBatch.getGoodsId());
+
+
// 盘点是盘亏盘盈 赢
if (inventoryGoodsDto.getNum() < inventoryGoodsDto.getInventoryCount()) {
// 添加入库信息
@@ -673,6 +707,26 @@
} else {
+ if(inventoryGoodsDto.getDamagedCount()!=null && inventoryGoodsDto.getDamagedCount()>0){
+ TErpClinicOutbound tErpSupplierOutbound = new TErpClinicOutbound();
+// tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
+// tErpSupplierOutbound.setSupplierId(supplierClinicId);
+ tErpSupplierOutbound.setOutboundType(1);
+ tErpSupplierOutbound.setOutboundNumber("G" + s);
+ int count = inventoryGoodsDto.getDamagedCount();
+ tErpSupplierOutbound.setTotalMoney(erpGoods.getSalesAmount().multiply(new BigDecimal(count)));
+ tErpSupplierOutbound.setInventoryId(tErpSupplierInventory.getId());
+ erpClinicOutboundMapper.insert(tErpSupplierOutbound);
+
+
+ TErpClinicOutboundGoods tErpSupplierOutboundGoods = new TErpClinicOutboundGoods();
+ tErpSupplierOutboundGoods.setOutboundId(tErpSupplierOutbound.getId());
+ tErpSupplierOutboundGoods.setWarehousingId(tErpSupplierWarehousing1.getId());
+ tErpSupplierOutboundGoods.setWarehousingBatchId(tErpSupplierWarehousingBatch.getId());
+ tErpSupplierOutboundGoods.setOutboundCount(count);
+ tErpSupplierOutboundGoods.setTotalPrice(erpGoods.getSalesAmount().multiply(new BigDecimal(count)));
+ erpClinicOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);
+ }
TErpClinicOutbound tErpSupplierOutbound = new TErpClinicOutbound();
// tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
// tErpSupplierOutbound.setSupplierId(supplierClinicId);
--
Gitblit v1.7.1