From 42288de2a4a83772558ac6a28be42ab49b7683b8 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 二月 2026 16:55:26 +0800
Subject: [PATCH] feat(quality): 添加质检单关联订单号和合同号查询功能
---
src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java | 163 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
index 866970e..bd3610c 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
@@ -1,71 +1,92 @@
-package com.ruoyi.production.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.production.dto.ProcessSchedulingDto;
-import com.ruoyi.production.dto.ProductionReportDto;
-import com.ruoyi.production.dto.SalesLedgerWorkDto;
-import com.ruoyi.production.pojo.SalesLedgerWork;
-import com.ruoyi.production.service.SalesLedgerWorkService;
-import com.ruoyi.production.service.impl.SalesLedgerWorkServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author :yys
- * @date : 2025/7/21 14:43
- */
-@RestController
-@Api(tags = "鐢熶骇鎶ュ伐(鎺掍骇璁板綍)")
-@RequestMapping("/salesLedger/work")
-public class SalesLedgerWorkController extends BaseController {
-
-
- @Autowired
- private SalesLedgerWorkServiceImpl salesLedgerWorkService;
-
- @GetMapping("/listPage")
- @Log(title = "鐢熶骇鎶ュ伐-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鐢熶骇鎶ュ伐-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SalesLedgerWorkDto salesLedgerWorkDto) {
- IPage<SalesLedgerWorkDto> listPage = salesLedgerWorkService.listPage(page, salesLedgerWorkDto);
- return AjaxResult.success(listPage);
- }
-
- @GetMapping("/list")
- @Log(title = "鐢熶骇鎶ュ伐-鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鐢熶骇鎶ュ伐-鏌ヨ")
- public AjaxResult list(@RequestParam("id") Long id) {
- List<ProductionReportDto> list = salesLedgerWorkService.getList(id);
- return AjaxResult.success(list);
- }
-
- @PostMapping("/productionReport")
- @Log(title = "鐢熶骇绠＄悊-鐢熶骇鎶ュ伐", businessType = BusinessType.INSERT)
- @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐")
- @Transactional(rollbackFor = Exception.class)
- public AjaxResult productionReport(@RequestBody ProductionReportDto productionReportDto) {
- int result = salesLedgerWorkService.productionReport(productionReportDto);
- return AjaxResult.success(result);
- }
-
-
- @PostMapping("/productionReportUpdate")
- @Log(title = "鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-淇敼")
- @Transactional(rollbackFor = Exception.class)
- public AjaxResult productionReportUpdate(@RequestBody ProductionReportDto productionReportDto) {
- int result = salesLedgerWorkService.productionReportUpdate(productionReportDto);
- return AjaxResult.success(result);
- }
-
-}
+//package com.ruoyi.production.controller;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//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.production.dto.ProcessSchedulingDto;
+//import com.ruoyi.production.dto.ProductionReportDto;
+//import com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto;
+//import com.ruoyi.production.dto.SalesLedgerWorkDto;
+//import com.ruoyi.production.pojo.SalesLedgerWork;
+//import com.ruoyi.production.service.SalesLedgerWorkService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.servlet.http.HttpServletResponse;
+//import java.util.List;
+//
+///**
+// * @author :yys
+// * @date : 2025/7/21 14:43
+// */
+//@RestController
+//@Api(tags = "鐢熶骇鎶ュ伐(鎺掍骇璁板綍)")
+//@RequestMapping("/salesLedger/work")
+//@Deprecated // 鏍囪璇ョ被宸插純鐢�
+//public class SalesLedgerWorkController extends BaseController {
+//
+//
+// @Autowired
+// private SalesLedgerWorkServiceImpl salesLedgerWorkService;
+//
+// @GetMapping("/listPage")
+// @Log(title = "鐢熶骇鎶ュ伐-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+// @ApiOperation("鐢熶骇鎶ュ伐-鍒嗛〉鏌ヨ")
+// public AjaxResult listPage(Page page, SalesLedgerWorkDto salesLedgerWorkDto) {
+// IPage<SalesLedgerWorkDto> listPage = salesLedgerWorkService.listPage(page, salesLedgerWorkDto);
+// return AjaxResult.success(listPage);
+// }
+//
+// /**
+// * 瀵煎嚭
+// * @param response
+// */
+// @PostMapping("/export")
+// @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-瀵煎嚭")
+// public void export(HttpServletResponse response) {
+// Page page = new Page(-1,-1);
+// SalesLedgerWorkDto salesLedgerSchedulingDto = new SalesLedgerWorkDto();
+// IPage<SalesLedgerWorkDto> result = salesLedgerWorkService.listPage(page,salesLedgerSchedulingDto);
+// result.getRecords().forEach(item -> {
+// item.setDaiNum(item.getFinishedNum().subtract(item.getSchedulingNum()));
+// item.setStatusName(item.getStatus().toString());
+// });
+// ExcelUtil<SalesLedgerWorkDto> util = new ExcelUtil<>(SalesLedgerWorkDto.class);
+// util.exportExcel(response, result.getRecords(), "宸ュ簭鎺掍骇");
+// }
+//
+// @GetMapping("/list")
+// @Log(title = "鐢熶骇鎶ュ伐-鏌ヨ", businessType = BusinessType.OTHER)
+// @ApiOperation("鐢熶骇鎶ュ伐-鏌ヨ")
+// public AjaxResult list(@RequestParam("id") Long id) {
+// List<ProductionReportDto> list = salesLedgerWorkService.getList(id);
+// return AjaxResult.success(list);
+// }
+//
+// @PostMapping("/productionReport")
+// @Log(title = "鐢熶骇绠＄悊-鐢熶骇鎶ュ伐", businessType = BusinessType.INSERT)
+// @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐")
+// @Transactional(rollbackFor = Exception.class)
+// public AjaxResult productionReport(@RequestBody ProductionReportDto productionReportDto) {
+// int result = salesLedgerWorkService.productionReport(productionReportDto);
+// return AjaxResult.success(result);
+// }
+//
+//
+// @PostMapping("/productionReportUpdate")
+// @Log(title = "鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-淇敼", businessType = BusinessType.UPDATE)
+// @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鎶ュ伐-淇敼")
+// @Transactional(rollbackFor = Exception.class)
+// public AjaxResult productionReportUpdate(@RequestBody ProductionReportDto productionReportDto) {
+// int result = salesLedgerWorkService.productionReportUpdate(productionReportDto);
+// return AjaxResult.success(result);
+// }
+//
+//}
--
Gitblit v1.9.3