From 4d14b92739b94a68790bca51905d3e37da855be7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:12:55 +0800
Subject: [PATCH] 销售订单-修改4
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index b01941a..018be91 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -17,6 +17,7 @@
package com.chinaztt.mes.plan.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
@@ -49,6 +50,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -95,6 +97,7 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/page/{type}")
public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) {
+ log.info("鏉′欢=================銆�"+ JSONObject.toJSONString(planCustomerOrder));
return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type));
}
@@ -118,8 +121,8 @@
* @return
*/
@ApiOperation(value = "閫氳繃鍚堝悓缂栫爜浣滃簾", notes = "閫氳繃鍚堝悓缂栫爜浣滃簾")
- @GetMapping("/dropByContractNo/{contractNo}")
- public R dropByContractNo(@PathVariable("contractNo") String contractNo) {
+ @GetMapping("/dropByContractNo")
+ public R dropByContractNo(@RequestParam("contractNo") String contractNo) {
customerOrderService.dropByContractNo(contractNo);
return R.ok();
}
@@ -310,7 +313,6 @@
*/
@GetMapping("/otcCustomerOrderSync")
public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
- log.info("---------------->"+selectTime);
return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
}
@@ -449,7 +451,7 @@
* @return
*/
@PostMapping("/upload")
- @ApiOperation(value = "涓婁紶宸ヨ壓閰嶇疆鍗�", notes = "涓婁紶宸ヨ壓閰嶇疆鍗�")
+ @ApiOperation(value = "涓婁紶闄勪欢", notes = "涓婁紶闄勪欢")
public R upload(@RequestParam("file") MultipartFile file,
@RequestParam("orderNumber") String orderNumber,
@RequestParam("lineNumber") String lineNumber) {
@@ -462,7 +464,7 @@
* @return
*/
@GetMapping("/processConfigFiles")
- @ApiOperation("鑾峰彇宸ヨ壓閰嶇疆鍗曚笂浼犺褰�")
+ @ApiOperation("鑾峰彇闄勪欢涓婁紶璁板綍")
@Inner(false)
public R processConfigFiles(String orderNumber, String lineNumber) {
try {
@@ -504,7 +506,7 @@
* @param fileName
* @param response
*/
- @GetMapping("/processConfig/{bucket}/{fileName}")
+ @PostMapping("/processConfig/{bucket}/{fileName}")
@Inner(false)
public void file(@PathVariable String bucket, @PathVariable String fileName, HttpServletResponse response) {
customerOrderService.getFile(bucket, fileName, response);
--
Gitblit v1.9.3