From fbc53e77f994f15c3ebcd4fa07dfd23671c0ce26 Mon Sep 17 00:00:00 2001 From: lishenao <3065849776@qq.com> Date: 星期五, 04 七月 2025 16:04:51 +0800 Subject: [PATCH] 入库管理,出库管理,库存管理后端接口修改 --- src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java | 72 +++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java b/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java index a19d90b..b5dc014 100644 --- a/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java +++ b/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java @@ -14,12 +14,14 @@ import com.ruoyi.inventory.pojo.StockManagement; import com.ruoyi.inventory.pojo.StockOut; import com.ruoyi.inventory.service.StockManagementService; +import com.ruoyi.purchase.dto.ProductRecordDto; import com.ruoyi.purchase.mapper.ProductRecordMapper; import com.ruoyi.purchase.pojo.ProductRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; @Service @@ -60,51 +62,55 @@ @Override public int stockout(StockManagement stockManagement) { -// 闇�瑕佽繘琛屽垽鏂紝搴撳瓨鏁伴噺鏄惁瓒冲 - StockManagement stockManagement1 = stockManagementMapper.selectById(stockManagement.getId()); +// 鍦ㄥ墠绔叾瀹炲氨绌夸簡3涓暟锛屾暟閲忥紝鍑哄簱浜猴紝鏃堕棿锛屽彧闇�瑕佽繘琛屽垽鏂紝搴撳瓨鏁伴噺鏄惁瓒冲鍗冲彲,鏈変笁绉嶆儏鍐� + StockOut stockOut = new StockOut(); + LambdaQueryWrapper<StockManagement> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StockManagement::getId, stockManagement.getId()); + StockManagement stockManagement1 = stockManagementMapper.selectOne(queryWrapper); if (stockManagement1.getStockQuantity() < stockManagement.getStockQuantity()) { throw new RuntimeException("搴撳瓨鏁伴噺涓嶈冻"); - }else if (stockManagement1.getStockQuantity().equals(stockManagement.getStockQuantity())){ -// 鍑忓幓鐨勬暟閲忚鍦ㄥ嚭搴撹褰曡〃涓姞涓�鏉℃暟鎹� - StockOut stockOut = new StockOut(); - stockOut.setInboundQuantity(stockManagement.getStockQuantity()); - stockOut.setProductRecordid(stockManagement1.getProductRecordid()); - stockOut.setSupplierId(stockManagement1.getSupplierId()); - stockOut.setUserId(stockManagement.getUserId()); - stockOut.setInboundTime(stockManagement1.getBoundTime()); - stockOutMapper.insert(stockOut); - return stockManagementMapper.deleteById(stockManagement.getId()); + } else if (stockManagement1.getStockQuantity() > stockManagement.getStockQuantity()) { + stockManagement1.setStockQuantity(stockManagement1.getStockQuantity() - stockManagement.getStockQuantity()); + stockManagementMapper.updateById(stockManagement1); } else { - stockManagement1.setStockQuantity(stockManagement1.getStockQuantity() - stockManagement.getStockQuantity()); - StockOut stockOut = new StockOut(); - stockOut.setInboundQuantity(stockManagement.getStockQuantity()); - stockOut.setProductRecordid(stockManagement1.getProductRecordid()); - stockOut.setSupplierId(stockManagement1.getSupplierId()); - stockOut.setUserId(stockManagement.getUserId()); - stockOut.setInboundTime(stockManagement1.getBoundTime()); - stockOutMapper.insert(stockOut); - return stockManagementMapper.updateById(stockManagement1); + stockManagementMapper.deleteById(stockManagement.getId()); } + stockOut.setProductrecordId(stockManagement1.getProductrecordId()); + stockOut.setInboundTime(stockManagement.getBoundTime()); +// 鍑哄簱鎵规鑷姩鐢熸垚 + String batchCode = "CK" + System.currentTimeMillis(); + stockOut.setInboundBatch(batchCode); + stockOut.setSupplierId(stockManagement1.getSupplierId()); + stockOut.setInboundQuantity(stockManagement.getStockQuantity()); + stockOut.setUserId(stockManagement.getUserId()); + return stockOutMapper.insert(stockOut); } // 娣诲姞搴撳瓨鏂规硶 @Override public int addStockManage(StockManagement stockManagement) { -// 闇�瑕佽繘琛屽垽鏂� +// 闇�瑕佸厛鍒ゆ柇閲囪喘璁板綍琛ㄤ腑鏄惁鏈夎浜у搧鐨勯噰璐褰� LambdaQueryWrapper<ProductRecord> queryWrapper1 = new LambdaQueryWrapper<>(); - queryWrapper1.eq(ProductRecord::getProductId, stockManagement.getProductRecordid()); + queryWrapper1.eq(ProductRecord::getId, stockManagement.getProductrecordId()); ProductRecord productRecord = productRecordMapper.selectOne(queryWrapper1); - if (productRecord == null) { - throw new RuntimeException("浜у搧涓嶅瓨鍦�"); + ProductRecordDto productRecordDto = productRecordMapper.selectProductRecordById(productRecord.getId()); + if (productRecordDto!= null) { + stockManagement.setProductrecordId(productRecordDto.getId()); + stockManagement.setBoundTime(stockManagement.getBoundTime()); + stockManagement.setSupplierId(productRecordDto.getSupplierId()); + stockManagement.setStockQuantity(stockManagement.getStockQuantity()); + stockManagement.setUserId(stockManagement.getUserId()); + return stockManagementMapper.insert(stockManagement); + }else { + throw new RuntimeException("閲囪喘璁板綍琛ㄤ腑娌℃湁璇ヤ骇鍝佺殑閲囪喘璁板綍"); } - LambdaQueryWrapper<SupplierManage> queryWrapper2 = new LambdaQueryWrapper<>(); - queryWrapper2.eq(SupplierManage::getId, stockManagement.getSupplierId()); - SupplierManage supplierManage = supplierManageMapper.selectOne(queryWrapper2); - System.out.println(supplierManage+"11"); - if (supplierManage == null) { - throw new RuntimeException("渚涘簲鍟嗕笉瀛樺湪"); - } - return stockManagementMapper.insert(stockManagement); } + + @Override + public StockManagement getStockManageById(Long id) { + return stockManagementMapper.selectById(id); + } + + } -- Gitblit v1.9.3