From 6c264ce8c372e18109f0a3b9f5754955d22ba353 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 15 十一月 2023 17:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 15 +++++++++------
1 files changed, 9 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 cdca62a..356a15d 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));
}
@@ -112,15 +115,15 @@
}
/**
- * 瀵规帴蹇楅偊鍥介檯楣拌仈 erp
+ * 閫氳繃id浣滃簾
*
- * @param contractNo
+ * @param id
* @return
*/
- @ApiOperation(value = "閫氳繃鍚堝悓缂栫爜浣滃簾", notes = "閫氳繃鍚堝悓缂栫爜浣滃簾")
- @GetMapping("/dropByContractNo/{contractNo}")
- public R dropByContractNo(@PathVariable("contractNo") String contractNo) {
- customerOrderService.dropByContractNo(contractNo);
+ @ApiOperation(value = "閫氳繃id浣滃簾", notes = "閫氳繃id浣滃簾")
+ @GetMapping("/dropByContractNo")
+ public R dropByContractNo(@RequestParam("id") Long id) {
+ customerOrderService.removeById(id);
return R.ok();
}
--
Gitblit v1.9.3