From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/controller/ProductBomController.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductBomController.java b/src/main/java/com/whyc/controller/ProductBomController.java
index d265d27..efc350d 100644
--- a/src/main/java/com/whyc/controller/ProductBomController.java
+++ b/src/main/java/com/whyc/controller/ProductBomController.java
@@ -1,15 +1,19 @@
package com.whyc.controller;
+import com.whyc.constant.UserOperation;
import com.whyc.dto.Response;
+import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBom;
+import com.whyc.service.DocLogService;
import com.whyc.service.ProductBomService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
@Api(tags = "鍥剧焊绠＄悊")
@RestController
@@ -18,26 +22,58 @@
@Autowired
private ProductBomService service;
+ @Autowired
+ private DocLogService logService;
+
@ApiOperation("鍥剧焊鏌ヨ鍒嗙被妫�绱�")
@PostMapping("searchCadDrawer")
public Response searchCadDrawer(@RequestBody ProductBom productBom, @RequestParam int pageCurr, @RequestParam int pageSize){
return service.searchCadDrawer(productBom,pageCurr,pageSize);
}
-
+/*
@ApiOperation("鍥剧焊鏂囦欢鎵撳寘涓嬭浇")
- @GetMapping("downloadCadDrawer")
- public void downloadCadDrawer(HttpServletRequest req, HttpServletResponse resp){
- service.downloadCadDrawer(req,resp);
- }
+ @PostMapping("downloadCadDrawer")
+ public void downloadCadDrawer(HttpServletRequest req, HttpServletResponse resp,@RequestBody List<ProductBom> boms){
+ service.downloadCadDrawer(req,resp,boms);
+ }*/
@ApiOperation(value = "鏍规嵁瀛愪欢code鑾峰彇鏈�缁堢殑淇℃伅")
@GetMapping("getBomBySubcode")
public Response getBomBySubcode(@RequestParam String scode){
return service.getBomBySubcode(scode);
}
+
@ApiOperation(value = "涓嬭浇鎿嶄綔鏃ュ織璁板綍")
@GetMapping("downloadLog")
- public Response downloadLog(@RequestParam(required = false) String parentModel,@RequestParam(required = false) String subModel){
+ public Response downloadLog(HttpServletRequest req,@RequestParam(required = false) String parentModel,@RequestParam(required = false) String subModel){
+ DocUser docUser= ActionUtil.getUser();
+ String operationDetail="鍏蜂綋鏂囦欢鍨嬪彿涓�:"+parentModel+"姣嶆枡鍨嬪彿涓嬬殑"+subModel+"瀛愭枡鍨嬪彿";
+ String opreationMsg="鎵ц浜嗘枃浠朵笅杞芥搷浣�";
+ String terminalIp=req.getRemoteAddr();
+ logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
return new Response().set(1,true,"璁板綍涓嬭浇鏃ュ織");
}
+ /* @ApiOperation(tags = "浜у搧绠＄悊",value = "鑾峰彇鎵�鏈変骇鍝佷俊鎭�")
+ @GetMapping("getAllBom")
+ public Response getAllBom( @RequestParam(required = false) String parentCode,@RequestParam(required = false) String parentName, @RequestParam(required = false) String parentModel, @RequestParam int pageCurr, @RequestParam int pageSize){
+ return service.getAllBom(parentCode,parentName,parentModel,pageCurr,pageSize);
+ }*/
+
+ /*@ApiOperation(tags = "浜у搧绠＄悊",value = "鏍规嵁姣嶆枡鍨嬪彿鏌ヨ瀛愪欢淇℃伅鍙婃湁鏈�鏂扮増鏈叧鑱旂殑鏁ｈ浠朵俊鎭�")
+ @GetMapping("getSubByMaterialProduct")
+ public Response getSubByMaterialProduct(@RequestParam String parentModel){
+ return service.getSubByMaterialProduct(parentModel);
+ }*/
+
+ /*@ApiOperation(tags = "浜у搧绠＄悊",value = "浜у搧鎵撳寘涓嬭浇")
+ @GetMapping("downloadBom")
+ public void downloadBom(HttpServletRequest req, HttpServletResponse resp,@RequestParam String parentModel){
+ service.downloadBom(req,resp,parentModel);
+ }*/
+ @ApiOperation(tags = "鏁ｈ浠剁鐞�",value = "鏌ヨ鎵�鏈変骇鍝佷腑娌℃湁涓庢寚瀹氭暎瑁呬欢鍏宠仈鐨勫瓙浠�")
+ @GetMapping("getAllSubWithOutMaterial")
+ public Response getAllSubWithOutMaterial(@RequestParam int materialId){
+ return service.getAllSubWithOutMaterial(materialId);
+ }
+
}
--
Gitblit v1.9.1