From 5460c97d61ecea5818b97a6c6c59334b9dd1c49f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 22 十二月 2023 15:35:28 +0800
Subject: [PATCH] 0108、0109开头的物料BOM清单上传的时候覆盖之前相同编码的物料，保留之前的附件及附件状态
---
src/main/java/com/whyc/controller/DocLogController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DocLogController.java b/src/main/java/com/whyc/controller/DocLogController.java
index 9fd866a..0c26db1 100644
--- a/src/main/java/com/whyc/controller/DocLogController.java
+++ b/src/main/java/com/whyc/controller/DocLogController.java
@@ -1,6 +1,8 @@
package com.whyc.controller;
import com.whyc.dto.Response;
+import com.whyc.pojo.DocLog;
+import com.whyc.pojo.DocUser;
import com.whyc.service.DocLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +17,18 @@
private DocLogService service;
@ApiOperation(value = "鏃ュ織鏌ヨ")
- @GetMapping("searchLog")
- public Response searchLog(@RequestParam int pageCurr, @RequestParam int pageSize){
- return service.searchLog(pageCurr,pageSize);
+ @PostMapping("searchLog")
+ public Response logInformation(@RequestBody(required = false) DocLog docLog, @RequestParam int pageCurr, @RequestParam int pageSize){
+ return service.searchLog(docLog,pageCurr,pageSize);
}
@ApiOperation(value = "鎿嶄綔瀵瑰簲鍏崇郴")
@GetMapping("getOperate")
- public Response getOperate(){
+ public Response operateAll(){
return service.getOperate();
}
+ @ApiOperation(value = "鏌ヨ涓嬭浇鏃ュ織(DownLoadNew)")
+ @GetMapping("getDownLoadNew")
+ public Response getDownLoadNew(@RequestParam int type,@RequestParam String oprateInfo){
+ return service.getDownLoadNew(type,oprateInfo);
+ }
}
--
Gitblit v1.9.1