From 3f3a1ed182e96214e66f6456ee692427bf04d454 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 28 十一月 2025 11:10:23 +0800
Subject: [PATCH] yys 1.库存管理导出修改 2.来票登记分页查询修改
---
src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
index fd4b2b2..ae73e64 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerSchedulingController.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.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.common.utils.poi.ExcelUtil;
@@ -15,6 +16,8 @@
import com.ruoyi.production.mapper.SpeculativeTradingInfoMapper;
import com.ruoyi.production.pojo.SpeculativeTradingInfo;
import com.ruoyi.production.service.impl.SalesLedgerSchedulingServiceImpl;
+import com.ruoyi.sales.mapper.LossMapper;
+import com.ruoyi.sales.pojo.Loss;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +26,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -41,14 +47,40 @@
@Autowired
private SpeculativeTradingInfoMapper speculativeTradingInfoMapper;
+ @Autowired
+ private LossMapper lossMapper;
+
+ @GetMapping("/loss")
+ @Log(title = "鐢熶骇绠＄悊-鐢熶骇娲惧伐-鎹熻�楃巼", businessType = BusinessType.OTHER)
+ @ApiOperation("鐢熶骇绠＄悊-鐢熶骇娲惧伐-鎹熻�楃巼")
+ public AjaxResult loss() {
+ return AjaxResult.success(lossMapper.selectOne(new LambdaQueryWrapper<Loss>().last("limit 1")));
+ }
+
+ @PostMapping("/addLoss")
+ @Log(title = "鐢熶骇绠＄悊-鐢熶骇娲惧伐-娣诲姞鎹熻�楃巼", businessType = BusinessType.INSERT)
+ @ApiOperation("鐢熶骇绠＄悊-鐢熶骇娲惧伐-娣诲姞鎹熻�楃巼")
+ public AjaxResult addLoss(@RequestBody Loss loss) {
+ lossMapper.insert(loss);
+ return AjaxResult.success("娣诲姞鎹熻�楃巼鎴愬姛");
+ }
+
+ @PostMapping("/updateLoss")
+ @Log(title = "鐢熶骇绠＄悊-鐢熶骇娲惧伐-淇敼鎹熻�楃巼", businessType = BusinessType.UPDATE)
+ @ApiOperation("鐢熶骇绠＄悊-鐢熶骇娲惧伐-淇敼鎹熻�楃巼")
+ public AjaxResult updateLoss(@RequestBody Loss loss) {
+ lossMapper.updateById(loss);
+ return AjaxResult.success("淇敼鎹熻�楃巼鎴愬姛");
+ }
+
@GetMapping("/list")
@Log(title = "鐢熶骇绠＄悊-鐢熶骇娲惧伐-鐐掓満淇℃伅", businessType = BusinessType.OTHER)
@ApiOperation("鐢熶骇绠＄悊-鐢熶骇娲惧伐-鐐掓満淇℃伅")
public AjaxResult list() {
List<SpeculativeTradingInfo> result = speculativeTradingInfoMapper.selectList(null);
result.forEach(item -> {
- item.setCurrentWorkLoad(salesLedgerSchedulingService.getSchedulingNumBySpeculativeTradingName(item.getName()));
- item.setVacant(item.getWorkLoad().subtract(item.getCurrentWorkLoad()));
+ item.setCurrentWorkLoad(salesLedgerSchedulingService.getSchedulingNumBySpeculativeTradingName(item.getName()).divide(new BigDecimal(1000),2, RoundingMode.CEILING));
+ item.setVacant(item.getWorkLoad().subtract(item.getCurrentWorkLoad()).setScale(2, RoundingMode.HALF_UP)); //淇濈暀涓や綅灏忔暟
});
return AjaxResult.success(result);
}
@@ -110,7 +142,18 @@
@ApiOperation("鐢熶骇绠＄悊-鐢熶骇璁㈠崟-鐢熶骇娲惧伐")
@Transactional(rollbackFor = Exception.class)
public AjaxResult productionDispatch(@RequestBody ProductionDispatchAddDto productionDispatchAddDto) {
- int result = salesLedgerSchedulingService.productionDispatch(productionDispatchAddDto);
+ List<ProductionDispatchAddDto> productionDispatchAddDtoList = new ArrayList<>();
+ productionDispatchAddDtoList.add(productionDispatchAddDto);
+ String result = salesLedgerSchedulingService.productionDispatch(productionDispatchAddDtoList);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/productionDispatchList")
+ @Log(title = "鐢熶骇绠＄悊-鐢熶骇璁㈠崟-鑷姩娲惧伐", businessType = BusinessType.INSERT)
+ @ApiOperation("鐢熶骇绠＄悊-鐢熶骇璁㈠崟-鑷姩娲惧伐")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult productionDispatchList(@RequestBody List<ProductionDispatchAddDto> productionDispatchAddDto) {
+ String result = salesLedgerSchedulingService.productionDispatch(productionDispatchAddDto);
return AjaxResult.success(result);
}
--
Gitblit v1.9.3