From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 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..13f3797 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,9 +17,10 @@
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.basic.service.StaffService;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.CustomerOrder;
@@ -50,6 +51,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;
@@ -86,6 +88,8 @@
private final SysDictItemService sysDictItemService;
+ private final StaffService staffService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -97,6 +101,28 @@
@GetMapping("/page/{type}")
public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) {
return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type));
+ }
+
+ /**
+ * 鍚屾otc璁㈠崟鏁版嵁
+ *
+ * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
+ * @param orderNo 璁㈠崟缂栧彿
+ * @return
+ */
+ @GetMapping("/otcCustomerOrderSync")
+ public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
+ return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
+ }
+
+ /**
+ *閫夋嫨缁戝畾浜哄憳
+ * @return
+ */
+ @ApiOperation(value = "閫夋嫨缁戝畾浜哄憳", notes = "閫夋嫨缁戝畾浜哄憳")
+ @GetMapping("/chooseStaff")
+ public R chooseStaff() {
+ return R.ok(staffService.chooseStaff());
}
/**
@@ -113,15 +139,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();
}
@@ -303,19 +329,6 @@
}
/**
- * 鍚屾otc璁㈠崟鏁版嵁
- *
- * @param selectTime
- * @param pathCode 0:鍘熻矾寰�;1:璁㈠崟鎵�灞炲叕鍙镐负ZTKJ鐨勮鍗�
- * @return
- */
- @GetMapping("/otcCustomerOrderSync")
- public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("pathCode") String pathCode) {
- return customerOrderService.otcCustomerOrderSync(selectTime, pathCode);
- }
-
-
- /**
* 鏇存柊璁㈠崟琛岃鏄�
*
* @param customerOrder
@@ -449,7 +462,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 +475,7 @@
* @return
*/
@GetMapping("/processConfigFiles")
- @ApiOperation("鑾峰彇宸ヨ壓閰嶇疆鍗曚笂浼犺褰�")
+ @ApiOperation("鑾峰彇闄勪欢涓婁紶璁板綍")
@Inner(false)
public R processConfigFiles(String orderNumber, String lineNumber) {
try {
@@ -504,7 +517,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