From 970aaf7ecbe340bd687d33411ea716a5af2e271a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 06 二月 2026 16:37:42 +0800
Subject: [PATCH] 工序，生产核算导出去掉工资和工时定额
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index b32af78..7f398b6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductProcessRouteItemDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,7 +12,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
@RequestMapping("productionProductMain")
@@ -50,9 +47,9 @@
@DeleteMapping("/delete")
@Transactional(rollbackFor = Exception.class)
public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
- return R.ok(productionProductMainService.removeProductMain(productionProductMainDto));
- }
+ return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
+ }
/**
* 瀵煎嚭
@@ -64,4 +61,9 @@
ExcelUtil<ProductionProductMainDto> util = new ExcelUtil<ProductionProductMainDto>(ProductionProductMainDto.class);
util.exportExcel(response, list, "鐢熶骇鎶ュ伐鏁版嵁");
}
+
+ @GetMapping("/queryProductInputAndOutput")
+ public R queryProductInputAndOutput(Page page, ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.queryProductInputAndOutput(page, productionProductMainDto));
+ }
}
--
Gitblit v1.9.3