From 48cddae0c3d3c0f3653c1354c0ab2beb436189c5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:39:46 +0800
Subject: [PATCH] Changes13
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 f720969..c911cb1 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,7 +17,7 @@
package com.chinaztt.mes.plan.controller;
-import cn.hutool.core.util.BooleanUtil;
+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;
@@ -96,6 +96,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));
}
@@ -305,13 +306,13 @@
/**
* 鍚屾otc璁㈠崟鏁版嵁
*
- * @param selectTime
- * @param pathCode 0:鍘熻矾寰�;1:璁㈠崟鎵�灞炲叕鍙镐负ZTKJ鐨勮鍗�
+ * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
+ * @param orderNo 璁㈠崟缂栧彿
* @return
*/
@GetMapping("/otcCustomerOrderSync")
- public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("pathCode") String pathCode) {
- return customerOrderService.otcCustomerOrderSync(selectTime, pathCode);
+ public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
+ return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
}
@@ -449,7 +450,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 +463,7 @@
* @return
*/
@GetMapping("/processConfigFiles")
- @ApiOperation("鑾峰彇宸ヨ壓閰嶇疆鍗曚笂浼犺褰�")
+ @ApiOperation("鑾峰彇闄勪欢涓婁紶璁板綍")
@Inner(false)
public R processConfigFiles(String orderNumber, String lineNumber) {
try {
@@ -504,7 +505,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