From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 596e879..f0c861a 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -1,13 +1,18 @@
package com.ruoyi.lavorissue.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.utils.DailyRedisCounter;
+import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
import com.ruoyi.lavorissue.service.LavorIssueService;
@@ -17,10 +22,17 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author :yys
@@ -48,11 +60,32 @@
return AjaxResult.success(listPage);
}
+ @GetMapping("/statisticsList")
+ @Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation("鍔充繚鍙戞斁-缁熻鏌ヨ")
+ public AjaxResult statisticsList(LaborIssue laborIssue){
+ List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
+ return AjaxResult.success(listPage);
+ }
+
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
@ApiOperation("鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody LaborIssue laborIssue){
+ String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
+ Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
+ .gt(LaborIssue::getCreateTime, dateTime.getStartDate())
+ .lt(LaborIssue::getCreateTime, dateTime.getEndDate()));
+ String formattedCount = String.format("%03d", approveId + 1);
+ laborIssue.setOrderNo(today + formattedCount);
+ List<LaborIssue> laborIssues = lavorIssueMapper.selectList(new LambdaQueryWrapper<LaborIssue>()
+ .like(LaborIssue::getOrderNo, today));
+ if(!CollectionUtils.isEmpty(laborIssues)){
+ long l = Long.parseLong(laborIssues.get(laborIssues.size() - 1).getOrderNo());
+ laborIssue.setOrderNo(String.format("%03d", l + 1));
+ }
boolean save = laborIssueService.save(laborIssue);
return save ? AjaxResult.success() : AjaxResult.error();
}
@@ -75,6 +108,14 @@
return delete ? AjaxResult.success() : AjaxResult.error();
}
+ @GetMapping("/statistics")
+ @ApiOperation("鍔充繚鍙戞斁-缁熻")
+ public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
+ StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
+ return AjaxResult.success(statisticsLaborIssue);
+ }
+
+
/**
* 鍔充繚鍙戞斁-瀵煎嚭
@@ -85,7 +126,7 @@
public void export(HttpServletResponse response) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
ExcelUtil<LaborIssue> util = new ExcelUtil<LaborIssue>(LaborIssue.class);
- List<LaborIssue> list = lavorIssueMapper.list();
+ List<LaborIssue> list = lavorIssueMapper.list(new LaborIssue());
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
if(sysDept == null){
throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�!");
@@ -96,4 +137,14 @@
util.exportExcel(response, list , "鍔充繚鍙拌处");
}
+ /**
+ * 鍔充繚鍙戞斁-瀵煎嚭
+ */
+ @Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportCopy")
+ @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
+ laborIssueService.exportCopy(response,laborIssue);
+ }
+
}
--
Gitblit v1.9.3