From af389156a78401b1e51807efe90b7310fc4c20f6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 10 十一月 2023 19:50:28 +0800
Subject: [PATCH] Changes11
---
mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
index 303eb80..36ec33a 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/controller/RoutingController.java
@@ -17,6 +17,7 @@
package com.chinaztt.mes.technology.controller;
+import cn.hutool.core.lang.Console;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.builder.ExcelReaderBuilder;
@@ -27,14 +28,12 @@
import com.chinaztt.mes.technology.dto.RoutingDTO;
import com.chinaztt.mes.technology.dto.RoutingOperationDTO;
import com.chinaztt.mes.technology.entity.RoutingOperationTemplate;
-import com.chinaztt.mes.technology.excel.RoutingData;
import com.chinaztt.mes.technology.excel.RoutingExcelData;
import com.chinaztt.mes.technology.excel.RoutingFormUploadListener;
import com.chinaztt.mes.technology.excel.RoutingUploadListener;
import com.chinaztt.mes.technology.service.RoutingService;
import com.chinaztt.ztt.common.core.util.R;
import com.chinaztt.ztt.common.log.annotation.SysLog;
-import com.chinaztt.ztt.common.security.annotation.Inner;
import com.chinaztt.ztt.common.security.service.ZttUser;
import com.chinaztt.ztt.common.security.util.SecurityUtils;
import io.swagger.annotations.Api;
@@ -307,6 +306,20 @@
}
/**
+ * 鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟娉ㄥ
+ *
+ * @param routingDTO
+ * @return
+ */
+ @ApiOperation(value = "娉ㄥ鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟", notes = "鏍规嵁宸ヨ壓宸ュ簭id鍜屽伐搴忔ā鏉縤d鍏宠仈娣诲姞宸ュ簭鍙傛暟")
+ @PostMapping("/addRoutingTemplateParamZs")
+ public R addOperationTemplateParamZS(@RequestBody RoutingDTO routingDTO) {
+ Console.log(routingDTO);
+ return R.ok();
+ }
+
+
+ /**
* 鏍规嵁澶嶅埗宸ュ簭鍙傛暟鐨刬d鍒犻櫎宸ュ簭鍙傛暟
*
* @param id
@@ -328,7 +341,8 @@
@SysLog("宸ュ簭鍙傛暟鐨勫弬鏁板�肩殑淇敼")
@PutMapping("routingTemplateParam")
public R updateRoutingTemplateParamById(@RequestBody RoutingDTO routing) {
- return routingService.updateRoutingTemplateParamById(routing);
+ System.out.println(routing);
+ return R.ok(routingService.updateRoutingTemplateParamById(routing));
}
--
Gitblit v1.9.3